spoolss: fill in more details of the spoolss_DeviceMode.
[ira/wip.git] / librpc / idl / spoolss.idl
index b441f17cf1f473138ec769e5907aa1c506049c41..f3ff41a304788a772fadcd48e243bc56cd937a27 100644 (file)
@@ -66,7 +66,57 @@ import "misc.idl", "security.idl", "winreg.idl";
                SPOOLSS_MINOR_VERSION_ME                = 0x0000005a
        } spoolss_MinorVersion;
 
-       typedef struct {
+       const int PRINTER_STATUS_OK             = 0x00000000;
+
+       typedef bitmap {
+               PRINTER_STATUS_PAUSED           = 0x00000001,
+               PRINTER_STATUS_ERROR            = 0x00000002,
+               PRINTER_STATUS_PENDING_DELETION = 0x00000004,
+               PRINTER_STATUS_PAPER_JAM        = 0x00000008,
+               PRINTER_STATUS_PAPER_OUT        = 0x00000010,
+               PRINTER_STATUS_MANUAL_FEED      = 0x00000020,
+               PRINTER_STATUS_PAPER_PROBLEM    = 0x00000040,
+               PRINTER_STATUS_OFFLINE          = 0x00000080,
+               PRINTER_STATUS_IO_ACTIVE        = 0x00000100,
+               PRINTER_STATUS_BUSY             = 0x00000200,
+               PRINTER_STATUS_PRINTING         = 0x00000400,
+               PRINTER_STATUS_OUTPUT_BIN_FULL  = 0x00000800,
+               PRINTER_STATUS_NOT_AVAILABLE    = 0x00001000,
+               PRINTER_STATUS_WAITING          = 0x00002000,
+               PRINTER_STATUS_PROCESSING       = 0x00004000,
+               PRINTER_STATUS_INITIALIZING     = 0x00008000,
+               PRINTER_STATUS_WARMING_UP       = 0x00010000,
+               PRINTER_STATUS_TONER_LOW        = 0x00020000,
+               PRINTER_STATUS_NO_TONER         = 0x00040000,
+               PRINTER_STATUS_PAGE_PUNT        = 0x00080000,
+               PRINTER_STATUS_USER_INTERVENTION= 0x00100000,
+               PRINTER_STATUS_OUT_OF_MEMORY    = 0x00200000,
+               PRINTER_STATUS_DOOR_OPEN        = 0x00400000,
+               PRINTER_STATUS_SERVER_UNKNOWN   = 0x00800000,
+               PRINTER_STATUS_POWER_SAVE       = 0x01000000
+       } spoolss_PrinterStatus;
+
+       /* JOB status codes. */
+
+       const int JOB_STATUS_QUEUED = 0x0000;
+
+       typedef [bitmap32bit] bitmap {
+               JOB_STATUS_PAUSED               = 0x00000001,
+               JOB_STATUS_ERROR                = 0x00000002,
+               JOB_STATUS_DELETING             = 0x00000004,
+               JOB_STATUS_SPOOLING             = 0x00000008,
+               JOB_STATUS_PRINTING             = 0x00000010,
+               JOB_STATUS_OFFLINE              = 0x00000020,
+               JOB_STATUS_PAPEROUT             = 0x00000040,
+               JOB_STATUS_PRINTED              = 0x00000080,
+               JOB_STATUS_DELETED              = 0x00000100,
+               JOB_STATUS_BLOCKED_DEVQ         = 0x00000200,
+               JOB_STATUS_USER_INTERVENTION    = 0x00000400,
+               JOB_STATUS_RESTART              = 0x00000800,
+               JOB_STATUS_COMPLETE             = 0x00001000
+       } spoolss_JobStatus;
+
+       typedef [public,gensize] struct {
                [relative] nstring *printername;
                [relative] nstring *servername;
                uint32 cjobs;
@@ -82,13 +132,13 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 session_counter;
                uint32 num_error_out_of_paper;
                uint32 num_error_not_ready;
-               uint32 job_error;
+               spoolss_JobStatus job_error;
                uint32 number_of_processors;
                spoolss_ProcessorType processor_type;
                uint32 high_part_total_bytes;
                uint32 change_id;
                WERROR last_error;
-               uint32 status;
+               spoolss_PrinterStatus status;
                uint32 enumerate_network_printers;
                uint32 c_setprinter;
                spoolss_ProcessorArchitecture processor_architecture;
@@ -129,41 +179,230 @@ import "misc.idl", "security.idl", "winreg.idl";
                DEVMODE_PANNINGHEIGHT           = 0x10000000
        } spoolss_DeviceModeFields;
 
+       typedef [enum16bit] enum {
+               DMSPEC_NT3              = 0x320,
+               DMSPEC_WIN95_98_ME      = 0x400,
+               DMSPEC_NT4_AND_ABOVE    = 0x401
+       } spoolss_DeviceModeSpecVersion;
+
+       typedef [enum16bit] enum {
+               DMORIENT_PORTRAIT       = 0x0001,
+               DMORIENT_LANDSCAPE      = 0x0002
+       } spoolss_DeviceModeOrientation;
+
+       typedef [enum16bit] enum {
+               DMPAPER_LETTER                  = 0x0001, /* Letter, 8 1/2 x 11 inches */
+               DMPAPER_LETTERSMALL             = 0x0002, /* Letter Small, 8 1/2 x 11 inches */
+               DMPAPER_TABLOID                 = 0x0003, /* Tabloid, 11 x 17 inches */
+               DMPAPER_LEDGER                  = 0x0004, /* Ledger, 17 x 11 inches */
+               DMPAPER_LEGAL                   = 0x0005, /* Legal, 8 1/2 x 14 inches */
+               DMPAPER_STATEMENT               = 0x0006, /* Statement, 5 1/2 x 8 1/2 inches */
+               DMPAPER_EXECUTIVE               = 0x0007, /* Executive, 7 1/4 x 10 1/2 inches */
+               DMPAPER_A3                      = 0x0008, /* A3 sheet, 297 x 420 millimeters */
+               DMPAPER_A4                      = 0x0009, /* A4 sheet, 210 x 297 millimeters */
+               DMPAPER_A4SMALL                 = 0x000A, /* A4 small sheet, 210 x 297 millimeters */
+               DMPAPER_A5                      = 0x000B, /* A5 sheet, 148 x 210 millimeters */
+               DMPAPER_B4                      = 0x000C, /* B4 sheet, 250 x 354 millimeters */
+               DMPAPER_B5                      = 0x000D, /* B5 sheet, 182 x 257-millimeter paper */
+               DMPAPER_FOLIO                   = 0x000E, /* Folio, 8 1/2 x 13-inch paper */
+               DMPAPER_QUARTO                  = 0x000F, /* Quarto, 215 x 275 millimeter paper */
+               DMPAPER_10X14                   = 0x0010, /* 10 x 14-inch sheet */
+               DMPAPER_11X17                   = 0x0011, /* 11 x 17-inch sheet */
+               DMPAPER_NOTE                    = 0x0012, /* Note, 8 1/2 x 11-inches */
+               DMPAPER_ENV_9                   = 0x0013, /* #9 Envelope, 3 7/8 x 8 7/8 inches */
+               DMPAPER_ENV_10                  = 0x0014, /* #10 Envelope, 4 1/8 x 9 1/2 inches */
+               DMPAPER_ENV_11                  = 0x0015, /* #11 Envelope, 4 1/2 x 10 3/8 inches */
+               DMPAPER_ENV_12                  = 0x0016, /* #12 Envelope, 4 3/4 x 11 inches */
+               DMPAPER_ENV_14                  = 0x0017, /* #14 Envelope, 5 x 11 1/2 inches */
+               DMPAPER_CSHEET                  = 0x0018, /* C Sheet, 17 x 22 inches */
+               DMPAPER_DSHEET                  = 0x0019, /* D Sheet, 22 x 34 inches */
+               DMPAPER_ESHEET                  = 0x001A, /* E Sheet, 34 x 44 inches */
+               DMPAPER_ENV_DL                  = 0x001B, /* DL Envelope, 110 x 220 millimeters */
+               DMPAPER_ENV_C5                  = 0x001C, /* C5 Envelope, 162 x 229 millimeters */
+               DMPAPER_ENV_C3                  = 0x001D, /* C3 Envelope, 324 x 458 millimeters */
+               DMPAPER_ENV_C4                  = 0x001E, /* C4 Envelope, 229 x 324 millimeters */
+               DMPAPER_ENV_C6                  = 0x001F, /* C6 Envelope, 114 x 162 millimeters */
+               DMPAPER_ENV_C65                 = 0x0020, /* C65 Envelope, 114 x 229 millimeters */
+               DMPAPER_ENV_B4                  = 0x0021, /* B4 Envelope, 250 x 353 millimeters */
+               DMPAPER_ENV_B5                  = 0x0022, /* B5 Envelope, 176 x 250 millimeters */
+               DMPAPER_ENV_B6                  = 0x0023, /* B6 Envelope, 176 x 125 millimeters */
+               DMPAPER_ENV_ITALY               = 0x0024, /* Italy Envelope, 110 x 230 millimeters */
+               DMPAPER_ENV_MONARCH             = 0x0025, /* Monarch Envelope, 3 7/8 x 7 1/2 inches */
+               DMPAPER_ENV_PERSONAL            = 0x0026, /* 6 3/4 Envelope, 3 5/8 x 6 1/2 inches */
+               DMPAPER_FANFOLD_US              = 0x0027, /* US Std Fanfold, 14 7/8 x 11 inches */
+               DMPAPER_FANFOLD_STD_GERMAN      = 0x0028, /* German Std Fanfold, 8 1/2 x 12 inches */
+               DMPAPER_FANFOLD_LGL_GERMAN      = 0x0029, /* German Legal Fanfold, 8 x 13 inches */
+               DMPAPER_DBL_JAPANESE_POSTCARD   = 0x0045, /* Double Japanese Postcard, 200 x 148 millimeters */
+               DMPAPER_A6                      = 0x0046, /* A6 sheet, 105 x 148 millimeters */
+               DMPAPER_JENV_KAKU2              = 0x0047, /* Japanese Envelope Kaku #2 */
+               DMPAPER_JENV_KAKU3              = 0x0048, /* Japanese Envelope Kaku #3 */
+               DMPAPER_JENV_CHOU3              = 0x0049, /* Japanese Envelope Chou #3 */
+               DMPAPER_JENV_CHOU4              = 0x004A, /* Japanese Envelope Chou #4 */
+               DMPAPER_LETTER_ROTATED          = 0x004B, /* Letter Rotated, 11 by 8 1/2 inches */
+               DMPAPER_A3_ROTATED              = 0x004C, /* A3 rotated sheet, 420 x 297 millimeters */
+               DMPAPER_A4_ROTATED              = 0x004D, /* A4 rotated sheet, 297 x 210 millimeters */
+               DMPAPER_A5_ROTATED              = 0x004E, /* A5 rotated sheet, 210 x 148 millimeters */
+               DMPAPER_B4_JIS_ROTATED          = 0x004F, /* B4 (JIS) rotated sheet, 364 x 257 millimeters */
+               DMPAPER_B5_JIS_ROTATED          = 0x0050, /* B5 (JIS) rotated sheet, 257 x 182 millimeters */
+               DMPAPER_JAPANESE_POSTCARD_ROTATED = 0x0051, /* Japanese Postcard Rotated, 148 x 100 millimeters */
+               DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED = 0x0052, /* Double Japanese Postcard Rotated, 148 x 200 millimeters */
+               DMPAPER_A6_ROTATED              = 0x0053, /* A6 rotated sheet, 148 x 105 millimeters */
+               DMPAPER_JENV_KAKU2_ROTATED      = 0x0054, /* Japanese Envelope Kaku #2 Rotated */
+               DMPAPER_JENV_KAKU3_ROTATED      = 0x0055, /* Japanese Envelope Kaku #3 Rotated */
+               DMPAPER_JENV_CHOU3_ROTATED      = 0x0056, /* Japanese Envelope Chou #3 Rotated */
+               DMPAPER_JENV_CHOU4_ROTATED      = 0x0057, /* Japanese Envelope Chou #4 Rotated */
+               DMPAPER_B6_JIS                  = 0x0058, /* B6 (JIS) sheet, 128 x 182 millimeters */
+               DMPAPER_B6_JIS_ROTATED          = 0x0059, /* B6 (JIS) rotated sheet, 182 x 128 millimeters */
+               DMPAPER_12X11                   = 0x005A, /* 12 x 11-inch sheet */
+               DMPAPER_JENV_YOU4               = 0x005B, /* Japanese Envelope You #4 */
+               DMPAPER_JENV_YOU4_ROTATED       = 0x005C, /* Japanese Envelope You #4 */
+               DMPAPER_P16K                    = 0x005D, /* PRC 16K, 146 x 215 millimeters */
+               DMPAPER_P32K                    = 0x005E, /* PRC 32K, 97 x 151 millimeters */
+               DMPAPER_P32KBIG                 = 0x005F, /* PRC 32K(Big) 97 x 151 millimeters */
+               DMPAPER_PENV_1                  = 0x0060, /* PRC Envelope #1, 102 by 165 millimeters */
+               DMPAPER_PENV_2                  = 0x0061, /* PRC Envelope #2, 102 x 176 millimeters */
+               DMPAPER_PENV_3                  = 0x0062, /* PRC Envelope #3, 125 x 176 millimeters */
+               DMPAPER_PENV_4                  = 0x0063, /* PRC Envelope #4, 110 x 208 millimeters */
+               DMPAPER_PENV_5                  = 0x0064, /* PRC Envelope #5, 110 x 220 millimeters */
+               DMPAPER_PENV_6                  = 0x0065, /* PRC Envelope #6, 120 x 230 millimeters */
+               DMPAPER_PENV_7                  = 0x0066, /* PRC Envelope #7, 160 x 230 millimeters */
+               DMPAPER_PENV_8                  = 0x0067, /* PRC Envelope #8, 120 x 309 millimeters */
+               DMPAPER_PENV_9                  = 0x0068, /* PRC Envelope #9, 229 x 324 millimeters */
+               DMPAPER_PENV_10                 = 0x0069, /* PRC Envelope #10, 324 x 458 millimeters */
+               DMPAPER_P16K_ROTATED            = 0x006A, /* PRC 16K Rotated, 215 x 146 millimeters */
+               DMPAPER_P32K_ROTATED            = 0x006B, /* PRC 32K Rotated, 151 x 97 millimeters */
+               DMPAPER_P32KBIG_ROTATED         = 0x006C, /* PRC 32K(Big) Rotated, 151 x 97 millimeters */
+               DMPAPER_PENV_1_ROTATED          = 0x006D, /* PRC Envelope #1 Rotated, 165 x 102 millimeters */
+               DMPAPER_PENV_2_ROTATED          = 0x006E, /* PRC Envelope #2 Rotated, 176 x 102 millimeters */
+               DMPAPER_PENV_3_ROTATED          = 0x006F, /* PRC Envelope #3 Rotated, 176 x 125 millimeters */
+               DMPAPER_PENV_4_ROTATED          = 0x0070, /* PRC Envelope #4 Rotated, 208 x 110 millimeters */
+               DMPAPER_PENV_5_ROTATED          = 0x0071, /* PRC Envelope #5 Rotated, 220 x 110 millimeters */
+               DMPAPER_PENV_6_ROTATED          = 0x0072, /* PRC Envelope #6 Rotated, 230 x 120 millimeters */
+               DMPAPER_PENV_7_ROTATED          = 0x0073, /* PRC Envelope #7 Rotated, 230 x 160 millimeters */
+               DMPAPER_PENV_8_ROTATED          = 0x0074, /* PRC Envelope #8 Rotated, 309 x 120 millimeters */
+               DMPAPER_PENV_9_ROTATED          = 0x0075, /* PRC Envelope #9 Rotated, 324 x 229 millimeters */
+               DMPAPER_PENV_10_ROTATED         = 0x0076 /* PRC Envelope #10 Rotated, 458 x 324 millimeters */
+       } spoolss_DeviceModePaperSize;
+
+       typedef [enum16bit] enum {
+               DMBIN_UPPER             = 0x0001,
+               DMBIN_LOWER             = 0x0002,
+               DMBIN_MIDDLE            = 0x0003,
+               DMBIN_MANUAL            = 0x0004,
+               DMBIN_ENVELOPE          = 0x0005,
+               DMBIN_ENVMANUAL         = 0x0006,
+               DMBIN_AUTO              = 0x0007,
+               DMBIN_TRACTOR           = 0x0008,
+               DMBIN_SMALLFMT          = 0x0009,
+               DMBIN_LARGEFMT          = 0x000a,
+               DMBIN_LARGECAPACITY     = 0x000b,
+               DMBIN_CASSETTE          = 0x000e,
+               DMBIN_FORMSOURCE        = 0x000f
+       } spoolss_DeviceModeDefaultSource;
+
+       typedef [enum16bit] enum {
+               DMRES_HIGH              = 0xfffc,
+               DMRES_MEDIUM            = 0xfffd,
+               DMRES_LOW               = 0xfffe,
+               DMRES_DRAFT             = 0xffff
+       } spoolss_DeviceModePrintQuality;
+
+       typedef [enum16bit] enum {
+               DMRES_MONOCHROME         = 0x0001,
+               DMRES_COLOR              = 0x0002
+       } spoolss_DeviceModeColor;
+
+       typedef [enum16bit] enum {
+               DMDUP_SIMPLEX           = 0x0001,
+               DMDUP_VERTICAL          = 0x0002,
+               DMDUP_HORIZONTAL        = 0x0003
+       } spoolss_DeviceModeDuplex;
+
+       typedef [enum16bit] enum {
+               DMTT_BITMAP             = 0x0001,
+               DMTT_DOWNLOAD           = 0x0002,
+               DMTT_SUBDEV             = 0x0003,
+               DMTT_DOWNLOAD_OUTLINE   = 0x0004
+       } spoolss_DeviceModeTTOption;
+
+       typedef [enum16bit] enum {
+               DMCOLLATE_FALSE         = 0x0000,
+               DMCOLLATE_TRUE          = 0x0001
+       } spoolss_DeviceModeCollate;
+
+       typedef [v1_enum] enum {
+               DMNUP_SYSTEM            = 0x00000001,
+               DMNUP_ONEUP             = 0x00000002
+       } spoolss_DeviceModeNUp;
+
+       typedef [v1_enum] enum {
+               DMICMMETHOD_NONE        = 0x00000001,
+               DMICMMETHOD_SYSTEM      = 0x00000002,
+               DMICMMETHOD_DRIVER      = 0x00000003,
+               DMICMMETHOD_DEVICE      = 0x00000004
+       } spoolss_DeviceModeICMMethod;
+
+       typedef [v1_enum] enum {
+               DMICM_SATURATE          = 0x00000001,
+               DMICM_CONTRAST          = 0x00000002,
+               DMICM_COLORIMETRIC      = 0x00000003,
+               DMICM_ABS_COLORIMETRIC  = 0x00000004
+       } spoolss_DeviceModeICMIntent;
+
+       typedef [v1_enum] enum {
+               DMMEDIA_STANDARD        = 0x00000001,
+               DMMEDIA_TRANSPARENCY    = 0x00000002,
+               DMMEDIA_GLOSSY          = 0x00000003
+       } spoolss_DeviceModeMediaType;
+
+       typedef [v1_enum] enum {
+               DMDITHER_NONE           = 0x00000001,
+               DMDITHER_COARSE         = 0x00000002,
+               DMDITHER_FINE           = 0x00000003,
+               DMDITHER_LINEART        = 0x00000004,
+               DMDITHER_ERRORDIFFUSION = 0x00000005,
+               DMDITHER_RESERVED6      = 0x00000006,
+               DMDITHER_RESERVED7      = 0x00000007,
+               DMDITHER_RESERVED8      = 0x00000008,
+               DMDITHER_RESERVED9      = 0x00000009,
+               DMDITHER_GRAYSCALE      = 0x0000000A
+       } spoolss_DeviceModeDitherType;
+
        typedef [public,gensize] struct {
                [charset(UTF16)] uint16 devicename[32];
-               uint16 specversion;
+               spoolss_DeviceModeSpecVersion specversion;
                uint16 driverversion;
                uint16 size;
                [value(r->driverextra_data.length)] uint16 __driverextra_length;
                spoolss_DeviceModeFields fields;
-               uint16 orientation;
-               uint16 papersize;
+               spoolss_DeviceModeOrientation orientation;
+               spoolss_DeviceModePaperSize papersize;
                uint16 paperlength;
                uint16 paperwidth;
                uint16 scale;
                uint16 copies;
-               uint16 defaultsource;
-               uint16 printquality;
-               uint16 color;
-               uint16 duplex;
+               spoolss_DeviceModeDefaultSource defaultsource;
+               spoolss_DeviceModePrintQuality printquality;
+               spoolss_DeviceModeColor color;
+               spoolss_DeviceModeDuplex duplex;
                uint16 yresolution;
-               uint16 ttoption;
-               uint16 collate;
+               spoolss_DeviceModeTTOption ttoption;
+               spoolss_DeviceModeCollate collate;
                [charset(UTF16)] uint16 formname[32];
-               uint16 logpixels;
-               uint32 bitsperpel;
-               uint32 pelswidth;
-               uint32 pelsheight;
-               uint32 displayflags;
-               uint32 displayfrequency;
-               uint32 icmmethod;
-               uint32 icmintent;
-               uint32 mediatype;
-               uint32 dithertype;
+               uint16 logpixels; /* reserved */
+               uint32 bitsperpel; /* reserved */
+               uint32 pelswidth; /* reserved */
+               uint32 pelsheight; /* reserved */
+               spoolss_DeviceModeNUp displayflags;
+               uint32 displayfrequency; /* reserved */
+               spoolss_DeviceModeICMMethod icmmethod;
+               spoolss_DeviceModeICMIntent icmintent;
+               spoolss_DeviceModeMediaType mediatype;
+               spoolss_DeviceModeDitherType dithertype;
                uint32 reserved1;
                uint32 reserved2;
-               uint32 panningwidth;
-               uint32 panningheight;
+               uint32 panningwidth; /* reserved */
+               uint32 panningheight; /* reserved */
                [subcontext_size(__driverextra_length),subcontext(0),flag(NDR_REMAINING)] DATA_BLOB driverextra_data;
        } spoolss_DeviceMode;
 
@@ -198,13 +437,6 @@ import "misc.idl", "security.idl", "winreg.idl";
                                           PRINTER_ENUM_ICON7 |
                                           PRINTER_ENUM_ICON8); /* 0x00ff0000 */
 
-       typedef struct {
-               spoolss_EnumPrinterFlags flags;
-               [relative] nstring *name;
-               [relative] nstring *description;
-               [relative] nstring *comment;
-       } spoolss_PrinterInfo1;
-
        typedef bitmap {
                PRINTER_ATTRIBUTE_QUEUED                = 0x00000001,
                PRINTER_ATTRIBUTE_DIRECT                = 0x00000002,
@@ -224,35 +456,14 @@ import "misc.idl", "security.idl", "winreg.idl";
                PRINTER_ATTRIBUTE_TS                    = 0x00008000
        } spoolss_PrinterAttributes;
 
-       typedef bitmap {
-               PRINTER_STATUS_PAUSED           = 0x00000001,
-               PRINTER_STATUS_ERROR            = 0x00000002,
-               PRINTER_STATUS_PENDING_DELETION = 0x00000004,
-               PRINTER_STATUS_PAPER_JAM        = 0x00000008,
-               PRINTER_STATUS_PAPER_OUT        = 0x00000010,
-               PRINTER_STATUS_MANUAL_FEED      = 0x00000020,
-               PRINTER_STATUS_PAPER_PROBLEM    = 0x00000040,
-               PRINTER_STATUS_OFFLINE          = 0x00000080,
-               PRINTER_STATUS_IO_ACTIVE        = 0x00000100,
-               PRINTER_STATUS_BUSY             = 0x00000200,
-               PRINTER_STATUS_PRINTING         = 0x00000400,
-               PRINTER_STATUS_OUTPUT_BIN_FULL  = 0x00000800,
-               PRINTER_STATUS_NOT_AVAILABLE    = 0x00001000,
-               PRINTER_STATUS_WAITING          = 0x00002000,
-               PRINTER_STATUS_PROCESSING       = 0x00004000,
-               PRINTER_STATUS_INITIALIZING     = 0x00008000,
-               PRINTER_STATUS_WARMING_UP       = 0x00010000,
-               PRINTER_STATUS_TONER_LOW        = 0x00020000,
-               PRINTER_STATUS_NO_TONER         = 0x00040000,
-               PRINTER_STATUS_PAGE_PUNT        = 0x00080000,
-               PRINTER_STATUS_USER_INTERVENTION= 0x00100000,
-               PRINTER_STATUS_OUT_OF_MEMORY    = 0x00200000,
-               PRINTER_STATUS_DOOR_OPEN        = 0x00400000,
-               PRINTER_STATUS_SERVER_UNKNOWN   = 0x00800000,
-               PRINTER_STATUS_POWER_SAVE       = 0x01000000
-       } spoolss_PrinterStatus;
+       typedef [public,gensize] struct {
+               spoolss_PrinterAttributes flags;
+               [relative] nstring *description;
+               [relative] nstring *name;
+               [relative] nstring *comment;
+       } spoolss_PrinterInfo1;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *servername;
                [relative] nstring *printername;
                [relative] nstring *sharename;
@@ -267,7 +478,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *parameters;
                [relative,subcontext(0)] security_descriptor *secdesc;
                spoolss_PrinterAttributes attributes;
-               uint32 priority;
+               [range(0,99)] uint32 priority;
                uint32 defaultpriority;
                uint32 starttime;
                uint32 untiltime;
@@ -276,17 +487,17 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 averageppm;
        } spoolss_PrinterInfo2;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative,subcontext(0)] security_descriptor *secdesc;
        } spoolss_PrinterInfo3;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *printername;
                [relative] nstring *servername;
                spoolss_PrinterAttributes attributes;
        } spoolss_PrinterInfo4;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *printername;
                [relative] nstring *portname;
                spoolss_PrinterAttributes attributes;
@@ -294,7 +505,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 transmission_retry_timeout;
        } spoolss_PrinterInfo5;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_PrinterStatus status;
        } spoolss_PrinterInfo6;
 
@@ -306,7 +517,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                DSPRINT_PENDING         = 0x80000000
        } spoolss_DsPrintAction;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *guid; /* text form of printer guid */
                spoolss_DsPrintAction action;
        } spoolss_PrinterInfo7;
@@ -315,7 +526,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative,subcontext(0)] spoolss_DeviceMode *devmode;
        } spoolss_DeviceModeInfo;
 
-       typedef [nodiscriminant,relative_base,public] union {
+       typedef [nodiscriminant,relative_base,public,gensize] union {
                [case(0)] spoolss_PrinterInfo0 info0;
                [case(1)] spoolss_PrinterInfo1 info1;
                [case(2)] spoolss_PrinterInfo2 info2;
@@ -357,7 +568,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                 * and the array has no size in front
                 */
                [out,ref] uint32 *count,
-               [out,unique,switch_is(level),size_is(*count)] spoolss_PrinterInfo *info,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_PrinterInfo **info,
                [out,ref] uint32 *needed
        );
 
@@ -378,7 +589,8 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x02 */
-       typedef struct {
+
+       typedef [public,gensize] struct {
                uint32 job_id;
                [relative] nstring *printer_name;
                [relative] nstring *server_name;
@@ -386,24 +598,161 @@ import "misc.idl", "security.idl", "winreg.idl";
                [relative] nstring *document_name;
                [relative] nstring *data_type;
                [relative] nstring *text_status;
-               uint32 status;
-               uint32 priority;
+               spoolss_JobStatus status;
+               [range(0,99)] uint32 priority;
                uint32 position;
                uint32 total_pages;
                uint32 pages_printed;
-               spoolss_Time time;
+               spoolss_Time submitted;
        } spoolss_JobInfo1;
 
-       typedef [nodiscriminant,relative_base,public] union {
+       typedef [public,gensize] 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;
+               [range(0,99)] 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 [public,gensize] struct {
+               uint32 job_id;
+               uint32 next_job_id;
+               uint32 reserved;
+       } spoolss_JobInfo3;
+
+       typedef [public,gensize] 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;
+               [range(0,99)] 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,gensize] 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;
+               [range(0,99)] 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;
+               uint32 _devmode_ptr; /* pointer to truncated devicemode */
+               [string,charset(UTF16)] uint16 *text_status;
+               uint32 _secdesc_ptr;
+               spoolss_JobStatus status;
+               [range(0,99)] 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;
+               uint32 _devmode_ptr; /* pointer to truncated devicemode */
+               [string,charset(UTF16)] uint16 *text_status;
+               uint32 _secdesc_ptr;
+               spoolss_JobStatus status;
+               [range(0,99)] 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 {
@@ -413,7 +762,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(
@@ -461,15 +812,18 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique] DATA_BLOB *buffer,
                [in]     uint32 offered,
                [out,ref] uint32 *count,
-               [out,unique,switch_is(level),size_is(*count)] spoolss_JobInfo *info,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_JobInfo **info,
                [out,ref] uint32 *needed
        );
 
        /******************/
        /* Function: 0x05 */
-       [todo] WERROR spoolss_AddPrinter(
-               /* This function is not implemented in Samba 3 as no
-                  clients have been observed using it. */
+       WERROR spoolss_AddPrinter(
+               [in,unique] [string,charset(UTF16)] uint16 *server,
+               [in,ref] spoolss_SetPrinterInfoCtr *info_ctr,
+               [in,ref] spoolss_DevmodeContainer *devmode_ctr,
+               [in,ref] sec_desc_buf *secdesc_ctr,
+               [out,ref] policy_handle *handle
        );
 
        /******************/
@@ -521,9 +875,9 @@ import "misc.idl", "security.idl", "winreg.idl";
        } spoolss_SetPrinterInfo0;
 
        typedef struct {
-               spoolss_EnumPrinterFlags flags;
-               [string,charset(UTF16)] uint16 *name;
+               spoolss_PrinterAttributes flags;
                [string,charset(UTF16)] uint16 *description;
+               [string,charset(UTF16)] uint16 *name;
                [string,charset(UTF16)] uint16 *comment;
        } spoolss_SetPrinterInfo1;
 
@@ -542,7 +896,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [string,charset(UTF16)] uint16 *parameters;
                [subcontext(0)] security_descriptor *secdesc;
                spoolss_PrinterAttributes attributes;
-               uint32 priority;
+               [range(0,99)] uint32 priority;
                uint32 defaultpriority;
                uint32 starttime;
                uint32 untiltime;
@@ -552,7 +906,7 @@ import "misc.idl", "security.idl", "winreg.idl";
        } spoolss_SetPrinterInfo2;
 
        typedef struct {
-               security_descriptor *secdesc;
+               uint32 sec_desc_ptr;
        } spoolss_SetPrinterInfo3;
 
        typedef struct {
@@ -628,7 +982,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,
@@ -674,6 +1028,10 @@ import "misc.idl", "security.idl", "winreg.idl";
                spoolss_StringArray *previous_names;
        } spoolss_AddDriverInfo4;
 
+       typedef [bitmap32bit] bitmap {
+               PRINTER_DRIVER_PACKAGE_AWARE = 0x00000002
+       } spoolss_DriverAttributes;
+
        typedef struct {
                spoolss_DriverOSVersion version;
                [string,charset(UTF16)] uint16 *driver_name;
@@ -681,7 +1039,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [string,charset(UTF16)] uint16 *driver_path;
                [string,charset(UTF16)] uint16 *data_file;
                [string,charset(UTF16)] uint16 *config_file;
-               uint32 driver_attributes;
+               spoolss_DriverAttributes driver_attributes;
                uint32 config_version;
                uint32 driver_version;
        } spoolss_AddDriverInfo5;
@@ -700,7 +1058,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;
@@ -722,7 +1080,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;
@@ -759,11 +1117,11 @@ import "misc.idl", "security.idl", "winreg.idl";
                [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;
@@ -772,7 +1130,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;
@@ -785,7 +1143,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;
@@ -799,19 +1157,19 @@ 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;
                [relative] nstring *driver_path;
                [relative] nstring *data_file;
                [relative] nstring *config_file;
-               uint32 driver_attributes;
+               spoolss_DriverAttributes driver_attributes;
                uint32 config_version;
                uint32 driver_version;
        } spoolss_DriverInfo5;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_DriverOSVersion version;
                [relative] nstring *driver_name;
                [relative] nstring *architecture;
@@ -823,7 +1181,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;
@@ -831,7 +1189,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;
@@ -843,7 +1201,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;
@@ -859,7 +1217,38 @@ import "misc.idl", "security.idl", "winreg.idl";
                hyper min_inbox_driver_ver_version;
        } spoolss_DriverInfo8;
 
-       typedef [nodiscriminant,relative_base,public] union {
+       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,gensize] union {
                [case(1)] spoolss_DriverInfo1 info1;
                [case(2)] spoolss_DriverInfo2 info2;
                [case(3)] spoolss_DriverInfo3 info3;
@@ -867,6 +1256,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [case(5)] spoolss_DriverInfo5 info5;
                [case(6)] spoolss_DriverInfo6 info6;
                [case(8)] spoolss_DriverInfo8 info8;
+               [case(101)] spoolss_DriverInfo101 info101;
                [default];
        } spoolss_DriverInfo;
 
@@ -894,13 +1284,20 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
                [out,ref] uint32 *count,
-               [out,unique,switch_is(level),size_is(*count)] spoolss_DriverInfo *info,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_DriverInfo **info,
                [out,ref] uint32 *needed
        );
 
        /******************/
        /* Function: 0x0b */
-       [todo] WERROR spoolss_GetPrinterDriver(
+       WERROR spoolss_GetPrinterDriver(
+               [in,ref] policy_handle *handle,
+               [in,unique] [string,charset(UTF16)] uint16 *architecture,
+               [in]     uint32 level,
+               [in,unique] DATA_BLOB *buffer,
+               [in]     uint32 offered,
+               [out,unique,subcontext(4),subcontext_size(offered),switch_is(level)] spoolss_DriverInfo *info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -946,7 +1343,7 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x0f */
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *print_processor_name;
        } spoolss_PrintProcessorInfo1;
 
@@ -977,7 +1374,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
                [out,ref] uint32 *count,
-               [out,unique,switch_is(level),size_is(*count)] spoolss_PrintProcessorInfo *info,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_PrintProcessorInfo **info,
                [out,ref] uint32 *needed
        );
 
@@ -989,7 +1386,7 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        typedef [nodiscriminant,relative_base,gensize,public] union {
                [case(1)] spoolss_PrintProcessorDirectoryInfo1 info1;
-               [default];
+               [default] spoolss_PrintProcessorDirectoryInfo1 info1;
        } spoolss_PrintProcessorDirectoryInfo;
 
        WERROR spoolss_GetPrintProcessorDirectory(
@@ -1085,14 +1482,25 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x1a */
+
+       const string SPL_ARCH_WIN40             = "WIN40";
+       const string SPL_ARCH_W32X86            = "W32X86";
+       const string SPL_ARCH_W32MIPS           = "W32MIPS";
+       const string SPL_ARCH_W32ALPHA          = "W32ALPHA";
+       const string SPL_ARCH_W32PPC            = "W32PPC";
+       const string SPL_ARCH_IA64              = "IA64";
+       const string SPL_ARCH_X64               = "x64";
+
+       const string SPOOLSS_ARCHITECTURE_ALL                   = "all";
        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;
                uint32 major;
                uint32 minor;
                uint32 build;
-               [value(2)] uint32 unknown;
+               [value(2)] uint32 platform_id;
                [subcontext(0),subcontext_size(256)] nstring extra_string;
        } spoolss_OSVersion;
 
@@ -1101,26 +1509,21 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 major;
                uint32 minor;
                uint32 build;
-               [value(2)] uint32 unknown1;
+               [value(2)] uint32 platform_id;
                [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 */
+               uint16 service_pack_major;
+               uint16 service_pack_minor;
+               uint16 suite_mask;
+               uint8 product_type;
+               uint8 reserved;
        } 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;
+               [case(REG_NONE)];
+               [case(REG_SZ)] nstring string;
+               [case(REG_BINARY),flag(NDR_REMAINING)] DATA_BLOB binary;
+               [case(REG_DWORD)] uint32 value;
+               [case(REG_MULTI_SZ)] nstring_array string_array;
                [default,flag(NDR_REMAINING)] DATA_BLOB data;
        } spoolss_PrinterData;
 
@@ -1128,20 +1531,20 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,ref] policy_handle *handle,
                [in]     [string,charset(UTF16)] uint16 value_name[],
                [in]     uint32 offered,
-               [out,ref] spoolss_PrinterDataType *type,
-               [out]    DATA_BLOB data,
+               [out,ref] winreg_Type *type,
+               [out,ref] DATA_BLOB *data,
                [out,ref] uint32 *needed
        );
        [noopnum,noprint,public] void __spoolss_GetPrinterData(
-               [in] spoolss_PrinterDataType type,
-               [out,switch_is(type)] spoolss_PrinterData data
+               [in] winreg_Type type,
+               [out,ref,switch_is(type)] spoolss_PrinterData *data
        );
        [nopull,nopush,public] WERROR spoolss_GetPrinterData(
                [in,ref] policy_handle *handle,
                [in]     [string,charset(UTF16)] uint16 value_name[],
                [in]     uint32 offered,
-               [out,ref] spoolss_PrinterDataType *type,
-               [out,subcontext(4),subcontext_size(offered),switch_is(*type)] spoolss_PrinterData data,
+               [out,ref] winreg_Type *type,
+               [out,ref,subcontext(4),subcontext_size(offered),switch_is(*type)] spoolss_PrinterData *data,
                [out,ref] uint32 *needed
        );
 
@@ -1150,18 +1553,18 @@ import "misc.idl", "security.idl", "winreg.idl";
        [noopnum,nopull,noprint,public] WERROR _spoolss_SetPrinterData(
                [in,ref] policy_handle *handle,
                [in] [string,charset(UTF16)] uint16 value_name[],
-               [in] spoolss_PrinterDataType type,
+               [in] winreg_Type 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
+               [in] winreg_Type type,
+               [out,ref,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] winreg_Type type,
                [in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
                [in,value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] uint32 _offered
        );
@@ -1197,15 +1600,35 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 bottom;
        } spoolss_FormArea;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                spoolss_FormFlags flags;
                [relative] nstring *form_name;
                spoolss_FormSize size;
                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 [public,gensize] 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;
 
@@ -1216,8 +1639,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(
@@ -1276,11 +1713,21 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique] DATA_BLOB *buffer,
                [in]     uint32 offered,
                [out,ref] uint32 *count,
-               [out,unique,switch_is(level),size_is(*count)] spoolss_FormInfo *info,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_FormInfo **info,
                [out,ref] uint32 *needed
        );
 
-       typedef struct {
+       /*
+        * Special strings for the OpenPrinter() call.  See the MSDN DDK
+        * docs on the XcvDataPort() for more details.
+        */
+
+       const string SPL_LOCAL_PORT             = "Local Port";
+       const string SPL_TCPIP_PORT             = "Standard TCP/IP Port";
+       const string SPL_XCV_MONITOR_LOCALMON   = ",XcvMonitor Local Port";
+       const string SPL_XCV_MONITOR_TCPMON     = ",XcvMonitor Standard TCP/IP Port";
+
+       typedef [public,gensize] struct {
                [relative] nstring *port_name;
        } spoolss_PortInfo1;
 
@@ -1291,7 +1738,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                SPOOLSS_PORT_TYPE_NET_ATTACHED  = 0x00000008
        } spoolss_PortType;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *port_name;
                [relative] nstring *monitor_name;
                [relative] nstring *description;
@@ -1299,10 +1746,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 [public,gensize] struct {
+               spoolss_PortStatus status;
+               [relative] nstring *status_string;
+               spoolss_PortSeverity severity;
+       } spoolss_PortInfo3;
+
+       typedef [public,gensize] 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;
 
@@ -1328,17 +1809,17 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
                [out,ref] uint32 *count,
-               [out,unique,switch_is(level),size_is(*count)] spoolss_PortInfo *info,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_PortInfo **info,
                [out,ref] uint32 *needed
        );
 
        /******************/
        /* Function: 0x24 */
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *monitor_name;
        } spoolss_MonitorInfo1;
 
-       typedef struct {
+       typedef [public,gensize] struct {
                [relative] nstring *monitor_name;
                [relative] nstring *environment;
                [relative] nstring *dll_name;
@@ -1370,7 +1851,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,unique] DATA_BLOB *buffer,
                [in] uint32 offered,
                [out,ref] uint32 *count,
-               [out,unique,switch_is(level),size_is(*count)] spoolss_MonitorInfo *info,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_MonitorInfo **info,
                [out,ref] uint32 *needed
        );
 
@@ -1394,7 +1875,10 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x28 */
-       [todo] WERROR spoolss_CreatePrinterIC(
+       WERROR spoolss_CreatePrinterIC(
+               [in,ref] policy_handle *handle,
+               [out,ref] policy_handle *gdi_handle,
+               [in,ref] spoolss_DevmodeContainer *devmode_ctr
        );
 
        /******************/
@@ -1404,7 +1888,8 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x2a */
-       [todo] WERROR spoolss_DeletePrinterIC(
+       WERROR spoolss_DeletePrinterIC(
+               [in,out,ref] policy_handle *gdi_handle
        );
 
        /******************/
@@ -1451,7 +1936,40 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x33 */
-       [todo] WERROR spoolss_EnumPrintProcDataTypes(
+
+       typedef [public,gensize] struct {
+               [relative] nstring *name_array;
+       } spoolss_PrintProcDataTypesInfo1;
+
+       typedef [nodiscriminant,relative_base,public] union {
+               [case(1)] spoolss_PrintProcDataTypesInfo1 info1;
+               [default];
+       } spoolss_PrintProcDataTypesInfo;
+
+       [public,noopnum,noprint] WERROR _spoolss_EnumPrintProcDataTypes(
+               [in,unique] [string,charset(UTF16)] uint16 *servername,
+               [in,unique] [string,charset(UTF16)] uint16 *print_processor_name,
+               [in] uint32 level,
+               [in,unique] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,unique] DATA_BLOB *info,
+               [out,ref] uint32 *needed,
+               [out,ref] uint32 *count
+       );
+       [public,noopnum,noprint] void __spoolss_EnumPrintProcDataTypes(
+               [in] uint32 level,
+               [in] uint32 count,
+               [out,switch_is(level)] spoolss_PrintProcDataTypesInfo info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumPrintProcDataTypes(
+               [in,unique] [string,charset(UTF16)] uint16 *servername,
+               [in,unique] [string,charset(UTF16)] uint16 *print_processor_name,
+               [in] uint32 level,
+               [in,unique] DATA_BLOB *buffer,
+               [in] uint32 offered,
+               [out,ref] uint32 *count,
+               [out,ref,switch_is(level),size_is(,*count)] spoolss_PrintProcDataTypesInfo **info,
+               [out,ref] uint32 *needed
        );
 
        /******************/
@@ -1472,7 +1990,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
@@ -1530,21 +2048,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 |
@@ -1554,14 +2067,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 |
@@ -1599,40 +2112,75 @@ import "misc.idl", "security.idl", "winreg.idl";
        [todo] 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,public] enum {
+               JOB_NOTIFY_FIELD_PRINTER_NAME                   = 0x00,
+               JOB_NOTIFY_FIELD_MACHINE_NAME                   = 0x01,
+               JOB_NOTIFY_FIELD_PORT_NAME                      = 0x02,
+               JOB_NOTIFY_FIELD_USER_NAME                      = 0x03,
+               JOB_NOTIFY_FIELD_NOTIFY_NAME                    = 0x04,
+               JOB_NOTIFY_FIELD_DATATYPE                       = 0x05,
+               JOB_NOTIFY_FIELD_PRINT_PROCESSOR                = 0x06,
+               JOB_NOTIFY_FIELD_PARAMETERS                     = 0x07,
+               JOB_NOTIFY_FIELD_DRIVER_NAME                    = 0x08,
+               JOB_NOTIFY_FIELD_DEVMODE                        = 0x09,
+               JOB_NOTIFY_FIELD_STATUS                         = 0x0a,
+               JOB_NOTIFY_FIELD_STATUS_STRING                  = 0x0b,
+               JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR            = 0x0c,
+               JOB_NOTIFY_FIELD_DOCUMENT                       = 0x0d,
+               JOB_NOTIFY_FIELD_PRIORITY                       = 0x0e,
+               JOB_NOTIFY_FIELD_POSITION                       = 0x0f,
+               JOB_NOTIFY_FIELD_SUBMITTED                      = 0x10,
+               JOB_NOTIFY_FIELD_START_TIME                     = 0x11,
+               JOB_NOTIFY_FIELD_UNTIL_TIME                     = 0x12,
+               JOB_NOTIFY_FIELD_TIME                           = 0x13,
+               JOB_NOTIFY_FIELD_TOTAL_PAGES                    = 0x14,
+               JOB_NOTIFY_FIELD_PAGES_PRINTED                  = 0x15,
+               JOB_NOTIFY_FIELD_TOTAL_BYTES                    = 0x16,
+               JOB_NOTIFY_FIELD_BYTES_PRINTED                  = 0x17
+       } spoolss_JobNotifyField;
+
+       typedef [enum16bit,public] enum {
+               PRINTER_NOTIFY_FIELD_SERVER_NAME                = 0x00,
+               PRINTER_NOTIFY_FIELD_PRINTER_NAME               = 0x01,
+               PRINTER_NOTIFY_FIELD_SHARE_NAME                 = 0x02,
+               PRINTER_NOTIFY_FIELD_PORT_NAME                  = 0x03,
+               PRINTER_NOTIFY_FIELD_DRIVER_NAME                = 0x04,
+               PRINTER_NOTIFY_FIELD_COMMENT                    = 0x05,
+               PRINTER_NOTIFY_FIELD_LOCATION                   = 0x06,
+               PRINTER_NOTIFY_FIELD_DEVMODE                    = 0x07,
+               PRINTER_NOTIFY_FIELD_SEPFILE                    = 0x08,
+               PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR            = 0x09,
+               PRINTER_NOTIFY_FIELD_PARAMETERS                 = 0x0a,
+               PRINTER_NOTIFY_FIELD_DATATYPE                   = 0x0b,
+               PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR        = 0x0c,
+               PRINTER_NOTIFY_FIELD_ATTRIBUTES                 = 0x0d,
+               PRINTER_NOTIFY_FIELD_PRIORITY                   = 0x0e,
+               PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY           = 0x0f,
+               PRINTER_NOTIFY_FIELD_START_TIME                 = 0x10,
+               PRINTER_NOTIFY_FIELD_UNTIL_TIME                 = 0x11,
+               PRINTER_NOTIFY_FIELD_STATUS                     = 0x12,
+               PRINTER_NOTIFY_FIELD_STATUS_STRING              = 0x13,
+               PRINTER_NOTIFY_FIELD_CJOBS                      = 0x14,
+               PRINTER_NOTIFY_FIELD_AVERAGE_PPM                = 0x15,
+               PRINTER_NOTIFY_FIELD_TOTAL_PAGES                = 0x16,
+               PRINTER_NOTIFY_FIELD_PAGES_PRINTED              = 0x17,
+               PRINTER_NOTIFY_FIELD_TOTAL_BYTES                = 0x18,
+               PRINTER_NOTIFY_FIELD_BYTES_PRINTED              = 0x19,
+               PRINTER_NOTIFY_FIELD_OBJECT_GUID                = 0x1a,
+               PRINTER_NOTIFY_FIELD_FRIENDLY_NAME              = 0x1b
+       } spoolss_PrintNotifyField;
 
        typedef [enum16bit] enum {
-               SPOOLSS_NOTIFY_PRINTER                  = 0,
-               SPOOLSS_NOTIFY_JOB                              = 1
+               PRINTER_NOTIFY_TYPE     = 0x00,
+               JOB_NOTIFY_TYPE         = 0x01
        } spoolss_NotifyType;
 
+       typedef [nodiscriminant,noprint] union {
+               [case(PRINTER_NOTIFY_TYPE)] uint16 field;
+               [case(JOB_NOTIFY_TYPE)] uint16 field;
+               [default] uint16 field;
+       } spoolss_Field;
+
        /******************/
        /* Function: 0x41 */
        typedef struct {
@@ -1641,7 +2189,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                uint32 u2;
                uint32 u3;
                uint32 count;
-               [size_is(count)] spoolss_Field *fields;
+               [size_is(count),switch_is(type)] spoolss_Field *fields;
        } spoolss_NotifyOptionType;
 
        typedef [bitmap32bit] bitmap {
@@ -1683,14 +2231,14 @@ 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;
 
        typedef struct {
                spoolss_NotifyType type;
-               spoolss_Field field;
+               [switch_is(type)] spoolss_Field field;
                spoolss_NotifyTable variable_type;
                uint32 job_id;
                [switch_is(variable_type)] spoolss_NotifyData data;
@@ -1779,7 +2327,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 */
@@ -1871,8 +2420,8 @@ import "misc.idl", "security.idl", "winreg.idl";
                [out,size_is(value_offered/2),charset(UTF16)] uint16 value_name[],
                [in]     uint32 value_offered,
                [out,ref] uint32 *value_needed,
-               [out,ref] uint32 *printerdata_type,
-               [out,ref] DATA_BLOB *buffer,
+               [out,ref] winreg_Type *type,
+               [out,ref,size_is(data_offered),flag(LIBNDR_PRINT_ARRAY_HEX)] uint8 *data,
                [in]     uint32 data_offered,
                [out,ref] uint32 *data_needed
        );
@@ -1905,7 +2454,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,ref] policy_handle *handle,
                [in]     [string,charset(UTF16)] uint16 key_name[],
                [in]     [string,charset(UTF16)] uint16 value_name[],
-               [in]     uint32 type,
+               [in]     winreg_Type type,
                [in,ref] [size_is(offered)] uint8 *buffer,
                [in]     uint32 offered
        );
@@ -1916,7 +2465,7 @@ import "misc.idl", "security.idl", "winreg.idl";
                [in,ref] policy_handle *handle,
                [in]     [string,charset(UTF16)] uint16 key_name[],
                [in]     [string,charset(UTF16)] uint16 value_name[],
-               [out,ref] uint32 *type,
+               [out,ref] winreg_Type *type,
                [out,ref] [size_is(offered)] uint8 *buffer,
                [in]     uint32 offered,
                [out,ref] uint32 *needed
@@ -1924,22 +2473,43 @@ import "misc.idl", "security.idl", "winreg.idl";
 
        /******************/
        /* Function: 0x4f */
-       [public] WERROR spoolss_EnumPrinterDataEx(
+
+       typedef [relative_base,public,gensize] struct {
+               [relative] nstring *value_name;
+               [value(2*strlen_m_term(value_name))] uint32 value_name_len;
+               winreg_Type type;
+               [relative,switch_is(type),subcontext(0),subcontext_size(r->data_length)] spoolss_PrinterData *data;
+               [value(ndr_size_spoolss_PrinterData(data, type, ndr->iconv_convenience, ndr->flags))] uint32 data_length;
+       } spoolss_PrinterEnumValues;
+
+       [public,noopnum,noprint] WERROR _spoolss_EnumPrinterDataEx(
                [in,ref] policy_handle *handle,
                [in]     [string,charset(UTF16)] uint16 key_name[],
-               [out,ref] [size_is(offered)] uint8 *buffer,
-               [in]     uint32 offered,
+               [out] DATA_BLOB info,
+               [in] uint32 offered,
                [out,ref] uint32 *needed,
                [out,ref] uint32 *count
        );
+       [public,noopnum,noprint] void __spoolss_EnumPrinterDataEx(
+               [in] uint32 count,
+               [out] spoolss_PrinterEnumValues info[count]
+       );
+       [nopull,nopush] WERROR spoolss_EnumPrinterDataEx(
+               [in,ref] policy_handle *handle,
+               [in]     [string,charset(UTF16)] uint16 key_name[],
+               [in] uint32 offered,
+               [out,ref] uint32 *count,
+               [out,ref,size_is(,*count)] spoolss_PrinterEnumValues **info,
+               [out,ref] uint32 *needed
+       );
 
        /******************/
        /* Function: 0x50 */
        [public] WERROR spoolss_EnumPrinterKey(
                [in, ref] policy_handle *handle,
                [in] [string,charset(UTF16)] uint16 key_name[],
-               [out,ref] [size_is(key_buffer_size/2)] uint16 *key_buffer,
-               [in] uint32 key_buffer_size,
+               [out,ref] [subcontext(0),subcontext_size(offered)] nstring_array **key_buffer,
+               [in] uint32 offered,
                [out,ref] uint32 *needed
        );