Merge branch 'master' of git://git.samba.org/samba into teventfix
[samba.git] / librpc / idl / spoolss.idl
index 3669837491548bf3c23e1e88455e08c5114c22c8..f2944b0f3938bd73aa60b403ccb4073afbc2bd61 100644 (file)
@@ -30,36 +30,72 @@ import "misc.idl", "security.idl", "winreg.idl";
                [unique] spoolss_Time *time;
        } spoolss_TimeCtr;
 
+       typedef enum {
+               PROCESSOR_ARCHITECTURE_INTEL            = 0x0000,
+               PROCESSOR_ARCHITECTURE_IA64             = 0x0006,
+               PROCESSOR_ARCHITECTURE_AMD64            = 0x0009
+       } spoolss_ProcessorArchitecture;
+
+       typedef [v1_enum] enum {
+               PROCESSOR_INTEL_386                     = 0x00000182,
+               PROCESSOR_INTEL_486                     = 0x000001E6,
+               PROCESSOR_INTEL_PENTIUM                 = 0x0000024A,
+               PROCESSOR_INTEL_IA64                    = 0x00000898,
+               PROCESSOR_AMD_X8664                     = 0x000022A0
+       } spoolss_ProcessorType;
+
+       typedef [v1_enum] enum {
+               /* Windows 95, Windows 98, Windows Me, Windows NT4 */
+               SPOOLSS_MAJOR_VERSION_NT4_95_98_ME      = 0x00000004,
+               /* Windows 2000, Windows 2003, Windows XP */
+               SPOOLSS_MAJOR_VERSION_2000_2003_XP      = 0x00000005,
+               /* Windows Vista, Windows 2008 */
+               SPOOLSS_MAJOR_VERSION_2008_VISTA        = 0x00000006
+       } spoolss_MajorVersion;
+
+       typedef [v1_enum] enum {
+               /* Windows 2008, Windows Vista, Windows 2000, Windows NT4, Windows 95 */
+               SPOOLSS_MINOR_VERSION_0                 = 0x00000000,
+               /* Windows XP */
+               SPOOLSS_MINOR_VERSION_XP                = 0x00000001,
+               /* Windows 2003, Windows XP x64 */
+               SPOOLSS_MINOR_VERSION_2003_XP64         = 0x00000002,
+               /* Windows 98 */
+               SPOOLSS_MINOR_VERSION_98                = 0x0000000a,
+               /* Windows Me */
+               SPOOLSS_MINOR_VERSION_ME                = 0x0000005a
+       } spoolss_MinorVersion;
+
        typedef struct {
                [relative] nstring *printername;
                [relative] nstring *servername;
                uint32 cjobs;
                uint32 total_jobs;
                uint32 total_bytes;
-               spoolss_Time time;              
+               spoolss_Time time;
                uint32 global_counter;
                uint32 total_pages;
                uint32 version;
-               uint32 unknown10;
-               uint32 unknown11;
-               uint32 unknown12;
+               uint32 free_build;
+               uint32 spooling;
+               uint32 max_spooling;
                uint32 session_counter;
-               uint32 unknown14;
-               uint32 printer_errors;
-               uint32 unknown16;
-               uint32 unknown17;
-               uint32 unknown18;
-               uint32 unknown19;
+               uint32 num_error_out_of_paper;
+               uint32 num_error_not_ready;
+               uint32 job_error;
+               uint32 number_of_processors;
+               spoolss_ProcessorType processor_type;
+               uint32 high_part_total_bytes;
                uint32 change_id;
-               uint32 unknown21;
+               WERROR last_error;
                uint32 status;
-               uint32 unknown23;
+               uint32 enumerate_network_printers;
                uint32 c_setprinter;
-               uint16 unknown25;
-               uint16 unknown26;
-               uint32 unknown27;
-               uint32 unknown28;
-               uint32 unknown29;
+               spoolss_ProcessorArchitecture processor_architecture;
+               uint16 processor_level;
+               uint32 ref_ic;
+               uint32 reserved2;
+               uint32 reserved3;
        } spoolss_PrinterInfo0;
 
        typedef [bitmap32bit] bitmap {
@@ -304,7 +340,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 offered,
                [out,unique] DATA_BLOB *info,
                [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count
        );
        [public,noopnum,noprint] void __spoolss_EnumPrinters(
                [in] uint32 level,
@@ -320,9 +356,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                /* what we have here is a subcontext containing an array of no discriminant unions
                 * and the array has no size in front
                 */
-               [out,unique,switch_is(level),size_is(count)] spoolss_PrinterInfo *info,
-               [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count,
+               [out,unique,switch_is(level),size_is(*count)] spoolss_PrinterInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -336,12 +372,33 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique] [string,charset(UTF16)] uint16 *printername,
                [in,unique] [string,charset(UTF16)] uint16 *datatype,
                [in] spoolss_DevmodeContainer devmode_ctr,
-               [in] uint32 access_mask,
+               [in] spoolss_AccessRights access_mask,
                [out,ref] policy_handle *handle
        );
 
        /******************/
        /* 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;
@@ -350,24 +407,161 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *document_name;
                [relative] nstring *data_type;
                [relative] nstring *text_status;
-               uint32 status;
+               spoolss_JobStatus status;
                uint32 priority;
                uint32 position;
                uint32 total_pages;
                uint32 pages_printed;
-               spoolss_Time time;
+               spoolss_Time submitted;
        } spoolss_JobInfo1;
 
+       typedef struct {
+               uint32 job_id;
+               [relative] nstring *printer_name;
+               [relative] nstring *server_name;
+               [relative] nstring *user_name;
+               [relative] nstring *document_name;
+               [relative] nstring *notify_name;
+               [relative] nstring *data_type;
+               [relative] nstring *print_processor;
+               [relative] nstring *parameters;
+               [relative] nstring *driver_name;
+               [relative] spoolss_DeviceMode *devmode;
+               [relative] nstring *text_status;
+               [relative] security_descriptor *secdesc;
+               spoolss_JobStatus status;
+               uint32 priority;
+               uint32 position;
+               uint32 start_time;
+               uint32 until_time;
+               uint32 total_pages;
+               uint32 size;
+               spoolss_Time submitted;
+               uint32 time;
+               uint32 pages_printed;
+       } spoolss_JobInfo2;
+
+       typedef struct {
+               uint32 job_id;
+               uint32 next_job_id;
+               uint32 reserved;
+       } spoolss_JobInfo3;
+
+       typedef struct {
+               uint32 job_id;
+               [relative] nstring *printer_name;
+               [relative] nstring *server_name;
+               [relative] nstring *user_name;
+               [relative] nstring *document_name;
+               [relative] nstring *notify_name;
+               [relative] nstring *data_type;
+               [relative] nstring *print_processor;
+               [relative] nstring *parameters;
+               [relative] nstring *driver_name;
+               [relative] spoolss_DeviceMode *devmode;
+               [relative] nstring *text_status;
+               [relative] security_descriptor *secdesc;
+               spoolss_JobStatus status;
+               uint32 priority;
+               uint32 position;
+               uint32 start_time;
+               uint32 until_time;
+               uint32 total_pages;
+               uint32 size;
+               spoolss_Time submitted;
+               uint32 time;
+               uint32 pages_printed;
+               uint32 size_high;
+       } spoolss_JobInfo4;
+
        typedef [nodiscriminant,relative_base,public] union {
                [case(1)] spoolss_JobInfo1 info1;
-               [case(2)]; /* TODO */
-               [case(3)]; /* TODO */
+               [case(2)] spoolss_JobInfo2 info2;
+               [case(3)] spoolss_JobInfo3 info3;
+               [case(4)] spoolss_JobInfo4 info4;
                [default];
        } spoolss_JobInfo;
 
+       typedef struct {
+               uint32 job_id;
+               [string,charset(UTF16)] uint16 *printer_name;
+               [string,charset(UTF16)] uint16 *server_name;
+               [string,charset(UTF16)] uint16 *user_name;
+               [string,charset(UTF16)] uint16 *document_name;
+               [string,charset(UTF16)] uint16 *data_type;
+               [string,charset(UTF16)] uint16 *text_status;
+               spoolss_JobStatus status;
+               uint32 priority;
+               uint32 position;
+               uint32 total_pages;
+               uint32 pages_printed;
+               spoolss_Time submitted;
+       } spoolss_SetJobInfo1;
+
+       typedef struct {
+               uint32 job_id;
+               [string,charset(UTF16)] uint16 *printer_name;
+               [string,charset(UTF16)] uint16 *server_name;
+               [string,charset(UTF16)] uint16 *user_name;
+               [string,charset(UTF16)] uint16 *document_name;
+               [string,charset(UTF16)] uint16 *notify_name;
+               [string,charset(UTF16)] uint16 *data_type;
+               [string,charset(UTF16)] uint16 *print_processor;
+               [string,charset(UTF16)] uint16 *parameters;
+               [string,charset(UTF16)] uint16 *driver_name;
+               spoolss_DeviceMode *devmode;
+               [string,charset(UTF16)] uint16 *text_status;
+               security_descriptor *secdesc;
+               spoolss_JobStatus status;
+               uint32 priority;
+               uint32 position;
+               uint32 start_time;
+               uint32 until_time;
+               uint32 total_pages;
+               uint32 size;
+               spoolss_Time submitted;
+               uint32 time;
+               uint32 pages_printed;
+       } spoolss_SetJobInfo2;
+
+       typedef struct {
+               uint32 job_id;
+               [string,charset(UTF16)] uint16 *printer_name;
+               [string,charset(UTF16)] uint16 *server_name;
+               [string,charset(UTF16)] uint16 *user_name;
+               [string,charset(UTF16)] uint16 *document_name;
+               [string,charset(UTF16)] uint16 *notify_name;
+               [string,charset(UTF16)] uint16 *data_type;
+               [string,charset(UTF16)] uint16 *print_processor;
+               [string,charset(UTF16)] uint16 *parameters;
+               [string,charset(UTF16)] uint16 *driver_name;
+               spoolss_DeviceMode *devmode;
+               [string,charset(UTF16)] uint16 *text_status;
+               security_descriptor *secdesc;
+               spoolss_JobStatus status;
+               uint32 priority;
+               uint32 position;
+               uint32 start_time;
+               uint32 until_time;
+               uint32 total_pages;
+               uint32 size;
+               spoolss_Time submitted;
+               uint32 time;
+               uint32 pages_printed;
+               uint32 size_high;
+       } spoolss_SetJobInfo4;
+
+       typedef [public] union {
+               [case(1)] spoolss_SetJobInfo1 *info1;
+               [case(2)] spoolss_SetJobInfo2 *info2;
+               [case(3)] spoolss_JobInfo3    *info3;
+               [case(4)] spoolss_SetJobInfo4 *info4;
+               [default];
+       } spoolss_SetJobInfo;
+
        typedef struct {
                uint32 level;
-               [switch_is(level)] spoolss_JobInfo info;
+               [switch_is(level)] spoolss_SetJobInfo info;
        } spoolss_JobInfoContainer;
 
        typedef [v1_enum] enum {
@@ -377,7 +571,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                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
        } spoolss_JobControl;
 
        WERROR spoolss_SetJob(
@@ -410,7 +606,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in]     uint32 offered,
                [out,unique] DATA_BLOB *info,
                [out,ref] uint32 *needed,
-               [out]    uint32 count
+               [out,ref] uint32 *count
        );
        [public,noopnum,noprint] void __spoolss_EnumJobs(
                [in] uint32 level,
@@ -424,9 +620,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in]     uint32 level,
                [in,unique] DATA_BLOB *buffer,
                [in]     uint32 offered,
-               [out,unique,switch_is(level),size_is(count)] spoolss_JobInfo *info,
-               [out,ref] uint32 *needed,
-               [out]    uint32 count
+               [out,ref] uint32 *count,
+               [out,unique,switch_is(level),size_is(*count)] spoolss_JobInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -462,26 +658,26 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 global_counter;
                uint32 total_pages;
                uint32 version;
-               uint32 unknown10;
-               uint32 unknown11;
-               uint32 unknown12;
+               uint32 free_build;
+               uint32 spooling;
+               uint32 max_spooling;
                uint32 session_counter;
-               uint32 unknown14;
-               uint32 printer_errors;
-               uint32 unknown16;
-               uint32 unknown17;
-               uint32 unknown18;
-               uint32 unknown19;
+               uint32 num_error_out_of_paper;
+               uint32 num_error_not_ready;
+               uint32 job_error;
+               uint32 number_of_processors;
+               spoolss_ProcessorType processor_type;
+               uint32 high_part_total_bytes;
                uint32 change_id;
-               uint32 unknown21;
+               WERROR last_error;
                uint32 status;
-               uint32 unknown23;
+               uint32 enumerate_network_printers;
                uint32 c_setprinter;
-               uint16 unknown25;
-               uint16 unknown26;
-               uint32 unknown27;
-               uint32 unknown28;
-               uint32 unknown29;
+               spoolss_ProcessorArchitecture processor_architecture;
+               uint16 processor_level;
+               uint32 ref_ic;
+               uint32 reserved2;
+               uint32 reserved3;
        } spoolss_SetPrinterInfo0;
 
        typedef struct {
@@ -516,7 +712,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        } spoolss_SetPrinterInfo2;
 
        typedef struct {
-               security_descriptor *secdesc;
+               uint32 sec_desc_ptr;
        } spoolss_SetPrinterInfo3;
 
        typedef struct {
@@ -583,7 +779,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        /******************/
        /* Function: 0x09 */
 
-       typedef [public,gensize] struct {
+       typedef [public] struct {
                [value((ndr_size_spoolss_StringArray(r, ndr->iconv_convenience, ndr->flags)-4)/2)] uint32 _ndr_size;
                /*[subcontext(0),subcontext_size(_ndr_size*2)]*/ nstring_array string;
        } spoolss_StringArray;
@@ -592,7 +788,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [string,charset(UTF16)] uint16 *driver_name;
        } spoolss_AddDriverInfo1;
 
-       typedef [v1_enum] enum {
+       typedef [v1_enum,public] enum {
                SPOOLSS_DRIVER_VERSION_9X       = 0,
                SPOOLSS_DRIVER_VERSION_NT35     = 1,
                SPOOLSS_DRIVER_VERSION_NT4      = 2,
@@ -664,7 +860,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                spoolss_StringArray *dependent_files;
                [value(((ndr_size_spoolss_StringArray(previous_names, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
                spoolss_StringArray *previous_names;
-               NTTIME driver_data;
+               NTTIME driver_date;
                hyper driver_version;
                [string,charset(UTF16)] uint16 *manufacturer_name;
                [string,charset(UTF16)] uint16 *manufacturer_url;
@@ -672,25 +868,62 @@ import "misc.idl", "security.idl", "winreg.idl";
                [string,charset(UTF16)] uint16 *provider;
        } spoolss_AddDriverInfo6;
 
+       typedef struct {
+               spoolss_DriverOSVersion version;
+               [string,charset(UTF16)] uint16 *driver_name;
+               [string,charset(UTF16)] uint16 *architecture;
+               [string,charset(UTF16)] uint16 *driver_path;
+               [string,charset(UTF16)] uint16 *data_file;
+               [string,charset(UTF16)] uint16 *config_file;
+               [string,charset(UTF16)] uint16 *help_file;
+               [string,charset(UTF16)] uint16 *monitor_name;
+               [string,charset(UTF16)] uint16 *default_datatype;
+               [value(((ndr_size_spoolss_StringArray(dependent_files, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_dependent_files;
+               spoolss_StringArray *dependent_files;
+               [value(((ndr_size_spoolss_StringArray(previous_names, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_previous_names;
+               spoolss_StringArray *previous_names;
+               NTTIME driver_date;
+               hyper driver_version;
+               [string,charset(UTF16)] uint16 *manufacturer_name;
+               [string,charset(UTF16)] uint16 *manufacturer_url;
+               [string,charset(UTF16)] uint16 *hardware_id;
+               [string,charset(UTF16)] uint16 *provider;
+               [string,charset(UTF16)] uint16 *print_processor;
+               [string,charset(UTF16)] uint16 *vendor_setup;
+               [value(((ndr_size_spoolss_StringArray(color_profiles, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_color_profiles;
+               spoolss_StringArray *color_profiles;
+               [string,charset(UTF16)] uint16 *inf_path;
+               uint32 printer_driver_attributes;
+               [value(((ndr_size_spoolss_StringArray(core_driver_dependencies, ndr->iconv_convenience, ndr->flags)-4)/2))] uint32 _ndr_size_core_driver_dependencies;
+               spoolss_StringArray *core_driver_dependencies;
+               NTTIME min_inbox_driver_ver_date;
+               hyper min_inbox_driver_ver_version;
+       } spoolss_AddDriverInfo8;
+
        typedef [switch_type(uint32)] union {
                [case(1)] spoolss_AddDriverInfo1 *info1;
                [case(2)] spoolss_AddDriverInfo2 *info2;
                [case(3)] spoolss_AddDriverInfo3 *info3;
                [case(4)] spoolss_AddDriverInfo4 *info4;
                [case(6)] spoolss_AddDriverInfo6 *info6;
+               [case(8)] spoolss_AddDriverInfo8 *info8;
        } spoolss_AddDriverInfo;
 
+       typedef struct {
+               uint32 level;
+               [switch_is(level)] spoolss_AddDriverInfo info;
+       } spoolss_AddDriverInfoCtr;
+
        WERROR spoolss_AddPrinterDriver(
-               [in] [string,charset(UTF16)] uint16 *servername,
-               [in] uint32 level,
-               [in,switch_is(level)] spoolss_AddDriverInfo info
+               [in,unique] [string,charset(UTF16)] uint16 *servername,
+               [in,ref] spoolss_AddDriverInfoCtr *info_ctr
        );
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *driver_name;
        } spoolss_DriverInfo1;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
@@ -699,7 +932,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *config_file;
        } spoolss_DriverInfo2;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
@@ -712,7 +945,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *default_datatype;
        } spoolss_DriverInfo3;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
@@ -726,7 +959,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring_array *previous_names;
        } spoolss_DriverInfo4;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
@@ -738,7 +971,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 driver_version;
        } spoolss_DriverInfo5;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
@@ -750,7 +983,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *monitor_name;
                [relative] nstring *default_datatype;
                [relative] nstring_array *previous_names;
-               NTTIME driver_data;
+               NTTIME driver_date;
                hyper driver_version;
                [relative] nstring *manufacturer_name;
                [relative] nstring *manufacturer_url;
@@ -758,7 +991,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *provider;
        } spoolss_DriverInfo6;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
@@ -770,7 +1003,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *default_datatype;
                [relative] nstring_array *dependent_files;
                [relative] nstring_array *previous_names;
-               NTTIME driver_data;
+               NTTIME driver_date;
                hyper driver_version;
                [relative] nstring *manufacturer_name;
                [relative] nstring *manufacturer_url;
@@ -786,6 +1019,37 @@ import "misc.idl", "security.idl", "winreg.idl";
                hyper min_inbox_driver_ver_version;
        } spoolss_DriverInfo8;
 
+       typedef [v1_enum] enum {
+               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
+       } spoolss_DriverFileType;
+
+       typedef [public] struct {
+               [relative] nstring *file_name;
+               spoolss_DriverFileType file_type;
+               uint32 file_version;
+       } spoolss_DriverFileInfo;
+
+       typedef [public,gensize,nopush,nopull] struct {
+               spoolss_DriverOSVersion version;
+               [relative] nstring *driver_name;
+               [relative] nstring *architecture;
+               [relative] [size_is(file_count)] spoolss_DriverFileInfo *file_info;
+               uint32 file_count;
+               [relative] nstring *monitor_name;
+               [relative] nstring *default_datatype;
+               [relative] nstring_array *previous_names;
+               NTTIME driver_date;
+               hyper driver_version;
+               [relative] nstring *manufacturer_name;
+               [relative] nstring *manufacturer_url;
+               [relative] nstring *hardware_id;
+               [relative] nstring *provider;
+       } spoolss_DriverInfo101;
+
        typedef [nodiscriminant,relative_base,public] union {
                [case(1)] spoolss_DriverInfo1 info1;
                [case(2)] spoolss_DriverInfo2 info2;
@@ -793,6 +1057,8 @@ import "misc.idl", "security.idl", "winreg.idl";
                [case(4)] spoolss_DriverInfo4 info4;
                [case(5)] spoolss_DriverInfo5 info5;
                [case(6)] spoolss_DriverInfo6 info6;
+               [case(8)] spoolss_DriverInfo8 info8;
+               [case(101)] spoolss_DriverInfo101 info101;
                [default];
        } spoolss_DriverInfo;
 
@@ -806,7 +1072,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 offered,
                [out,unique] DATA_BLOB *info,
                [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count
        );
        [public,noopnum,noprint] void __spoolss_EnumPrinterDrivers(
                [in] uint32 level,
@@ -819,9 +1085,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 level,
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
-               [out,unique,switch_is(level),size_is(count)] spoolss_DriverInfo *info,
-               [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count,
+               [out,unique,switch_is(level),size_is(*count)] spoolss_DriverInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -831,7 +1097,7 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x0c */
-       typedef struct {
+       typedef [public,gensize] struct {
                nstring directory_name;
        } spoolss_DriverDirectoryInfo1;
 
@@ -889,7 +1155,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 offered,
                [out,unique] DATA_BLOB *info,
                [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count
        );
        [public,noopnum,noprint] void __spoolss_EnumPrintProcessors(
                [in] uint32 level,
@@ -902,14 +1168,30 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 level,
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
-               [out,unique,switch_is(level),size_is(count)] spoolss_PrintProcessorInfo *info,
-               [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count,
+               [out,unique,switch_is(level),size_is(*count)] spoolss_PrintProcessorInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
        /* Function: 0x10 */
-       [todo] WERROR spoolss_GetPrintProcessorDirectory(
+       typedef [public,gensize] struct {
+               nstring directory_name;
+       } spoolss_PrintProcessorDirectoryInfo1;
+
+       typedef [nodiscriminant,relative_base,gensize,public] union {
+               [case(1)] spoolss_PrintProcessorDirectoryInfo1 info1;
+               [default] spoolss_PrintProcessorDirectoryInfo1 info1;
+       } spoolss_PrintProcessorDirectoryInfo;
+
+       WERROR spoolss_GetPrintProcessorDirectory(
+               [in,unique] [string,charset(UTF16)] uint16 *server,
+               [in,unique] [string,charset(UTF16)] uint16 *environment,
+               [in] uint32 level,
+               [in,unique] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,unique,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_PrintProcessorDirectoryInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -996,6 +1278,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        /******************/
        /* Function: 0x1a */
        const string SPOOLSS_ARCHITECTURE_NT_X86                = "Windows NT x86";
+       const string SPOOLSS_DEFAULT_SERVER_PATH                = "C:\\WINDOWS\\system32\\spool";
 
        typedef [public,gensize] struct {
                [value(ndr_size_spoolss_OSVersion(r,ndr->iconv_convenience,ndr->flags))] uint32 _ndr_size;
@@ -1114,8 +1397,28 @@ import "misc.idl", "security.idl", "winreg.idl";
                spoolss_FormArea area;
        } spoolss_FormInfo1;
 
+       typedef [bitmap32bit] bitmap {
+               SPOOLSS_FORM_STRING_TYPE_NONE           = 0x00000001,
+               SPOOLSS_FORM_STRING_TYPE_MUI_DLL        = 0x00000002,
+               SPOOLSS_FORM_STRING_TYPE_LANG_PAIR      = 0x00000004
+       } spoolss_FormStringType;
+
+       typedef struct {
+               spoolss_FormFlags flags;
+               [relative] nstring *form_name;
+               spoolss_FormSize size;
+               spoolss_FormArea area;
+               [relative] astring *keyword;
+               spoolss_FormStringType string_type;
+               [relative] nstring *mui_dll;
+               uint32 ressource_id;
+               [relative] nstring *display_name;
+               uint32 lang_id;
+       } spoolss_FormInfo2;
+
        typedef [nodiscriminant,relative_base,public,gensize] union {
                [case(1)] spoolss_FormInfo1 info1;
+               [case(2)] spoolss_FormInfo2 info2;
                [default];
        } spoolss_FormInfo;
 
@@ -1126,8 +1429,22 @@ import "misc.idl", "security.idl", "winreg.idl";
                spoolss_FormArea area;
        } spoolss_AddFormInfo1;
 
+       typedef struct {
+               spoolss_FormFlags flags;
+               [string,charset(UTF16)] uint16 *form_name;
+               spoolss_FormSize size;
+               spoolss_FormArea area;
+               [string,charset(DOS)] uint8 *keyword;
+               spoolss_FormStringType string_type;
+               [string,charset(UTF16)] uint16 *mui_dll;
+               uint32 ressource_id;
+               [string,charset(UTF16)] uint16 *display_name;
+               uint32 lang_id;
+       } spoolss_AddFormInfo2;
+
        typedef [switch_type(uint32)] union {
                [case(1)] spoolss_AddFormInfo1 *info1;
+               [case(2)] spoolss_AddFormInfo2 *info2;
        } spoolss_AddFormInfo;
 
        WERROR spoolss_AddForm(
@@ -1173,7 +1490,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in]     uint32 offered,
                [out,unique] DATA_BLOB *info,
                [out,ref] uint32 *needed,
-               [out]    uint32 count
+               [out,ref] uint32 *count
        );
        [public,noopnum,noprint] void __spoolss_EnumForms(
                [in] uint32 level,
@@ -1185,9 +1502,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in]     uint32 level,
                [in,unique] DATA_BLOB *buffer,
                [in]     uint32 offered,
-               [out,unique,switch_is(level),size_is(count)] spoolss_FormInfo *info,
-               [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count,
+               [out,unique,switch_is(level),size_is(*count)] spoolss_FormInfo *info,
+               [out,ref] uint32 *needed
        );
 
        typedef struct {
@@ -1209,10 +1526,44 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 reserved;
        } spoolss_PortInfo2;
 
+       typedef [v1_enum] enum {
+               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
+       } spoolss_PortStatus;
+
+       typedef [v1_enum] enum {
+               PORT_STATUS_TYPE_ERROR          = 0x00000001,
+               PORT_STATUS_TYPE_WARNING        = 0x00000002,
+               PORT_STATUS_TYPE_INFO           = 0x00000003
+       } spoolss_PortSeverity;
+
+       typedef struct {
+               spoolss_PortStatus status;
+               [relative] nstring *status_string;
+               spoolss_PortSeverity severity;
+       } spoolss_PortInfo3;
+
+       typedef struct {
+               [relative] nstring *port_name;
+               DATA_BLOB monitor_data; /* relative ?? */
+       } spoolss_PortInfoFF;
+
        typedef [nodiscriminant,relative_base,public] union {
                [case(1)] spoolss_PortInfo1 info1;
                [case(2)] spoolss_PortInfo2 info2;
-               [case(3)]; /* TODO */
+               [case(3)] spoolss_PortInfo3 info3;
+               [case(0xff)] spoolss_PortInfoFF infoFF;
                [default];
        } spoolss_PortInfo;
 
@@ -1225,7 +1576,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 offered,
                [out,unique] DATA_BLOB *info,
                [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count
        );
        [public,noopnum,noprint] void __spoolss_EnumPorts(
                [in] uint32 level,
@@ -1237,9 +1588,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 level,
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
-               [out,unique,switch_is(level),size_is(count)] spoolss_PortInfo *info,
-               [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count,
+               [out,unique,switch_is(level),size_is(*count)] spoolss_PortInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -1267,7 +1618,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 offered,
                [out,unique] DATA_BLOB *info,
                [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count
        );
        [public,noopnum,noprint] void __spoolss_EnumMonitors(
                [in] uint32 level,
@@ -1279,9 +1630,9 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in] uint32 level,
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
-               [out,unique,switch_is(level),size_is(count)] spoolss_MonitorInfo *info,
-               [out,ref] uint32 *needed,
-               [out] uint32 count
+               [out,ref] uint32 *count,
+               [out,unique,switch_is(level),size_is(*count)] spoolss_MonitorInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -1366,7 +1717,10 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x34 */
-       [todo] WERROR spoolss_ResetPrinter(
+       WERROR spoolss_ResetPrinter(
+               [in,ref] policy_handle *handle,
+               [in,unique] [string,charset(UTF16)] uint16 *data_type,
+               [in,ref] spoolss_DevmodeContainer *devmode_ctr
        );
 
        /******************/
@@ -1379,7 +1733,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in]     uint32 offered,
                [in]     uint32 client_major_version,
                [in]     uint32 client_minor_version,
-               [out,unique] DATA_BLOB *info,
+               [out,unique,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_DriverInfo *info,
                [out,ref] uint32 *needed,
                [out,ref] uint32 *server_major_version,
                [out,ref] uint32 *server_minor_version
@@ -1437,21 +1791,16 @@ import "misc.idl", "security.idl", "winreg.idl";
                PRINTER_CHANGE_DELETE_PORT                      = 0x00400000,
                PRINTER_CHANGE_ADD_PRINT_PROCESSOR              = 0x01000000,
                PRINTER_CHANGE_DELETE_PRINT_PROCESSOR           = 0x04000000,
+               PRINTER_CHANGE_SERVER                           = 0x08000000,
                PRINTER_CHANGE_ADD_PRINTER_DRIVER               = 0x10000000,
                PRINTER_CHANGE_SET_PRINTER_DRIVER               = 0x20000000,
                PRINTER_CHANGE_DELETE_PRINTER_DRIVER            = 0x40000000,
                PRINTER_CHANGE_TIMEOUT                          = 0x80000000
        } spoolss_PrinterChangeFlags;
 
-       const int PRINTER_CHANGE_PRINTER                        = (PRINTER_CHANGE_ADD_PRINTER |
-                                                                  PRINTER_CHANGE_SET_PRINTER |
-                                                                  PRINTER_CHANGE_DELETE_PRINTER |
-                                                                  PRINTER_CHANGE_FAILED_CONNECTION_PRINTER); /* 0x000000FF */
+       const int PRINTER_CHANGE_PRINTER                        = 0x000000FF;
 
-       const int PRINTER_CHANGE_JOB                            = (PRINTER_CHANGE_ADD_JOB |
-                                                                  PRINTER_CHANGE_SET_JOB |
-                                                                  PRINTER_CHANGE_DELETE_JOB |
-                                                                  PRINTER_CHANGE_WRITE_JOB); /* 0x0000FF00 */
+       const int PRINTER_CHANGE_JOB                            = 0x0000FF00;
 
        const int PRINTER_CHANGE_FORM                           = (PRINTER_CHANGE_ADD_FORM |
                                                                   PRINTER_CHANGE_SET_FORM |
@@ -1461,14 +1810,14 @@ import "misc.idl", "security.idl", "winreg.idl";
                                                                   PRINTER_CHANGE_CONFIGURE_PORT |
                                                                   PRINTER_CHANGE_DELETE_PORT); /* 0x00700000 */
 
-       const int PRINTER_CHANGE_PRINT_PROCESSOR                = (PRINTER_CHANGE_ADD_PRINT_PROCESSOR |
-                                                                  PRINTER_CHANGE_DELETE_PRINT_PROCESSOR); /* 0x07000000 */
+       const int PRINTER_CHANGE_PRINT_PROCESSOR                = 0x07000000;
 
        const int PRINTER_CHANGE_PRINTER_DRIVER                 = (PRINTER_CHANGE_ADD_PRINTER_DRIVER |
                                                                   PRINTER_CHANGE_SET_PRINTER_DRIVER |
                                                                   PRINTER_CHANGE_DELETE_PRINTER_DRIVER); /* 0x70000000 */
 
-       const int PRINTER_CHANGE_ALL                            = (PRINTER_CHANGE_JOB |
+       const int PRINTER_CHANGE_ALL                            = (PRINTER_CHANGE_PRINTER |
+                                                                  PRINTER_CHANGE_JOB |
                                                                   PRINTER_CHANGE_FORM |
                                                                   PRINTER_CHANGE_PORT |
                                                                   PRINTER_CHANGE_PRINT_PROCESSOR |
@@ -1549,22 +1898,26 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 u3;
                uint32 count;
                [size_is(count)] spoolss_Field *fields;
-       } spoolss_NotifyOptionsArray;
+       } spoolss_NotifyOptionType;
+
+       typedef [bitmap32bit] bitmap {
+               PRINTER_NOTIFY_OPTIONS_REFRESH  = 0x00000001
+       } spoolssNotifyOptionFlags;
 
        typedef struct {
                [value(2)] uint32 version;
-               uint32 flags;
+               spoolssNotifyOptionFlags flags;
                uint32 count;
-               [size_is(count)] spoolss_NotifyOptionsArray *options;
-       } spoolss_NotifyOptionsContainer;
+               [size_is(count)] spoolss_NotifyOptionType *types;
+       } spoolss_NotifyOption;
 
        [public] WERROR spoolss_RemoteFindFirstPrinterChangeNotifyEx(
                [in,ref] policy_handle *handle,
-               [in] uint32 flags,
+               [in] spoolss_PrinterChangeFlags flags,
                [in] uint32 options,
-               [in,unique] [string,charset(UTF16)] uint16 *str,
+               [in,unique] [string,charset(UTF16)] uint16 *local_machine,
                [in] uint32 printer_local,
-               [in,unique] spoolss_NotifyOptionsContainer *t1
+               [in,unique] spoolss_NotifyOption *notify_options
        );
 
        /******************/
@@ -1586,7 +1939,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        typedef [switch_type(uint32)] union {
                [case(1)] uint32 integer[2];
                [case(2)] spoolss_NotifyString string;
-               [case(3)] spoolss_DeviceMode *devmode;
+               [case(3)] spoolss_DevmodeContainer devmode;
                [case(4)] spoolss_TimeCtr time;
                [case(5)] sec_desc_buf sd;
        } spoolss_NotifyData;
@@ -1630,7 +1983,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        [public] WERROR spoolss_RouterRefreshPrinterChangeNotify(
                [in,ref] policy_handle *handle,
                [in] uint32 change_low,
-               [in,unique] spoolss_NotifyOptionsContainer *container,
+               [in,unique] spoolss_NotifyOption *options,
                [out,ref] spoolss_NotifyInfo **info
        );
 
@@ -1644,13 +1997,32 @@ import "misc.idl", "security.idl", "winreg.idl";
                [string,charset(UTF16)] uint16 *client;
                [string,charset(UTF16)] uint16 *user;
                uint32 build;
-               uint32 major;
-               uint32 minor;
-               uint32 processor;
+               spoolss_MajorVersion major;
+               spoolss_MinorVersion minor;
+               spoolss_ProcessorArchitecture processor;
        } spoolss_UserLevel1;
 
-       typedef union {
+       typedef struct {
+               uint32 not_used;
+       } spoolss_UserLevel2;
+
+       typedef struct {
+               uint32 size;
+               uint32 flags;
+               uint32 size2;
+               [string,charset(UTF16)] uint16 *client;
+               [string,charset(UTF16)] uint16 *user;
+               uint32 build;
+               spoolss_MajorVersion major;
+               spoolss_MinorVersion minor;
+               spoolss_ProcessorArchitecture processor;
+               udlong reserved;
+       } spoolss_UserLevel3;
+
+       typedef [switch_type(uint32)] union {
                [case(1)]  spoolss_UserLevel1 *level1;
+               [case(2)]  spoolss_UserLevel2 *level2;
+               [case(3)]  spoolss_UserLevel3 *level3;
        } spoolss_UserLevel;
 
        typedef struct {
@@ -1663,7 +2035,8 @@ import "misc.idl", "security.idl", "winreg.idl";
                SERVER_ACCESS_ENUMERATE         = 0x00000002,
                PRINTER_ACCESS_ADMINISTER       = 0x00000004,
                PRINTER_ACCESS_USE              = 0x00000008,
-               JOB_ACCESS_ADMINISTER           = 0x00000010
+               JOB_ACCESS_ADMINISTER           = 0x00000010,
+               JOB_ACCESS_READ                 = 0x00000020
        } spoolss_AccessRights;
 
        /* Access rights for print servers */
@@ -1725,7 +2098,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique]           [string,charset(UTF16)] uint16 *printername,
                [in,unique]           [string,charset(UTF16)] uint16 *datatype,
                [in]                  spoolss_DevmodeContainer devmode_ctr,
-               [in]                  uint32 access_mask,
+               [in]                  spoolss_AccessRights access_mask,
                [in]                  uint32 level,
                [in,switch_is(level)] spoolss_UserLevel userlevel,
                [out,ref]             policy_handle *handle
@@ -1880,6 +2253,51 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x58 */
+
+       typedef [v1_enum] enum {
+               PROTOCOL_RAWTCP_TYPE    = 1,
+               PROTOCOL_LPR_TYPE       = 2
+       } spoolss_PortProtocol;
+
+       typedef [public] struct {
+               [charset(UTF16)] uint16 portname[64];
+               [value(0x00000001)] uint32 version;
+               spoolss_PortProtocol protocol;
+               [value(sizeof(r))] uint32 size;
+               uint32 reserved;
+               [charset(UTF16)] uint16 hostaddress[49];
+               [charset(UTF16)] uint16 snmpcommunity[33];
+               uint32 dblspool;
+               [charset(UTF16)] uint16 queue[33];
+               [charset(UTF16)] uint16 ip_address[16]; /* s3 had 17 */
+               [charset(UTF16)] uint16 hardware_address[13];
+               [charset(UTF16)] uint16 device_type[257];
+               uint32 port_number;
+               boolean32 snmp_enabled;
+               uint32 snmp_dev_index;
+       } spoolss_PortData1;
+
+       typedef [public] struct {
+               [charset(UTF16)] uint16 portname[64];
+               [value(0x00000002)] uint32 version;
+               spoolss_PortProtocol protocol;
+               [value(sizeof(r))] uint32 size;
+               uint32 reserved;
+               [charset(UTF16)] uint16 hostaddress[128];
+               [charset(UTF16)] uint16 snmpcommunity[33];
+               uint32 dblspool;
+               [charset(UTF16)] uint16 queue[33];
+               [charset(UTF16)] uint16 device_type[257];
+               uint32 port_number;
+               boolean32 snmp_enabled;
+               uint32 snmp_dev_index;
+               uint32 port_monitor_mib_index;
+       } spoolss_PortData2;
+
+       typedef [public] struct {
+               nstring dll_name;
+       } spoolss_MonitorUi;
+
        WERROR spoolss_XcvData(
                [in,ref] policy_handle *handle,
                [in] [string,charset(UTF16)] uint16 function_name[],
@@ -1906,9 +2324,8 @@ import "misc.idl", "security.idl", "winreg.idl";
        } spoolss_AddPrinterDriverExFlags;
 
        [public] WERROR spoolss_AddPrinterDriverEx(
-               [in] [string,charset(UTF16)] uint16 *servername,
-               [in] uint32 level,
-               [in,switch_is(level)] spoolss_AddDriverInfo info,
+               [in,unique] [string,charset(UTF16)] uint16 *servername,
+               [in,ref] spoolss_AddDriverInfoCtr *info_ctr,
                [in] spoolss_AddPrinterDriverExFlags flags
        );