Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-python
[jelmer/samba4-debian.git] / source / librpc / idl / spoolss.idl
index a14f9dd8248640a1835acb9aa389aef61ab1fdd9..7d40861a52622801e0bb6751f9eb94e52b37e4b0 100644 (file)
@@ -3,15 +3,18 @@
 /*
   spoolss interface definitions
 */
+import "security.idl", "winreg.idl";
 
 [ uuid("12345678-1234-abcd-ef00-0123456789ab"),
   version(1.0),
   endpoint("ncacn_np:[\\pipe\\spoolss]"),
   pointer_default(unique),
+  pointer_default_top(unique),
   helpstring("Spooler SubSystem"),
-  depends(security)
+  helper("librpc/ndr/ndr_spoolss_buf.h")
 ] interface spoolss
 {
+       typedef [v1_enum] enum winreg_Type winreg_Type;
        typedef struct {
                uint16 year;
                uint16 month;
                uint32 unknown29;
        } spoolss_PrinterInfo0;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                string32 devicename;
                uint16 specversion;
                uint16 driverversion;
                uint16 size;
-               uint16 driverextra;
+               [value(r->driverextra_data.length)] uint16 __driverextra_length;
                uint32 fields;
                uint16 orientation;
                uint16 papersize;
                uint32 reserved2;
                uint32 panningwidth;
                uint32 panningheight;
-               uint8  private[driverextra];
+               [subcontext_size(__driverextra_length),subcontext(0),flag(NDR_REMAINING)] DATA_BLOB driverextra_data;
        } spoolss_DeviceMode;
 
-       typedef [public] struct {
-               uint32 flags;
+       typedef [public] bitmap {
+               PRINTER_ENUM_DEFAULT     = 0x00000001,
+               PRINTER_ENUM_LOCAL       = 0x00000002,
+               PRINTER_ENUM_CONNECTIONS = 0x00000004,
+               PRINTER_ENUM_FAVORITE    = 0x00000004,
+               PRINTER_ENUM_NAME        = 0x00000008,
+               PRINTER_ENUM_REMOTE      = 0x00000010,
+               PRINTER_ENUM_SHARED      = 0x00000020,
+               PRINTER_ENUM_NETWORK     = 0x00000040,
+               PRINTER_ENUM_EXPAND      = 0x00004000,
+               PRINTER_ENUM_CONTAINER   = 0x00008000,
+               PRINTER_ENUM_ICON1       = 0x00010000,
+               PRINTER_ENUM_ICON2       = 0x00020000,
+               PRINTER_ENUM_ICON3       = 0x00040000,
+               PRINTER_ENUM_ICON4       = 0x00080000,
+               PRINTER_ENUM_ICON5       = 0x00100000,
+               PRINTER_ENUM_ICON6       = 0x00200000,
+               PRINTER_ENUM_ICON7       = 0x00400000,
+               PRINTER_ENUM_ICON8       = 0x00800000,
+               PRINTER_ENUM_HIDE        = 0x01000000
+       } spoolss_EnumPrinterFlags;
+
+       typedef struct {
+               spoolss_EnumPrinterFlags flags;
                [relative] nstring *name;
                [relative] nstring *description;
                [relative] nstring *comment;
        } spoolss_PrinterInfo1;
 
-       typedef [public] struct {
+       typedef bitmap {
+               PRINTER_ATTRIBUTE_QUEUED                = 0x00000001,
+               PRINTER_ATTRIBUTE_DIRECT                = 0x00000002,
+               PRINTER_ATTRIBUTE_DEFAULT               = 0x00000004,
+               PRINTER_ATTRIBUTE_SHARED                = 0x00000008,
+               PRINTER_ATTRIBUTE_NETWORK               = 0x00000010,
+               PRINTER_ATTRIBUTE_HIDDEN                = 0x00000020,
+               PRINTER_ATTRIBUTE_LOCAL                 = 0x00000040,
+               PRINTER_ATTRIBUTE_ENABLE_DEVQ           = 0x00000080,
+               PRINTER_ATTRIBUTE_KEEPPRINTEDJOBS       = 0x00000100,
+               PRINTER_ATTRIBUTE_DO_COMPLETE_FIRST     = 0x00000200,
+               PRINTER_ATTRIBUTE_WORK_OFFLINE          = 0x00000400,
+               PRINTER_ATTRIBUTE_ENABLE_BIDI           = 0x00000800,
+               PRINTER_ATTRIBUTE_RAW_ONLY              = 0x00001000,
+               PRINTER_ATTRIBUTE_PUBLISHED             = 0x00002000,
+               PRINTER_ATTRIBUTE_FAX                   = 0x00004000,
+               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;
                [relative] nstring *sharename;
                [relative] nstring *drivername;
                [relative] nstring *comment;
                [relative] nstring *location;
-               [relative] spoolss_DeviceMode *devmode;
+               [relative,subcontext(0)] spoolss_DeviceMode *devmode;
                [relative] nstring *sepfile;
                [relative] nstring *printprocessor;
                [relative] nstring *datatype;
                [relative] nstring *parameters;
                [relative,subcontext(0)] security_descriptor *secdesc;
-               uint32 attributes;
+               spoolss_PrinterAttributes attributes;
                uint32 priority;
                uint32 defaultpriority;
                uint32 starttime;
                uint32 untiltime;
-               uint32 status;
+               spoolss_PrinterStatus status;
                uint32 cjobs;
                uint32 averageppm;
        } spoolss_PrinterInfo2;
 
        typedef struct {
-               uint32 flags;
-               [subcontext(0)] security_descriptor secdesc;
+               [relative,subcontext(0)] security_descriptor *secdesc;
        } spoolss_PrinterInfo3;
 
        typedef struct {
                [relative] nstring *printername;
                [relative] nstring *servername;
-               uint32 attributes;
+               spoolss_PrinterAttributes attributes;
        } spoolss_PrinterInfo4;
 
-       typedef [public] struct {
+       typedef struct {
                [relative] nstring *printername;
                [relative] nstring *portname;
-               uint32 attributes;
+               spoolss_PrinterAttributes attributes;
                uint32 device_not_selected_timeout;
                uint32 transmission_retry_timeout;
        } spoolss_PrinterInfo5;
 
        typedef struct {
-               uint32 unknown;
+               spoolss_PrinterStatus status;
        } spoolss_PrinterInfo6;
 
+       typedef bitmap {
+               DSPRINT_PUBLISH         = 0x00000001,
+               DSPRINT_UPDATE          = 0x00000002,
+               DSPRINT_UNPUBLISH       = 0x00000004,
+               DSPRINT_REPUBLISH       = 0x00000008,
+               DSPRINT_PENDING         = 0x80000000
+       } spoolss_DsPrintAction;
+
        typedef struct {
                [relative] nstring *guid; /* text form of printer guid */
-               uint32 action;
+               spoolss_DsPrintAction action;
        } spoolss_PrinterInfo7;
 
-       typedef [nodiscriminant,public] union {
+       typedef struct {
+               [relative,subcontext(0)] spoolss_DeviceMode *devmode;
+       } spoolss_DeviceModeInfo;
+
+       typedef [nodiscriminant,relative_base,public] union {
                [case(0)] spoolss_PrinterInfo0 info0;
                [case(1)] spoolss_PrinterInfo1 info1;
                [case(2)] spoolss_PrinterInfo2 info2;
                [case(5)] spoolss_PrinterInfo5 info5;
                [case(6)] spoolss_PrinterInfo6 info6;
                [case(7)] spoolss_PrinterInfo7 info7;
+               [case(8)] spoolss_DeviceModeInfo info8;
+               [case(9)] spoolss_DeviceModeInfo info9;
+               [default];
        } spoolss_PrinterInfo;
 
-       const int PRINTER_ENUM_DEFAULT     = 0x00000001;
-       const int PRINTER_ENUM_LOCAL       = 0x00000002;
-       const int PRINTER_ENUM_CONNECTIONS = 0x00000004;
-       const int PRINTER_ENUM_FAVORITE    = 0x00000004;
-       const int PRINTER_ENUM_NAME        = 0x00000008;
-       const int PRINTER_ENUM_REMOTE      = 0x00000010;
-       const int PRINTER_ENUM_SHARED      = 0x00000020;
-       const int PRINTER_ENUM_NETWORK     = 0x00000040;
-
        /******************/
        /* Function: 0x00 */
-       WERROR spoolss_EnumPrinters(
-               [in]         uint32 flags,
-               [in]         unistr *server,
-               [in]         uint32 level,
-               [in,out]     DATA_BLOB *buffer,
-               [in,out,ref] uint32 *buf_size,
-               [out]        uint32 count
+       /* we are using this as internal parsing code */
+       [public,noopnum,noprint] WERROR _spoolss_EnumPrinters(
+               [in] spoolss_EnumPrinterFlags flags,
+               [in] [string,charset(UTF16)] uint16 *server,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out] DATA_BLOB *info,
+               [out] uint32 needed,
+               [out] uint32 count
        );
-
-       /******************/
-       /* Function: 0x01 */
-       WERROR spoolss_OpenPrinter(
-               [in]        unistr *server,
-               [in]        unistr *printer,
-               [in]        DATA_BLOB *buffer,
-               [in]        uint32 access_mask,
-               [out,ref]   policy_handle *handle
+       [public,noopnum,noprint] void __spoolss_EnumPrinters(
+               [in] uint32 level,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_PrinterInfo info[count]
        );
-
-       /******************/
-       /* Function: 0x02 */
-       WERROR spoolss_SetJob(
-               [in,ref] policy_handle *handle,
-               [in] uint32 job_id,
+       [nopull,nopush] WERROR spoolss_EnumPrinters(
+               [in] spoolss_EnumPrinterFlags flags,
+               [in] [string,charset(UTF16)] uint16 *server,
                [in] uint32 level,
-               [in] uint32 command
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               /* what we have here is a subcontext containing an array of no discriminant unions
+                * and the array has no size in front
+                */
+               [out,switch_is(level),size_is(count)] spoolss_PrinterInfo *info,
+               [out] uint32 needed,
+               [out] uint32 count
        );
 
        /******************/
-       /* Function: 0x03 */
-       WERROR spoolss_GetJob(
-               [in,ref] policy_handle *handle,
-               [in] uint32 job_id,
-               [in] uint32 level,
-               [in] DATA_BLOB *buffer,
-               [out,subcontext(4),switch_is(level)] spoolss_JobInfo *info,
-               [in,out,ref] uint32 *buf_size
+       /* Function: 0x01 */
+       typedef struct {
+               [value(_ndr_size_spoolss_DeviceMode(devmode, ndr->flags))] uint32 _ndr_size;
+               [subcontext(4),subcontext_size(_ndr_size)] spoolss_DeviceMode *devmode;
+       } spoolss_DevmodeContainer;
+
+       [public] WERROR spoolss_OpenPrinter(
+               [in] [string,charset(UTF16)] uint16 *printername,
+               [in] [string,charset(UTF16)] uint16 *datatype,
+               [in] spoolss_DevmodeContainer devmode_ctr,
+               [in] uint32 access_mask,
+               [out,ref] policy_handle *handle
        );
 
+       /******************/
+       /* Function: 0x02 */
        typedef struct {
                uint32 job_id;
                [relative] nstring *printer_name;
                spoolss_Time time;
        } spoolss_JobInfo1;
 
-       typedef [nodiscriminant,public] union {
+       typedef [nodiscriminant,relative_base,public] union {
                [case(1)] spoolss_JobInfo1 info1;
+               [case(2)]; /* TODO */
+               [case(3)]; /* TODO */
+               [default];
        } spoolss_JobInfo;
 
+       typedef struct {
+               uint32 level;
+               [switch_is(level)] spoolss_JobInfo info;
+       } spoolss_JobInfoContainer;
+
+       typedef [v1_enum] enum {
+               SPOOLSS_JOB_CONTROL_PAUSE               = 1,
+               SPOOLSS_JOB_CONTROL_RESUME              = 2,
+               SPOOLSS_JOB_CONTROL_CANCEL              = 3,
+               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_JobControl;
+
+       WERROR spoolss_SetJob(
+               [in,ref] policy_handle *handle,
+               [in] uint32 job_id,
+               [in] spoolss_JobInfoContainer *ctr,
+               [in] spoolss_JobControl command
+       );
+
+       /******************/
+       /* Function: 0x03 */
+       WERROR spoolss_GetJob(
+               [in,ref] policy_handle *handle,
+               [in]     uint32 job_id,
+               [in]     uint32 level,
+               [in]     DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [out,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_JobInfo *info,
+               [out]    uint32 needed
+       );
+
        /******************/
        /* Function: 0x04 */
-       WERROR spoolss_EnumJobs(
+       [public,noopnum,noprint] WERROR _spoolss_EnumJobs(
+               [in,ref] policy_handle *handle,
+               [in]     uint32 firstjob,
+               [in]     uint32 numjobs,
+               [in]     uint32 level,
+               [in]     DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [out]    DATA_BLOB *info,
+               [out]    uint32 needed,
+               [out]    uint32 count
+       );
+       [public,noopnum,noprint] void __spoolss_EnumJobs(
+               [in] uint32 level,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_JobInfo info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumJobs(
                [in,ref] policy_handle *handle,
                [in]     uint32 firstjob,
                [in]     uint32 numjobs,
                [in]     uint32 level,
-               [in,out]     DATA_BLOB *buffer,
-               [in,out,ref] uint32 *buf_size,
+               [in]     DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [out,switch_is(level),size_is(count)] spoolss_JobInfo *info,
+               [out]    uint32 needed,
                [out]    uint32 count
        );
 
 
        /******************/
        /* Function: 0x07 */
+       typedef [v1_enum] enum {
+               SPOOLSS_PRINTER_CONTROL_UNPAUSE    = 0,
+               SPOOLSS_PRINTER_CONTROL_PAUSE      = 1,
+               SPOOLSS_PRINTER_CONTROL_RESUME     = 2,
+               SPOOLSS_PRINTER_CONTROL_PURGE      = 3,
+               SPOOLSS_PRINTER_CONTROL_SET_STATUS = 4
+       } spoolss_PrinterControl;
+
+       typedef [switch_type(uint32)] union {
+               [case(0)] spoolss_PrinterInfo0 *info0;
+               [case(1)] spoolss_PrinterInfo1 *info1;
+               [case(2)] spoolss_PrinterInfo2 *info2;
+               [case(3)] spoolss_PrinterInfo3 *info3;
+               [case(4)] spoolss_PrinterInfo4 *info4;
+               [case(5)] spoolss_PrinterInfo5 *info5;
+               [case(6)] spoolss_PrinterInfo6 *info6;
+               [case(7)] spoolss_PrinterInfo7 *info7;
+               [case(8)] spoolss_DeviceModeInfo *info8;
+               [case(9)] spoolss_DeviceModeInfo *info9;
+               [default];
+       } spoolss_SetPrinterInfo;
+
        WERROR spoolss_SetPrinter(
+               [in,ref] policy_handle *handle,
+               [in] uint32 level,
+               [in,switch_is(level)] spoolss_SetPrinterInfo info,
+               [in] spoolss_DevmodeContainer devmode_ctr,
+               [in] sec_desc_buf secdesc_ctr,
+               [in] spoolss_PrinterControl command
        );
 
        /******************/
        /* Function: 0x08 */
-       WERROR spoolss_GetPrinter(
-               [in,ref]     policy_handle *handle,
-               [in]         uint32 level,
-               [in]         DATA_BLOB *buffer,
-               [out,subcontext(4),switch_is(level)] spoolss_PrinterInfo *info,
-               [in,out,ref] uint32 *buf_size
+       [public] WERROR spoolss_GetPrinter(
+               [in,ref] policy_handle *handle,
+               [in]     uint32 level,
+               [in]     DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [out,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_PrinterInfo *info,
+               [out]    uint32 needed
        );
 
        /******************/
                [relative] nstring *driver_name;
        } spoolss_DriverInfo1;
 
+       typedef [v1_enum] enum {
+               SPOOLSS_DRIVER_VERSION_9X       = 0,
+               SPOOLSS_DRIVER_VERSION_NT35     = 1,
+               SPOOLSS_DRIVER_VERSION_NT4      = 2,
+               SPOOLSS_DRIVER_VERSION_200X     = 3
+       } spoolss_DriverOSVersion;
+
        typedef struct {
-               uint32 version;
+               spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
                [relative] nstring *driver_path;
        } spoolss_DriverInfo2;
 
        typedef struct {
-               uint32 version;
+               spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
                [relative] nstring *driver_path;
                [relative] nstring *data_file;
                [relative] nstring *config_file;
                [relative] nstring *help_file;
-               [relative] nstring *dependent_files; /* array */
+               [relative] nstring_array *dependent_files;
                [relative] nstring *monitor_name;
                [relative] nstring *default_datatype;
        } spoolss_DriverInfo3;
 
-       typedef [nodiscriminant,public] union {
+       typedef struct {
+               spoolss_DriverOSVersion version;
+               [relative] nstring *driver_name;
+               [relative] nstring *architecture;
+               [relative] nstring *driver_path;
+               [relative] nstring *data_file;
+               [relative] nstring *config_file;
+               [relative] nstring *help_file;
+               [relative] nstring_array *dependent_files;
+               [relative] nstring *monitor_name;
+               [relative] nstring *default_datatype;
+               [relative] nstring_array *previous_names;
+       } spoolss_DriverInfo4;
+
+       typedef struct {
+               spoolss_DriverOSVersion version;
+               [relative] nstring *driver_name;
+               [relative] nstring *architecture;
+               [relative] nstring *driver_path;
+               [relative] nstring *data_file;
+               [relative] nstring *config_file;
+               uint32 driver_attributes;
+               uint32 config_version;
+               uint32 driver_version;
+       } spoolss_DriverInfo5;
+
+       typedef struct {
+               spoolss_DriverOSVersion version;
+               [relative] nstring *driver_name;
+               [relative] nstring *architecture;
+               [relative] nstring *driver_path;
+               [relative] nstring *data_file;
+               [relative] nstring *config_file;
+               [relative] nstring *help_file;
+               [relative] nstring_array *dependent_files;
+               [relative] nstring *monitor_name;
+               [relative] nstring *default_datatype;
+               [relative] nstring_array *previous_names;
+               NTTIME driver_data;
+               hyper driver_version;
+               [relative] nstring *manufacturer_name;
+               [relative] nstring *manufacturer_url;
+               [relative] nstring *hardware_id;
+               [relative] nstring *provider;
+       } spoolss_DriverInfo6;
+
+       typedef [nodiscriminant,relative_base,public] union {
                [case(1)] spoolss_DriverInfo1 info1;
                [case(2)] spoolss_DriverInfo2 info2;
                [case(3)] spoolss_DriverInfo3 info3;
+               [case(4)] spoolss_DriverInfo4 info4;
+               [case(5)] spoolss_DriverInfo5 info5;
+               [case(6)] spoolss_DriverInfo6 info6;
+               [default];
        } spoolss_DriverInfo;
 
        /******************/
        /* Function: 0x0a */
-       WERROR spoolss_EnumPrinterDrivers(
-               [in] unistr *server,
-               [in] unistr *environment,
+       [public,noopnum,noprint] WERROR _spoolss_EnumPrinterDrivers(
+               [in] [string,charset(UTF16)] uint16 *server,
+               [in] [string,charset(UTF16)] uint16 *environment,
                [in] uint32 level,
-               [in,out] DATA_BLOB *buffer,
-               [in,out,ref] uint32 *buf_size,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out] DATA_BLOB *info,
+               [out] uint32 needed,
+               [out] uint32 count
+       );
+       [public,noopnum,noprint] void __spoolss_EnumPrinterDrivers(
+               [in] uint32 level,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_DriverInfo info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumPrinterDrivers(
+               [in] [string,charset(UTF16)] uint16 *server,
+               [in] [string,charset(UTF16)] uint16 *environment,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,switch_is(level),size_is(count)] spoolss_DriverInfo *info,
+               [out] uint32 needed,
                [out] uint32 count
        );
 
 
        /******************/
        /* Function: 0x0c */
-       WERROR spoolss_GetPrinterDriverDirectory(
+       typedef struct {
+               nstring directory_name;
+       } spoolss_DriverDirectoryInfo1;
+
+       /* NOTE: it's seems that w2k3 completly ignores the level
+                in its server code
+        */
+       typedef [nodiscriminant,relative_base,gensize,public] union {
+               [case(1)] spoolss_DriverDirectoryInfo1 info1;
+               [default] spoolss_DriverDirectoryInfo1 info1;
+       } spoolss_DriverDirectoryInfo;
+
+       [public] WERROR spoolss_GetPrinterDriverDirectory(
+               [in] [string,charset(UTF16)] uint16 *server,
+               [in] [string,charset(UTF16)] uint16 *environment,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_DriverDirectoryInfo *info,
+               [out] uint32 needed
        );
 
        /******************/
        /* Function: 0x0d */
        WERROR spoolss_DeletePrinterDriver(
                [in,ref] policy_handle *handle,
-               [in] unistr *server,
-               [in] unistr architecture,
-               [in] unistr driver
+               [in] [string,charset(UTF16)] uint16 *server,
+               [in] [string,charset(UTF16)] uint16 architecture[],
+               [in] [string,charset(UTF16)] uint16 driver[]
        );
 
        /******************/
 
        /******************/
        /* Function: 0x0f */
-       WERROR spoolss_EnumPrintProcessors(
+       typedef struct {
+               [relative] nstring *print_processor_name;
+       } spoolss_PrintProcessorInfo1;
+
+       typedef [nodiscriminant,relative_base,public] union {
+               [case(1)] spoolss_PrintProcessorInfo1 info1;
+               [default];
+       } spoolss_PrintProcessorInfo;
+
+       [public,noopnum,noprint] WERROR _spoolss_EnumPrintProcessors(
+               [in] [string,charset(UTF16)] uint16 *servername,
+               [in] [string,charset(UTF16)] uint16 *environment,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out] DATA_BLOB *info,
+               [out] uint32 needed,
+               [out] uint32 count
+       );
+       [public,noopnum,noprint] void __spoolss_EnumPrintProcessors(
+               [in] uint32 level,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_PrintProcessorInfo info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumPrintProcessors(
+               [in] [string,charset(UTF16)] uint16 *servername,
+               [in] [string,charset(UTF16)] uint16 *environment,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,switch_is(level),size_is(count)] spoolss_PrintProcessorInfo *info,
+               [out] uint32 needed,
+               [out] uint32 count
        );
 
        /******************/
 
        /******************/
        /* Function: 0x11 */
+       typedef struct {
+               [string,charset(UTF16)] uint16 *document_name;
+               [string,charset(UTF16)] uint16 *output_file;
+               [string,charset(UTF16)] uint16 *datatype;
+       } spoolss_DocumentInfo1;
+
+       typedef [switch_type(uint32)] union {
+               [case(1)] spoolss_DocumentInfo1 *info1;
+               [case(2)]; /* TODO */
+               [case(3)]; /* TODO */
+               [default];
+       } spoolss_DocumentInfo;
+
        WERROR spoolss_StartDocPrinter(
+               [in,ref] policy_handle *handle,
+               [in] uint32 level,
+               [in,switch_is(level)] spoolss_DocumentInfo info,
+               [out] uint32 job_id
        );
 
        /******************/
        /* Function: 0x12 */
        WERROR spoolss_StartPagePrinter(
-               [in,ref] policy_handle *handle          
+               [in,ref] policy_handle *handle
        );
 
        /******************/
        /* Function: 0x13 */
        WERROR spoolss_WritePrinter(
+               [in,ref] policy_handle *handle,
+               [in] DATA_BLOB data,
+               [in,value(r->in.data.length)] uint32 _data_size,
+               [out] uint32 num_written
        );
 
        /******************/
        /* Function: 0x14 */
        WERROR spoolss_EndPagePrinter(
-               [in,ref] policy_handle *handle          
+               [in,ref] policy_handle *handle
        );
 
        /******************/
        /* Function: 0x15 */
        WERROR spoolss_AbortPrinter(
+               [in,ref] policy_handle *handle
        );
 
        /******************/
        /* Function: 0x16 */
        WERROR spoolss_ReadPrinter(
+               [in,ref] policy_handle *handle,
+               [in] uint32 data_size,
+               [out] DATA_BLOB data,
+               [out,value(r->out.data.length)] uint32 _data_size
        );
 
        /******************/
        /* Function: 0x17 */
        WERROR spoolss_EndDocPrinter(
+               [in,ref] policy_handle *handle
        );
 
        /******************/
 
        /******************/
        /* Function: 0x1a */
-       WERROR spoolss_GetPrinterData(
+       const string SPOOLSS_ARCHITECTURE_NT_X86                = "Windows NT x86";
+
+       typedef [public,gensize] struct {
+               [value(ndr_size_spoolss_OSVersion(r,ndr->flags))] uint32 _ndr_size;
+               uint32 major;
+               uint32 minor;
+               uint32 build;
+               [value(2)] uint32 unknown;
+               [subcontext(0),subcontext_size(256)] nstring extra_string;
+       } spoolss_OSVersion;
+
+       typedef [public,gensize] struct {
+               [value(ndr_size_spoolss_OSVersionEx(r,ndr->flags))] uint32 _ndr_size;
+               uint32 major;
+               uint32 minor;
+               uint32 build;
+               [value(2)] uint32 unknown1;
+               [subcontext(0),subcontext_size(256)] nstring extra_string;
+               uint32 unknown2;/* service pack number? I saw 0 from w2k3 and 1 from winxp sp1*/
+               uint32 unknown3;/* hmm? w2k3: 131346(0x20112) winxp sp1: 503382272 0x1E010100 */
+       } spoolss_OSVersionEx;
+
+       typedef [v1_enum] enum {
+               SPOOLSS_PRINTER_DATA_TYPE_NULL = 0,
+               SPOOLSS_PRINTER_DATA_TYPE_STRING = 1,
+               SPOOLSS_PRINTER_DATA_TYPE_BINARY = 3,
+               SPOOLSS_PRINTER_DATA_TYPE_UINT32 = 4,
+               SPOOLSS_PRINTER_DATA_TYPE_STRING_ARRAY = 7
+       } spoolss_PrinterDataType;
+
+       typedef [nodiscriminant,public,gensize] union {
+               [case(SPOOLSS_PRINTER_DATA_TYPE_NULL)];
+               [case(SPOOLSS_PRINTER_DATA_TYPE_STRING)] nstring string;
+               [case(SPOOLSS_PRINTER_DATA_TYPE_BINARY),flag(NDR_REMAINING)] DATA_BLOB binary;
+               [case(SPOOLSS_PRINTER_DATA_TYPE_UINT32)] uint32 value;
+               [case(SPOOLSS_PRINTER_DATA_TYPE_STRING_ARRAY)] nstring_array string_array;
+               [default,flag(NDR_REMAINING)] DATA_BLOB data;
+       } spoolss_PrinterData;
+
+       [noopnum,noprint,public] WERROR _spoolss_GetPrinterData(
+               [in,ref] policy_handle *handle,
+               [in]     [string,charset(UTF16)] uint16 value_name[],
+               [in]     uint32 offered,
+               [out]    spoolss_PrinterDataType type,
+               [out]    DATA_BLOB data,
+               [out]    uint32 needed
+       );
+       [noopnum,noprint,public] void __spoolss_GetPrinterData(
+               [in] spoolss_PrinterDataType type,
+               [out,switch_is(type)] spoolss_PrinterData data
+       );
+       [nopull,nopush,public] WERROR spoolss_GetPrinterData(
                [in,ref] policy_handle *handle,
-               [in] unistr value_name,
-               [out] uint32 type,
-               [out] DATA_BLOB buffer,
-               [in,out,ref] uint32 *buf_size
+               [in]     [string,charset(UTF16)] uint16 value_name[],
+               [in]     uint32 offered,
+               [out]    spoolss_PrinterDataType type,
+               [out,subcontext(4),subcontext_size(offered),switch_is(type)] spoolss_PrinterData data,
+               [out]    uint32 needed
        );
 
        /******************/
        /* Function: 0x1b */
-       WERROR spoolss_SetPrinterData(  
+       [noopnum,nopull,noprint,public] WERROR _spoolss_SetPrinterData(
                [in,ref] policy_handle *handle,
-               [in] unistr value_name,
-               [in] uint32 type,
-               [in] DATA_BLOB buffer,
-               [in] uint32 real_len
+               [in] [string,charset(UTF16)] uint16 value_name[],
+               [in] spoolss_PrinterDataType type,
+               [in] DATA_BLOB data,
+               [in] uint32 _offered
+       );
+       [noopnum,nopull,noprint,public] void __spoolss_SetPrinterData(
+               [in] spoolss_PrinterDataType type,
+               [out,switch_is(type)] spoolss_PrinterData data
+       );
+       [nopush] WERROR spoolss_SetPrinterData(
+               [in,ref] policy_handle *handle,
+               [in] [string,charset(UTF16)] uint16 value_name[],
+               [in] spoolss_PrinterDataType type,
+               [in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
+               [in,value(ndr_size_spoolss_PrinterData(&data,type,flags))] uint32 _offered
        );
 
        /******************/
 
        /******************/
        /* Function: 0x1d */
-       WERROR spoolss_ClosePrinter(
+       [public] WERROR spoolss_ClosePrinter(
                [in,out,ref]     policy_handle *handle
        );
 
+       /******************/
+       /* Function: 0x1e */
+       typedef [v1_enum] enum {
+               SPOOLSS_FORM_USER       = 0,
+               SPOOLSS_FORM_BUILTIN    = 1,
+               SPOOLSS_FORM_PRINTER    = 2
+       } spoolss_FormFlags;
+
        typedef struct {
-               uint32 flags;
-               [relative] unistr *formname;
                uint32 width;
-               uint32 length;
+               uint32 height;
+       } spoolss_FormSize;
+
+       typedef struct {
                uint32 left;
                uint32 top;
                uint32 right;
                uint32 bottom;
+       } spoolss_FormArea;
+
+       typedef struct {
+               spoolss_FormFlags flags;
+               [relative] nstring *form_name;
+               spoolss_FormSize size;
+               spoolss_FormArea area;
+       } spoolss_FormInfo1;
+
+       typedef [nodiscriminant,relative_base,public,gensize] union {
+               [case(1)] spoolss_FormInfo1 info1;
+               [default];
+       } spoolss_FormInfo;
+
+       typedef struct {
+               spoolss_FormFlags flags;
+               [string,charset(UTF16)] uint16 *form_name;
+               spoolss_FormSize size;
+               spoolss_FormArea area;
        } spoolss_AddFormInfo1;
 
-       typedef union {
+       typedef [switch_type(uint32)] union {
                [case(1)] spoolss_AddFormInfo1 *info1;
        } spoolss_AddFormInfo;
 
-       /******************/
-       /* Function: 0x1e */
        WERROR spoolss_AddForm(
                [in,ref] policy_handle *handle,
                [in] uint32 level,
        /* Function: 0x1f */
        WERROR spoolss_DeleteForm(
                [in,ref] policy_handle *handle,
-               [in] unistr formname
+               [in] [string,charset(UTF16)] uint16 form_name[]
        );
 
        /******************/
        /* Function: 0x20 */
-       typedef struct {
-               uint32 flags;
-               [relative] nstring *formname;
-               uint32 width;
-               uint32 length;
-               uint32 left;
-               uint32 top;
-               uint32 right;
-               uint32 bottom;
-       } spoolss_FormInfo1;
-
        WERROR spoolss_GetForm(
                [in,ref] policy_handle *handle,
-               [in] unistr formname,
+               [in] [string,charset(UTF16)] uint16 form_name[],
                [in] uint32 level,
                [in] DATA_BLOB *buffer,
-               [out,subcontext(4),switch_is(level)] spoolss_FormInfo *info,
-               [in,out,ref] uint32 *buf_size
+               [in] uint32 offered,
+               [out,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_FormInfo *info,
+               [out] uint32 needed
        );
 
-       typedef struct {
-               uint32 flags;
-               unistr *formname;
-               uint32 width;
-               uint32 length;
-               uint32 left;
-               uint32 top;
-               uint32 right;
-               uint32 bottom;
-       } spoolss_SetFormInfo1;
-
-       typedef union {
-               [case(1)] spoolss_AddFormInfo1 *info1;
-       } spoolss_SetFormInfo;
-
        /******************/
        /* Function: 0x21 */
        WERROR spoolss_SetForm(
                [in,ref] policy_handle *handle,
-               [in] unistr formname,
+               [in] [string,charset(UTF16)] uint16 form_name[],
                [in] uint32 level,
-               [in,switch_is(level)] spoolss_SetFormInfo info
+               [in,switch_is(level)] spoolss_AddFormInfo info
        );
 
-       typedef [nodiscriminant,public] union {
-               [case(1)] spoolss_FormInfo1 info1;
-       } spoolss_FormInfo;
-
        /******************/
        /* Function: 0x22 */
-       WERROR spoolss_EnumForms(
+       [public,noopnum,noprint] WERROR _spoolss_EnumForms(
                [in,ref] policy_handle *handle,
+               [in]     uint32 level,
+               [in]     DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [out]    DATA_BLOB *info,
+               [out]    uint32 needed,
+               [out]    uint32 count
+       );
+       [public,noopnum,noprint] void __spoolss_EnumForms(
                [in] uint32 level,
-               [in,out] DATA_BLOB *buffer,
-               [in,out,ref] uint32 *buf_size,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_FormInfo info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumForms(
+               [in,ref] policy_handle *handle,
+               [in]     uint32 level,
+               [in]     DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [out,switch_is(level),size_is(count)] spoolss_FormInfo *info,
+               [out] uint32 needed,
                [out] uint32 count
        );
 
-       typedef [flag(RELATIVE_CURRENT)] struct {
+       typedef struct {
                [relative] nstring *port_name;
        } spoolss_PortInfo1;
 
+       typedef bitmap {
+               SPOOLSS_PORT_TYPE_WRITE         = 0x00000001,
+               SPOOLSS_PORT_TYPE_READ          = 0x00000002,
+               SPOOLSS_PORT_TYPE_REDIRECTED    = 0x00000004,
+               SPOOLSS_PORT_TYPE_NET_ATTACHED  = 0x00000008
+       } spoolss_PortType;
+
        typedef struct {
                [relative] nstring *port_name;
                [relative] nstring *monitor_name;
                [relative] nstring *description;
-               uint32 port_type;
+               spoolss_PortType port_type;
                uint32 reserved;
        } spoolss_PortInfo2;
 
-       typedef [nondiscriminant,public] union {
+       typedef [nodiscriminant,relative_base,public] union {
                [case(1)] spoolss_PortInfo1 info1;
                [case(2)] spoolss_PortInfo2 info2;
+               [case(3)]; /* TODO */
+               [default];
        } spoolss_PortInfo;
 
        /******************/
        /* Function: 0x23 */
-       WERROR spoolss_EnumPorts(
-               [in] unistr *servername,
+       [public,noopnum,noprint] WERROR _spoolss_EnumPorts(
+               [in] [string,charset(UTF16)] uint16 *servername,
                [in] uint32 level,
-               [in,out] DATA_BLOB *buffer,
-               [in,out,ref] uint32 *buf_size,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out] DATA_BLOB *info,
+               [out] uint32 needed,
+               [out] uint32 count
+       );
+       [public,noopnum,noprint] void __spoolss_EnumPorts(
+               [in] uint32 level,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_PortInfo info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumPorts(
+               [in] [string,charset(UTF16)] uint16 *servername,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,switch_is(level),size_is(count)] spoolss_PortInfo *info,
+               [out] uint32 needed,
                [out] uint32 count
        );
 
        /******************/
        /* Function: 0x24 */
-       WERROR spoolss_EnumMonitors(
+       typedef struct {
+               [relative] nstring *monitor_name;
+       } spoolss_MonitorInfo1;
+
+       typedef struct {
+               [relative] nstring *monitor_name;
+               [relative] nstring *environment;
+               [relative] nstring *dll_name;
+       } spoolss_MonitorInfo2;
+
+       typedef [nodiscriminant,relative_base,public] union {
+               [case(1)] spoolss_MonitorInfo1 info1;
+               [case(2)] spoolss_MonitorInfo2 info2;
+               [default];
+       } spoolss_MonitorInfo;
+
+       [public,noopnum,noprint] WERROR _spoolss_EnumMonitors(
+               [in] [string,charset(UTF16)] uint16 *servername,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out] DATA_BLOB *info,
+               [out] uint32 needed,
+               [out] uint32 count
+       );
+       [public,noopnum,noprint] void __spoolss_EnumMonitors(
+               [in] uint32 level,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_MonitorInfo info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumMonitors(
+               [in] [string,charset(UTF16)] uint16 *servername,
+               [in] uint32 level,
+               [in] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,switch_is(level),size_is(count)] spoolss_MonitorInfo *info,
+               [out] uint32 needed,
+               [out] uint32 count
        );
 
        /******************/
        /* Function: 0x25 */
        WERROR spoolss_AddPort(
+              [in] [string,charset(UTF16)] uint16 *server_name,
+              [in] uint32 unknown,
+              [in] [string,charset(UTF16)] uint16 monitor_name[]
        );
 
        /******************/
        /* Function: 0x35 */
        WERROR spoolss_GetPrinterDriver2(
                [in,ref] policy_handle *handle,
-               [in] unistr *architecture,
-               [in] uint32 level,
-               [in,out] DATA_BLOB *buffer,
-               [in,out,ref] uint32 *buf_size,
-               [in] uint32 client_major_version,
-               [in] uint32 client_minor_version,
-               [out] uint32 server_major_version,
-               [out] uint32 server_minor_version
+               [in]     [string,charset(UTF16)] uint16 *architecture,
+               [in]     uint32 level,
+               [in]     DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [in]     uint32 client_major_version,
+               [in]     uint32 client_minor_version,
+               [out]    DATA_BLOB *info,
+               [out]    uint32 needed,
+               [out]    uint32 server_major_version,
+               [out]    uint32 server_minor_version
        );
 
        /******************/
 
        /******************/
        /* Function: 0x38 */
-       WERROR spoolss_FindClosePrinterNotify(
+       [public] WERROR spoolss_FindClosePrinterNotify(
+               [in,ref] policy_handle *handle
        );
 
        /******************/
 
        /******************/
        /* Function: 0x3a */
-       WERROR spoolss_ReplyOpenPrinter(
+       [public] WERROR spoolss_ReplyOpenPrinter(
+               [in,string,charset(UTF16)] uint16 server_name[],
+               [in] uint32 printer_local,
+               [in] winreg_Type type,
+               [in] uint32 unknown1,
+               [in] uint32 unknown2,
+               [out,ref] policy_handle *handle
        );
 
        /******************/
 
        /******************/
        /* Function: 0x3c */
-       WERROR spoolss_ReplyClosePrinter(
+       [public] WERROR spoolss_ReplyClosePrinter(
+               [in,out,ref] policy_handle *handle
        );
 
        /******************/
        WERROR spoolss_ResetPrinterEx(
        );
 
+       typedef [enum16bit] enum {
+               SPOOLSS_FIELD_SERVER_NAME               =  0,
+               SPOOLSS_FIELD_PRINTER_NAME              =  1,
+               SPOOLSS_FIELD_SHARE_NAME        =  2,
+               SPOOLSS_FIELD_PORT_NAME                 =  3,
+               SPOOLSS_FIELD_DRIVER_NAME               =  4,
+               SPOOLSS_FIELD_COMMENT                   =  5,
+               SPOOLSS_FIELD_LOCATION                  =  6,
+               SPOOLSS_FIELD_DEVMODE                   =  7,
+               SPOOLSS_FIELD_SEPFILE                   =  8,
+               SPOOLSS_FIELD_PRINT_PROCESSOR   =  9,
+               SPOOLSS_FIELD_PARAMETERS                = 10,
+               SPOOLSS_FIELD_DATATYPE                  = 11,
+               SPOOLSS_FIELD_SECURITY_DESCRIPTOR=12,
+               SPOOLSS_FIELD_ATTRIBUTES                = 13,
+               SPOOLSS_FIELD_PRIORITY                  = 14,
+               SPOOLSS_FIELD_DEFAULT_PRIORITY  = 15,
+               SPOOLSS_FIELD_START_TIME                = 16,
+               SPOOLSS_FIELD_UNTIL_TIME                = 17,
+               SPOOLSS_FIELD_STATUS                    = 18,
+               SPOOLSS_FIELD_STATUS_STRING             = 19,
+               SPOOLSS_FIELD_CJOBS                             = 20,
+               SPOOLSS_FIELD_AVERAGE_PPM               = 21,
+               SPOOLSS_FIELD_TOTAL_PAGES               = 22,
+               SPOOLSS_FIELD_PAGES_PRINTED     = 23,
+               SPOOLSS_FIELD_TOTAL_BYTES               = 24,
+               SPOOLSS_FIELD_BYTES_PRINTED             = 25
+       } spoolss_Field;
+
+       typedef [enum16bit] enum {
+               SPOOLSS_NOTIFY_PRINTER                  = 0,
+               SPOOLSS_NOTIFY_JOB                              = 1
+       } spoolss_NotifyType;
+
        /******************/
        /* Function: 0x41 */
-       WERROR spoolss_RemoteFindFirstPrinterChangeNotifyEx(
+       typedef struct {
+               spoolss_NotifyType type;
+               uint16 u1;
+               uint32 u2;
+               uint32 u3;
+               uint32 count;
+               [size_is(count)] spoolss_Field *fields;
+       } spoolss_NotifyOptionsArray;
+
+       typedef struct {
+               uint32 version;
+               uint32 flags;
+               uint32 count;
+               [size_is(count)] spoolss_NotifyOptionsArray *options;
+       } spoolss_NotifyOptionsContainer;
+
+       [public] WERROR spoolss_RemoteFindFirstPrinterChangeNotifyEx(
+               [in,ref] policy_handle *handle,
+               [in] uint32 flags,
+               [in] uint32 options,
+               [in] [string,charset(UTF16)] uint16 *str,
+               [in] uint32 printer_local,
+               [in] spoolss_NotifyOptionsContainer *t1
        );
 
        /******************/
        WERROR spoolss_RouterRefreshPrinterChangeNotification(
        );
 
+       typedef struct {
+               uint32 size;
+               [size_is(size/2),unique,charset(UTF16)] uint16 *string;
+       } spoolss_NotifyUTF16String;
+
+       typedef struct {
+               uint32 size;
+               [size_is(size),charset(DOS)] uint8 *string;
+       } spoolss_NotifyDOSString;
+
+       typedef struct {
+               uint16 data[8];
+       } spoolss_NotifyBlobData;
+
+       typedef struct {
+               uint32 len;
+               [unique] spoolss_NotifyBlobData *data;
+       } spoolss_NotifyBlob;
+
+       typedef [switch_type(uint32)] union {
+               [case(1)] dlong integer;
+               [case(2)] spoolss_NotifyUTF16String utf16_string;
+               [case(3)] spoolss_NotifyDOSString ascii_string;
+               [case(4)] spoolss_NotifyBlob blob;
+               [case(5)] spoolss_NotifyDOSString ascii_string;
+       } spoolss_NotifyData;
+
+       typedef struct {
+               spoolss_NotifyType type;
+               spoolss_Field field;
+               uint32 variable_type;
+               uint32 job_id;
+               [switch_is(variable_type)] spoolss_NotifyData data;
+       } spoolss_Notify;
+
+       typedef struct {
+               uint32 version;
+               uint32 flags;
+               uint32 count;
+               [size_is(count)] spoolss_Notify notifies[];
+       } spoolss_NotifyInfo;
+
        /******************/
        /* Function: 0x43 */
-       WERROR spoolss_RemoteFindNextPrinterChangeNotifyEx(
+       [public] WERROR spoolss_RemoteFindNextPrinterChangeNotifyEx(
+               [in,ref] policy_handle *handle,
+               [in] uint32 change_low,
+               [in,unique] spoolss_NotifyOptionsContainer *container,
+               [out, unique] spoolss_NotifyInfo *info
        );
 
        /******************/
        WERROR spoolss_44(
        );
 
-       typedef struct {
-               uint32 foo;
-       } spoolss_Devmode;
-
-       typedef struct {
-               uint32 size;
-               spoolss_Devmode *devmode;
-       } spoolss_DevmodeContainer;
-
        typedef struct {
                uint32 size;
-               unistr *client;
-               unistr *user;
+               [string,charset(UTF16)] uint16 *client;
+               [string,charset(UTF16)] uint16 *user;
                uint32 build;
                uint32 major;
                uint32 minor;
                [case(1)]  spoolss_UserLevel1 *level1;
        } spoolss_UserLevel;
 
+       typedef bitmap {
+               SERVER_ACCESS_ADMINISTER        = 0x00000001,
+               SERVER_ACCESS_ENUMERATE         = 0x00000002,
+               PRINTER_ACCESS_ADMINISTER       = 0x00000004,
+               PRINTER_ACCESS_USE              = 0x00000008,
+               JOB_ACCESS_ADMINISTER           = 0x00000010
+       } spoolss_AccessRights;
+
+       /* Access rights for print servers */
+       const int SERVER_ALL_ACCESS     = SEC_STD_REQUIRED |
+                                         SERVER_ACCESS_ADMINISTER |
+                                         SERVER_ACCESS_ENUMERATE;
+
+       const int SERVER_READ           = SEC_STD_READ_CONTROL |
+                                         SERVER_ACCESS_ENUMERATE;
+
+       const int SERVER_WRITE          = STANDARD_RIGHTS_WRITE_ACCESS |
+                                         SERVER_ACCESS_ADMINISTER |
+                                         SERVER_ACCESS_ENUMERATE;
+
+       const int SERVER_EXECUTE        = SEC_STD_READ_CONTROL |
+                                         SERVER_ACCESS_ENUMERATE;
+
+       /* Access rights for printers */
+       const int PRINTER_ALL_ACCESS    = SEC_STD_REQUIRED |
+                                         PRINTER_ACCESS_ADMINISTER |
+                                         PRINTER_ACCESS_USE;
+
+       const int PRINTER_READ          = SEC_STD_READ_CONTROL |
+                                         PRINTER_ACCESS_USE;
+
+       const int PRINTER_WRITE         = STANDARD_RIGHTS_WRITE_ACCESS |
+                                         PRINTER_ACCESS_USE;
+
+       const int PRINTER_EXECUTE       = SEC_STD_READ_CONTROL |
+                                         PRINTER_ACCESS_USE;
+
+       /* Access rights for jobs */
+       const int JOB_ALL_ACCESS        = SEC_STD_REQUIRED |
+                                         JOB_ACCESS_ADMINISTER;
+
+       const int JOB_READ              = SEC_STD_READ_CONTROL |
+                                         JOB_ACCESS_ADMINISTER;
+
+       const int JOB_WRITE             = STANDARD_RIGHTS_WRITE_ACCESS |
+                                         JOB_ACCESS_ADMINISTER;
+
+       const int JOB_EXECUTE           = SEC_STD_READ_CONTROL |
+                                         JOB_ACCESS_ADMINISTER;
+
+       /* ACE masks for various print permissions */
+       const int PRINTER_ACE_FULL_CONTROL = SEC_GENERIC_ALL |
+                                               PRINTER_ALL_ACCESS;
+
+       const int PRINTER_ACE_MANAGE_DOCUMENTS = SEC_GENERIC_ALL |
+                                               READ_CONTROL_ACCESS;
+
+       const int PRINTER_ACE_PRINT     = GENERIC_EXECUTE_ACCESS |
+                                         READ_CONTROL_ACCESS |
+                                         PRINTER_ACCESS_USE;
+
        /******************/
        /* Function: 0x45 */
-       WERROR spoolss_OpenPrinterEx(
-               [in]                  unistr *printername,
-               [in]                  unistr *datatype,
+       [public] WERROR spoolss_OpenPrinterEx(
+               [in]                  [string,charset(UTF16)] uint16 *printername,
+               [in]                  [string,charset(UTF16)] uint16 *datatype,
                [in]                  spoolss_DevmodeContainer devmode_ctr,
                [in]                  uint32 access_mask,
                [in]                  uint32 level,
        /******************/
        /* Function: 0x46 */
        WERROR spoolss_AddPrinterEx(
-               [in] unistr *server,
+               [in] [string,charset(UTF16)] uint16 *server,
                [in] uint32 level,
                [in,switch_is(level)] spoolss_PrinterInfo *info,
                [in] spoolss_DevmodeContainer devmode_ctr,
        /* Function: 0x49 */
        WERROR spoolss_DeletePrinterData(
                [in,ref] policy_handle *handle,
-               [in] unistr value_name
+               [in] [string,charset(UTF16)] uint16 value_name[]
        );
 
        /******************/
        /* Function: 0x4d */
        WERROR spoolss_SetPrinterDataEx(
                [in,ref] policy_handle *handle,
-               [in] unistr key_name,
-               [in] unistr value_name,
-               [in] uint32 type,
-               [in] DATA_BLOB buffer,
-               [in,out,ref] uint32 *buf_size
+               [in]     [string,charset(UTF16)] uint16 key_name[],
+               [in]     [string,charset(UTF16)] uint16 value_name[],
+               [in]     uint32 type,
+               [in]     DATA_BLOB buffer,
+               [in]     uint32 offered
        );
 
        /******************/
        /* Function: 0x4e */
        WERROR spoolss_GetPrinterDataEx(
                [in,ref] policy_handle *handle,
-               [in] unistr key_name,
-               [in] unistr value_name,
-               [out] uint32 type,
-               [out] DATA_BLOB buffer,
-               [in,out,ref] uint32 *buf_size
+               [in]     [string,charset(UTF16)] uint16 key_name[],
+               [in]     [string,charset(UTF16)] uint16 value_name[],
+               [in]     uint32 offered,
+               [out]    uint32 type,
+               [out]    DATA_BLOB buffer,
+               [out]    uint32 needed
        );
 
        /******************/
        /* Function: 0x4f */
-       WERROR spoolss_EnumPrinterDataEx(
+       [public] WERROR spoolss_EnumPrinterDataEx(
                [in,ref] policy_handle *handle,
-               [in] unistr key_name,
-               [out] DATA_BLOB buffer,
-               [in,out] uint32 buf_size,
-               [out] uint32 count
+               [in]     [string,charset(UTF16)] uint16 key_name[],
+               [in]     uint32 offered,
+               [out]    DATA_BLOB buffer,
+               [out]    uint32 needed,
+               [out]    uint32 count
        );
 
        /******************/
        /* Function: 0x50 */
-       WERROR spoolss_EnumPrinterKey(
+       [public] WERROR spoolss_EnumPrinterKey(
+               [in, ref] policy_handle *handle,
+               [in] [string,charset(UTF16)] uint16 key_name[],
+               [out] uint32 key_buffer_size,
+               [out] uint16 key_buffer[key_buffer_size],
+               [in,out] uint32 needed
        );
 
        /******************/
        /* Function: 0x51 */
        WERROR spoolss_DeletePrinterDataEx(
                [in,ref] policy_handle *handle,
-               [in] unistr key_name,
-               [in] unistr value_name
+               [in] [string,charset(UTF16)] uint16 key_name[],
+               [in] [string,charset(UTF16)] uint16 value_name[]
        );
 
        /******************/
 
        /******************/
        /* Function: 0x58 */
-       WERROR spoolss_58(
+       WERROR spoolss_XcvData(
+               [in,ref] policy_handle *handle,
+               [in] [string,charset(UTF16)] uint16 function_name[],
+               [in] DATA_BLOB in_data,
+               [in,value(r->in.in_data.length)] uint32 _in_data_length,
+               [in] uint32 offered,
+               [in] uint32 unknown1,
+               [out] DATA_BLOB out_data,
+               [out] uint32 needed,
+               [out] uint32 unknown2
        );
 
        /******************/
        /* Function: 0x59 */
-       WERROR spoolss_AddPrinterDriverEx(
+       [public] WERROR spoolss_AddPrinterDriverEx(
        );
 
        /******************/