spoolss: hand-marshall the spoolss_StringArray2 struct for spoolss_EnumPrinterKey.
[ira/wip.git] / librpc / gen_ndr / spoolss.h
index 5934cfa03309afc60fe4de8c0afa101802dc6ecb..e209cb464b8d206b6ef2885cb265f2f93e8963fe 100644 (file)
 
 #include <stdint.h>
 
+#include "libcli/util/ntstatus.h"
+
 #include "librpc/gen_ndr/misc.h"
 #include "librpc/gen_ndr/security.h"
 #include "librpc/gen_ndr/winreg.h"
 #ifndef _HEADER_spoolss
 #define _HEADER_spoolss
 
+#define PRINTER_STATUS_OK      ( 0x00000000 )
+#define JOB_STATUS_QUEUED      ( 0x0000 )
+#define MAXDEVICENAME  ( 32 )
 #define PRINTER_ENUM_ICONMASK  ( (PRINTER_ENUM_ICON1|PRINTER_ENUM_ICON2|PRINTER_ENUM_ICON3|PRINTER_ENUM_ICON4|PRINTER_ENUM_ICON5|PRINTER_ENUM_ICON6|PRINTER_ENUM_ICON7|PRINTER_ENUM_ICON8) )
+#define SPL_ARCH_WIN40 ( "WIN40" )
+#define SPL_ARCH_W32X86        ( "W32X86" )
+#define SPL_ARCH_W32MIPS       ( "W32MIPS" )
+#define SPL_ARCH_W32ALPHA      ( "W32ALPHA" )
+#define SPL_ARCH_W32PPC        ( "W32PPC" )
+#define SPL_ARCH_IA64  ( "IA64" )
+#define SPL_ARCH_X64   ( "x64" )
+#define SPOOLSS_ARCHITECTURE_ALL       ( "all" )
 #define SPOOLSS_ARCHITECTURE_NT_X86    ( "Windows NT x86" )
-#define PRINTER_CHANGE_PRINTER ( (PRINTER_CHANGE_ADD_PRINTER|PRINTER_CHANGE_SET_PRINTER|PRINTER_CHANGE_DELETE_PRINTER|PRINTER_CHANGE_FAILED_CONNECTION_PRINTER) )
-#define PRINTER_CHANGE_JOB     ( (PRINTER_CHANGE_ADD_JOB|PRINTER_CHANGE_SET_JOB|PRINTER_CHANGE_DELETE_JOB|PRINTER_CHANGE_WRITE_JOB) )
+#define SPOOLSS_DEFAULT_SERVER_PATH    ( "C:\\WINDOWS\\system32\\spool" )
+#define SPOOL_PRINTERDATA_KEY  ( "PrinterDriverData" )
+#define SPOOL_DSSPOOLER_KEY    ( "DsSpooler" )
+#define SPOOL_DSDRIVER_KEY     ( "DsDriver" )
+#define SPOOL_DSUSER_KEY       ( "DsUser" )
+#define SPOOL_PNPDATA_KEY      ( "PnPData" )
+#define SPOOL_OID_KEY  ( "OID" )
+#define SPOOL_REG_ASSETNUMBER  ( "assetNumber" )
+#define SPOOL_REG_BYTESPERMINUTE       ( "bytesPerMinute" )
+#define SPOOL_REG_DEFAULTPRIORITY      ( "defaultPriority" )
+#define SPOOL_REG_DESCRIPTION  ( "description" )
+#define SPOOL_REG_DRIVERNAME   ( "driverName" )
+#define SPOOL_REG_DRIVERVERSION        ( "driverVersion" )
+#define SPOOL_REG_FLAGS        ( "flags" )
+#define SPOOL_REG_LOCATION     ( "location" )
+#define SPOOL_REG_OPERATINGSYSTEM      ( "operatingSystem" )
+#define SPOOL_REG_OPERATINGSYSTEMHOTFIX        ( "operatingSystemHotfix" )
+#define SPOOL_REG_OPERATINGSYSTEMSERVICEPACK   ( "operatingSystemServicePack" )
+#define SPOOL_REG_OPERATINGSYSTEMVERSION       ( "operatingSystemVersion" )
+#define SPOOL_REG_PORTNAME     ( "portName" )
+#define SPOOL_REG_PRINTATTRIBUTES      ( "printAttributes" )
+#define SPOOL_REG_PRINTBINNAMES        ( "printBinNames" )
+#define SPOOL_REG_PRINTCOLLATE ( "printCollate" )
+#define SPOOL_REG_PRINTCOLOR   ( "printColor" )
+#define SPOOL_REG_PRINTDUPLEXSUPPORTED ( "printDuplexSupported" )
+#define SPOOL_REG_PRINTENDTIME ( "printEndTime" )
+#define SPOOL_REG_PRINTERNAME  ( "printerName" )
+#define SPOOL_REG_PRINTFORMNAME        ( "printFormName" )
+#define SPOOL_REG_PRINTKEEPPRINTEDJOBS ( "printKeepPrintedJobs" )
+#define SPOOL_REG_PRINTLANGUAGE        ( "printLanguage" )
+#define SPOOL_REG_PRINTMACADDRESS      ( "printMACAddress" )
+#define SPOOL_REG_PRINTMAXCOPIES       ( "printMaxCopies" )
+#define SPOOL_REG_PRINTMAXRESOLUTIONSUPPORTED  ( "printMaxResolutionSupported" )
+#define SPOOL_REG_PRINTMAXXEXTENT      ( "printMaxXExtent" )
+#define SPOOL_REG_PRINTMAXYEXTENT      ( "printMaxYExtent" )
+#define SPOOL_REG_PRINTMEDIAREADY      ( "printMediaReady" )
+#define SPOOL_REG_PRINTMEDIASUPPORTED  ( "printMediaSupported" )
+#define SPOOL_REG_PRINTMEMORY  ( "printMemory" )
+#define SPOOL_REG_PRINTMINXEXTENT      ( "printMinXExtent" )
+#define SPOOL_REG_PRINTMINYEXTENT      ( "printMinYExtent" )
+#define SPOOL_REG_PRINTNETWORKADDRESS  ( "printNetworkAddress" )
+#define SPOOL_REG_PRINTNOTIFY  ( "printNotify" )
+#define SPOOL_REG_PRINTNUMBERUP        ( "printNumberUp" )
+#define SPOOL_REG_PRINTORIENTATIONSSUPPORTED   ( "printOrientationsSupported" )
+#define SPOOL_REG_PRINTOWNER   ( "printOwner" )
+#define SPOOL_REG_PRINTPAGESPERMINUTE  ( "printPagesPerMinute" )
+#define SPOOL_REG_PRINTRATE    ( "printRate" )
+#define SPOOL_REG_PRINTRATEUNIT        ( "printRateUnit" )
+#define SPOOL_REG_PRINTSEPARATORFILE   ( "printSeparatorFile" )
+#define SPOOL_REG_PRINTSHARENAME       ( "printShareName" )
+#define SPOOL_REG_PRINTSPOOLING        ( "printSpooling" )
+#define SPOOL_REGVAL_PRINTWHILESPOOLING        ( "PrintWhileSpooling" )
+#define SPOOL_REGVAL_PRINTAFTERSPOOLED ( "PrintAfterSpooled" )
+#define SPOOL_REGVAL_PRINTDIRECT       ( "PrintDirect" )
+#define SPOOL_REG_PRINTSTAPLINGSUPPORTED       ( "printStaplingSupported" )
+#define SPOOL_REG_PRINTSTARTTIME       ( "printStartTime" )
+#define SPOOL_REG_PRINTSTATUS  ( "printStatus" )
+#define SPOOL_REG_PRIORITY     ( "priority" )
+#define SPOOL_REG_SERVERNAME   ( "serverName" )
+#define SPOOL_REG_SHORTSERVERNAME      ( "shortServerName" )
+#define SPOOL_REG_UNCNAME      ( "uNCName" )
+#define SPOOL_REG_URL  ( "url" )
+#define SPOOL_REG_VERSIONNUMBER        ( "versionNumber" )
+#define SPL_LOCAL_PORT ( "Local Port" )
+#define SPL_TCPIP_PORT ( "Standard TCP/IP Port" )
+#define SPL_XCV_MONITOR_LOCALMON       ( ",XcvMonitor Local Port" )
+#define SPL_XCV_MONITOR_TCPMON ( ",XcvMonitor Standard TCP/IP Port" )
+#define PRINTER_CHANGE_PRINTER ( 0x000000FF )
+#define PRINTER_CHANGE_JOB     ( 0x0000FF00 )
 #define PRINTER_CHANGE_FORM    ( (PRINTER_CHANGE_ADD_FORM|PRINTER_CHANGE_SET_FORM|PRINTER_CHANGE_DELETE_FORM) )
 #define PRINTER_CHANGE_PORT    ( (PRINTER_CHANGE_ADD_PORT|PRINTER_CHANGE_CONFIGURE_PORT|PRINTER_CHANGE_DELETE_PORT) )
-#define PRINTER_CHANGE_PRINT_PROCESSOR ( (PRINTER_CHANGE_ADD_PRINT_PROCESSOR|PRINTER_CHANGE_DELETE_PRINT_PROCESSOR) )
+#define PRINTER_CHANGE_PRINT_PROCESSOR ( 0x07000000 )
 #define PRINTER_CHANGE_PRINTER_DRIVER  ( (PRINTER_CHANGE_ADD_PRINTER_DRIVER|PRINTER_CHANGE_SET_PRINTER_DRIVER|PRINTER_CHANGE_DELETE_PRINTER_DRIVER) )
-#define PRINTER_CHANGE_ALL     ( (PRINTER_CHANGE_JOB|PRINTER_CHANGE_FORM|PRINTER_CHANGE_PORT|PRINTER_CHANGE_PRINT_PROCESSOR|PRINTER_CHANGE_PRINTER_DRIVER) )
+#define PRINTER_CHANGE_ALL     ( (PRINTER_CHANGE_PRINTER|PRINTER_CHANGE_JOB|PRINTER_CHANGE_FORM|PRINTER_CHANGE_PORT|PRINTER_CHANGE_PRINT_PROCESSOR|PRINTER_CHANGE_PRINTER_DRIVER) )
 #define SERVER_ALL_ACCESS      ( SEC_STD_REQUIRED|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE )
 #define SERVER_READ    ( SEC_STD_READ_CONTROL|SERVER_ACCESS_ENUMERATE )
 #define SERVER_WRITE   ( STANDARD_RIGHTS_WRITE_ACCESS|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE )
@@ -41,8 +121,123 @@ struct spoolss_Time {
        uint16_t minute;
        uint16_t second;
        uint16_t millisecond;
+}/* [gensize] */;
+
+struct spoolss_TimeCtr {
+       uint32_t size;/* [value(ndr_size_spoolss_Time(time,ndr->iconv_convenience,ndr->flags))] */
+       struct spoolss_Time *time;/* [unique] */
 };
 
+enum spoolss_ProcessorArchitecture
+#ifndef USE_UINT_ENUMS
+ {
+       PROCESSOR_ARCHITECTURE_INTEL=(int)(0x0000),
+       PROCESSOR_ARCHITECTURE_IA64=(int)(0x0006),
+       PROCESSOR_ARCHITECTURE_AMD64=(int)(0x0009)
+}
+#else
+ { __donnot_use_enum_spoolss_ProcessorArchitecture=0x7FFFFFFF}
+#define PROCESSOR_ARCHITECTURE_INTEL ( 0x0000 )
+#define PROCESSOR_ARCHITECTURE_IA64 ( 0x0006 )
+#define PROCESSOR_ARCHITECTURE_AMD64 ( 0x0009 )
+#endif
+;
+
+enum spoolss_ProcessorType
+#ifndef USE_UINT_ENUMS
+ {
+       PROCESSOR_INTEL_386=(int)(0x00000182),
+       PROCESSOR_INTEL_486=(int)(0x000001E6),
+       PROCESSOR_INTEL_PENTIUM=(int)(0x0000024A),
+       PROCESSOR_INTEL_IA64=(int)(0x00000898),
+       PROCESSOR_AMD_X8664=(int)(0x000022A0)
+}
+#else
+ { __donnot_use_enum_spoolss_ProcessorType=0x7FFFFFFF}
+#define PROCESSOR_INTEL_386 ( 0x00000182 )
+#define PROCESSOR_INTEL_486 ( 0x000001E6 )
+#define PROCESSOR_INTEL_PENTIUM ( 0x0000024A )
+#define PROCESSOR_INTEL_IA64 ( 0x00000898 )
+#define PROCESSOR_AMD_X8664 ( 0x000022A0 )
+#endif
+;
+
+enum spoolss_MajorVersion
+#ifndef USE_UINT_ENUMS
+ {
+       SPOOLSS_MAJOR_VERSION_NT4_95_98_ME=(int)(0x00000004),
+       SPOOLSS_MAJOR_VERSION_2000_2003_XP=(int)(0x00000005),
+       SPOOLSS_MAJOR_VERSION_2008_VISTA=(int)(0x00000006)
+}
+#else
+ { __donnot_use_enum_spoolss_MajorVersion=0x7FFFFFFF}
+#define SPOOLSS_MAJOR_VERSION_NT4_95_98_ME ( 0x00000004 )
+#define SPOOLSS_MAJOR_VERSION_2000_2003_XP ( 0x00000005 )
+#define SPOOLSS_MAJOR_VERSION_2008_VISTA ( 0x00000006 )
+#endif
+;
+
+enum spoolss_MinorVersion
+#ifndef USE_UINT_ENUMS
+ {
+       SPOOLSS_MINOR_VERSION_0=(int)(0x00000000),
+       SPOOLSS_MINOR_VERSION_XP=(int)(0x00000001),
+       SPOOLSS_MINOR_VERSION_2003_XP64=(int)(0x00000002),
+       SPOOLSS_MINOR_VERSION_98=(int)(0x0000000a),
+       SPOOLSS_MINOR_VERSION_ME=(int)(0x0000005a)
+}
+#else
+ { __donnot_use_enum_spoolss_MinorVersion=0x7FFFFFFF}
+#define SPOOLSS_MINOR_VERSION_0 ( 0x00000000 )
+#define SPOOLSS_MINOR_VERSION_XP ( 0x00000001 )
+#define SPOOLSS_MINOR_VERSION_2003_XP64 ( 0x00000002 )
+#define SPOOLSS_MINOR_VERSION_98 ( 0x0000000a )
+#define SPOOLSS_MINOR_VERSION_ME ( 0x0000005a )
+#endif
+;
+
+/* bitmap spoolss_PrinterStatus */
+#define PRINTER_STATUS_PAUSED ( 0x00000001 )
+#define PRINTER_STATUS_ERROR ( 0x00000002 )
+#define PRINTER_STATUS_PENDING_DELETION ( 0x00000004 )
+#define PRINTER_STATUS_PAPER_JAM ( 0x00000008 )
+#define PRINTER_STATUS_PAPER_OUT ( 0x00000010 )
+#define PRINTER_STATUS_MANUAL_FEED ( 0x00000020 )
+#define PRINTER_STATUS_PAPER_PROBLEM ( 0x00000040 )
+#define PRINTER_STATUS_OFFLINE ( 0x00000080 )
+#define PRINTER_STATUS_IO_ACTIVE ( 0x00000100 )
+#define PRINTER_STATUS_BUSY ( 0x00000200 )
+#define PRINTER_STATUS_PRINTING ( 0x00000400 )
+#define PRINTER_STATUS_OUTPUT_BIN_FULL ( 0x00000800 )
+#define PRINTER_STATUS_NOT_AVAILABLE ( 0x00001000 )
+#define PRINTER_STATUS_WAITING ( 0x00002000 )
+#define PRINTER_STATUS_PROCESSING ( 0x00004000 )
+#define PRINTER_STATUS_INITIALIZING ( 0x00008000 )
+#define PRINTER_STATUS_WARMING_UP ( 0x00010000 )
+#define PRINTER_STATUS_TONER_LOW ( 0x00020000 )
+#define PRINTER_STATUS_NO_TONER ( 0x00040000 )
+#define PRINTER_STATUS_PAGE_PUNT ( 0x00080000 )
+#define PRINTER_STATUS_USER_INTERVENTION ( 0x00100000 )
+#define PRINTER_STATUS_OUT_OF_MEMORY ( 0x00200000 )
+#define PRINTER_STATUS_DOOR_OPEN ( 0x00400000 )
+#define PRINTER_STATUS_SERVER_UNKNOWN ( 0x00800000 )
+#define PRINTER_STATUS_POWER_SAVE ( 0x01000000 )
+
+/* bitmap spoolss_JobStatus */
+#define JOB_STATUS_PAUSED ( 0x00000001 )
+#define JOB_STATUS_ERROR ( 0x00000002 )
+#define JOB_STATUS_DELETING ( 0x00000004 )
+#define JOB_STATUS_SPOOLING ( 0x00000008 )
+#define JOB_STATUS_PRINTING ( 0x00000010 )
+#define JOB_STATUS_OFFLINE ( 0x00000020 )
+#define JOB_STATUS_PAPEROUT ( 0x00000040 )
+#define JOB_STATUS_PRINTED ( 0x00000080 )
+#define JOB_STATUS_DELETED ( 0x00000100 )
+#define JOB_STATUS_BLOCKED_DEVQ ( 0x00000200 )
+#define JOB_STATUS_USER_INTERVENTION ( 0x00000400 )
+#define JOB_STATUS_RESTART ( 0x00000800 )
+#define JOB_STATUS_COMPLETE ( 0x00001000 )
+
 struct spoolss_PrinterInfo0 {
        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -53,59 +248,509 @@ struct spoolss_PrinterInfo0 {
        uint32_t global_counter;
        uint32_t total_pages;
        uint32_t version;
-       uint32_t unknown10;
-       uint32_t unknown11;
-       uint32_t unknown12;
+       uint32_t free_build;
+       uint32_t spooling;
+       uint32_t max_spooling;
        uint32_t session_counter;
-       uint32_t unknown14;
-       uint32_t printer_errors;
-       uint32_t unknown16;
-       uint32_t unknown17;
-       uint32_t unknown18;
-       uint32_t unknown19;
+       uint32_t num_error_out_of_paper;
+       uint32_t num_error_not_ready;
+       uint32_t job_error;
+       uint32_t number_of_processors;
+       enum spoolss_ProcessorType processor_type;
+       uint32_t high_part_total_bytes;
        uint32_t change_id;
-       uint32_t unknown21;
+       WERROR last_error;
        uint32_t status;
-       uint32_t unknown23;
+       uint32_t enumerate_network_printers;
        uint32_t c_setprinter;
-       uint16_t unknown25;
-       uint16_t unknown26;
-       uint32_t unknown27;
-       uint32_t unknown28;
-       uint32_t unknown29;
-};
+       enum spoolss_ProcessorArchitecture processor_architecture;
+       uint16_t processor_level;
+       uint32_t ref_ic;
+       uint32_t reserved2;
+       uint32_t reserved3;
+}/* [gensize,public] */;
+
+/* bitmap spoolss_DeviceModeFields */
+#define DEVMODE_ORIENTATION ( 0x00000001 )
+#define DEVMODE_PAPERSIZE ( 0x00000002 )
+#define DEVMODE_PAPERLENGTH ( 0x00000004 )
+#define DEVMODE_PAPERWIDTH ( 0x00000008 )
+#define DEVMODE_SCALE ( 0x00000010 )
+#define DEVMODE_POSITION ( 0x00000020 )
+#define DEVMODE_NUP ( 0x00000040 )
+#define DEVMODE_COPIES ( 0x00000100 )
+#define DEVMODE_DEFAULTSOURCE ( 0x00000200 )
+#define DEVMODE_PRINTQUALITY ( 0x00000400 )
+#define DEVMODE_COLOR ( 0x00000800 )
+#define DEVMODE_DUPLEX ( 0x00001000 )
+#define DEVMODE_YRESOLUTION ( 0x00002000 )
+#define DEVMODE_TTOPTION ( 0x00004000 )
+#define DEVMODE_COLLATE ( 0x00008000 )
+#define DEVMODE_FORMNAME ( 0x00010000 )
+#define DEVMODE_LOGPIXELS ( 0x00020000 )
+#define DEVMODE_BITSPERPEL ( 0x00040000 )
+#define DEVMODE_PELSWIDTH ( 0x00080000 )
+#define DEVMODE_PELSHEIGHT ( 0x00100000 )
+#define DEVMODE_DISPLAYFLAGS ( 0x00200000 )
+#define DEVMODE_DISPLAYFREQUENCY ( 0x00400000 )
+#define DEVMODE_ICMMETHOD ( 0x00800000 )
+#define DEVMODE_ICMINTENT ( 0x01000000 )
+#define DEVMODE_MEDIATYPE ( 0x02000000 )
+#define DEVMODE_DITHERTYPE ( 0x04000000 )
+#define DEVMODE_PANNINGWIDTH ( 0x08000000 )
+#define DEVMODE_PANNINGHEIGHT ( 0x10000000 )
+
+enum spoolss_DeviceModeSpecVersion
+#ifndef USE_UINT_ENUMS
+ {
+       DMSPEC_NT3=(int)(0x320),
+       DMSPEC_WIN95_98_ME=(int)(0x400),
+       DMSPEC_NT4_AND_ABOVE=(int)(0x401)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeSpecVersion=0x7FFFFFFF}
+#define DMSPEC_NT3 ( 0x320 )
+#define DMSPEC_WIN95_98_ME ( 0x400 )
+#define DMSPEC_NT4_AND_ABOVE ( 0x401 )
+#endif
+;
+
+enum spoolss_DeviceModeOrientation
+#ifndef USE_UINT_ENUMS
+ {
+       DMORIENT_PORTRAIT=(int)(0x0001),
+       DMORIENT_LANDSCAPE=(int)(0x0002)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeOrientation=0x7FFFFFFF}
+#define DMORIENT_PORTRAIT ( 0x0001 )
+#define DMORIENT_LANDSCAPE ( 0x0002 )
+#endif
+;
+
+enum spoolss_DeviceModePaperSize
+#ifndef USE_UINT_ENUMS
+ {
+       DMPAPER_LETTER=(int)(0x0001),
+       DMPAPER_LETTERSMALL=(int)(0x0002),
+       DMPAPER_TABLOID=(int)(0x0003),
+       DMPAPER_LEDGER=(int)(0x0004),
+       DMPAPER_LEGAL=(int)(0x0005),
+       DMPAPER_STATEMENT=(int)(0x0006),
+       DMPAPER_EXECUTIVE=(int)(0x0007),
+       DMPAPER_A3=(int)(0x0008),
+       DMPAPER_A4=(int)(0x0009),
+       DMPAPER_A4SMALL=(int)(0x000A),
+       DMPAPER_A5=(int)(0x000B),
+       DMPAPER_B4=(int)(0x000C),
+       DMPAPER_B5=(int)(0x000D),
+       DMPAPER_FOLIO=(int)(0x000E),
+       DMPAPER_QUARTO=(int)(0x000F),
+       DMPAPER_10X14=(int)(0x0010),
+       DMPAPER_11X17=(int)(0x0011),
+       DMPAPER_NOTE=(int)(0x0012),
+       DMPAPER_ENV_9=(int)(0x0013),
+       DMPAPER_ENV_10=(int)(0x0014),
+       DMPAPER_ENV_11=(int)(0x0015),
+       DMPAPER_ENV_12=(int)(0x0016),
+       DMPAPER_ENV_14=(int)(0x0017),
+       DMPAPER_CSHEET=(int)(0x0018),
+       DMPAPER_DSHEET=(int)(0x0019),
+       DMPAPER_ESHEET=(int)(0x001A),
+       DMPAPER_ENV_DL=(int)(0x001B),
+       DMPAPER_ENV_C5=(int)(0x001C),
+       DMPAPER_ENV_C3=(int)(0x001D),
+       DMPAPER_ENV_C4=(int)(0x001E),
+       DMPAPER_ENV_C6=(int)(0x001F),
+       DMPAPER_ENV_C65=(int)(0x0020),
+       DMPAPER_ENV_B4=(int)(0x0021),
+       DMPAPER_ENV_B5=(int)(0x0022),
+       DMPAPER_ENV_B6=(int)(0x0023),
+       DMPAPER_ENV_ITALY=(int)(0x0024),
+       DMPAPER_ENV_MONARCH=(int)(0x0025),
+       DMPAPER_ENV_PERSONAL=(int)(0x0026),
+       DMPAPER_FANFOLD_US=(int)(0x0027),
+       DMPAPER_FANFOLD_STD_GERMAN=(int)(0x0028),
+       DMPAPER_FANFOLD_LGL_GERMAN=(int)(0x0029),
+       DMPAPER_DBL_JAPANESE_POSTCARD=(int)(0x0045),
+       DMPAPER_A6=(int)(0x0046),
+       DMPAPER_JENV_KAKU2=(int)(0x0047),
+       DMPAPER_JENV_KAKU3=(int)(0x0048),
+       DMPAPER_JENV_CHOU3=(int)(0x0049),
+       DMPAPER_JENV_CHOU4=(int)(0x004A),
+       DMPAPER_LETTER_ROTATED=(int)(0x004B),
+       DMPAPER_A3_ROTATED=(int)(0x004C),
+       DMPAPER_A4_ROTATED=(int)(0x004D),
+       DMPAPER_A5_ROTATED=(int)(0x004E),
+       DMPAPER_B4_JIS_ROTATED=(int)(0x004F),
+       DMPAPER_B5_JIS_ROTATED=(int)(0x0050),
+       DMPAPER_JAPANESE_POSTCARD_ROTATED=(int)(0x0051),
+       DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED=(int)(0x0052),
+       DMPAPER_A6_ROTATED=(int)(0x0053),
+       DMPAPER_JENV_KAKU2_ROTATED=(int)(0x0054),
+       DMPAPER_JENV_KAKU3_ROTATED=(int)(0x0055),
+       DMPAPER_JENV_CHOU3_ROTATED=(int)(0x0056),
+       DMPAPER_JENV_CHOU4_ROTATED=(int)(0x0057),
+       DMPAPER_B6_JIS=(int)(0x0058),
+       DMPAPER_B6_JIS_ROTATED=(int)(0x0059),
+       DMPAPER_12X11=(int)(0x005A),
+       DMPAPER_JENV_YOU4=(int)(0x005B),
+       DMPAPER_JENV_YOU4_ROTATED=(int)(0x005C),
+       DMPAPER_P16K=(int)(0x005D),
+       DMPAPER_P32K=(int)(0x005E),
+       DMPAPER_P32KBIG=(int)(0x005F),
+       DMPAPER_PENV_1=(int)(0x0060),
+       DMPAPER_PENV_2=(int)(0x0061),
+       DMPAPER_PENV_3=(int)(0x0062),
+       DMPAPER_PENV_4=(int)(0x0063),
+       DMPAPER_PENV_5=(int)(0x0064),
+       DMPAPER_PENV_6=(int)(0x0065),
+       DMPAPER_PENV_7=(int)(0x0066),
+       DMPAPER_PENV_8=(int)(0x0067),
+       DMPAPER_PENV_9=(int)(0x0068),
+       DMPAPER_PENV_10=(int)(0x0069),
+       DMPAPER_P16K_ROTATED=(int)(0x006A),
+       DMPAPER_P32K_ROTATED=(int)(0x006B),
+       DMPAPER_P32KBIG_ROTATED=(int)(0x006C),
+       DMPAPER_PENV_1_ROTATED=(int)(0x006D),
+       DMPAPER_PENV_2_ROTATED=(int)(0x006E),
+       DMPAPER_PENV_3_ROTATED=(int)(0x006F),
+       DMPAPER_PENV_4_ROTATED=(int)(0x0070),
+       DMPAPER_PENV_5_ROTATED=(int)(0x0071),
+       DMPAPER_PENV_6_ROTATED=(int)(0x0072),
+       DMPAPER_PENV_7_ROTATED=(int)(0x0073),
+       DMPAPER_PENV_8_ROTATED=(int)(0x0074),
+       DMPAPER_PENV_9_ROTATED=(int)(0x0075),
+       DMPAPER_PENV_10_ROTATED=(int)(0x0076)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModePaperSize=0x7FFFFFFF}
+#define DMPAPER_LETTER ( 0x0001 )
+#define DMPAPER_LETTERSMALL ( 0x0002 )
+#define DMPAPER_TABLOID ( 0x0003 )
+#define DMPAPER_LEDGER ( 0x0004 )
+#define DMPAPER_LEGAL ( 0x0005 )
+#define DMPAPER_STATEMENT ( 0x0006 )
+#define DMPAPER_EXECUTIVE ( 0x0007 )
+#define DMPAPER_A3 ( 0x0008 )
+#define DMPAPER_A4 ( 0x0009 )
+#define DMPAPER_A4SMALL ( 0x000A )
+#define DMPAPER_A5 ( 0x000B )
+#define DMPAPER_B4 ( 0x000C )
+#define DMPAPER_B5 ( 0x000D )
+#define DMPAPER_FOLIO ( 0x000E )
+#define DMPAPER_QUARTO ( 0x000F )
+#define DMPAPER_10X14 ( 0x0010 )
+#define DMPAPER_11X17 ( 0x0011 )
+#define DMPAPER_NOTE ( 0x0012 )
+#define DMPAPER_ENV_9 ( 0x0013 )
+#define DMPAPER_ENV_10 ( 0x0014 )
+#define DMPAPER_ENV_11 ( 0x0015 )
+#define DMPAPER_ENV_12 ( 0x0016 )
+#define DMPAPER_ENV_14 ( 0x0017 )
+#define DMPAPER_CSHEET ( 0x0018 )
+#define DMPAPER_DSHEET ( 0x0019 )
+#define DMPAPER_ESHEET ( 0x001A )
+#define DMPAPER_ENV_DL ( 0x001B )
+#define DMPAPER_ENV_C5 ( 0x001C )
+#define DMPAPER_ENV_C3 ( 0x001D )
+#define DMPAPER_ENV_C4 ( 0x001E )
+#define DMPAPER_ENV_C6 ( 0x001F )
+#define DMPAPER_ENV_C65 ( 0x0020 )
+#define DMPAPER_ENV_B4 ( 0x0021 )
+#define DMPAPER_ENV_B5 ( 0x0022 )
+#define DMPAPER_ENV_B6 ( 0x0023 )
+#define DMPAPER_ENV_ITALY ( 0x0024 )
+#define DMPAPER_ENV_MONARCH ( 0x0025 )
+#define DMPAPER_ENV_PERSONAL ( 0x0026 )
+#define DMPAPER_FANFOLD_US ( 0x0027 )
+#define DMPAPER_FANFOLD_STD_GERMAN ( 0x0028 )
+#define DMPAPER_FANFOLD_LGL_GERMAN ( 0x0029 )
+#define DMPAPER_DBL_JAPANESE_POSTCARD ( 0x0045 )
+#define DMPAPER_A6 ( 0x0046 )
+#define DMPAPER_JENV_KAKU2 ( 0x0047 )
+#define DMPAPER_JENV_KAKU3 ( 0x0048 )
+#define DMPAPER_JENV_CHOU3 ( 0x0049 )
+#define DMPAPER_JENV_CHOU4 ( 0x004A )
+#define DMPAPER_LETTER_ROTATED ( 0x004B )
+#define DMPAPER_A3_ROTATED ( 0x004C )
+#define DMPAPER_A4_ROTATED ( 0x004D )
+#define DMPAPER_A5_ROTATED ( 0x004E )
+#define DMPAPER_B4_JIS_ROTATED ( 0x004F )
+#define DMPAPER_B5_JIS_ROTATED ( 0x0050 )
+#define DMPAPER_JAPANESE_POSTCARD_ROTATED ( 0x0051 )
+#define DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED ( 0x0052 )
+#define DMPAPER_A6_ROTATED ( 0x0053 )
+#define DMPAPER_JENV_KAKU2_ROTATED ( 0x0054 )
+#define DMPAPER_JENV_KAKU3_ROTATED ( 0x0055 )
+#define DMPAPER_JENV_CHOU3_ROTATED ( 0x0056 )
+#define DMPAPER_JENV_CHOU4_ROTATED ( 0x0057 )
+#define DMPAPER_B6_JIS ( 0x0058 )
+#define DMPAPER_B6_JIS_ROTATED ( 0x0059 )
+#define DMPAPER_12X11 ( 0x005A )
+#define DMPAPER_JENV_YOU4 ( 0x005B )
+#define DMPAPER_JENV_YOU4_ROTATED ( 0x005C )
+#define DMPAPER_P16K ( 0x005D )
+#define DMPAPER_P32K ( 0x005E )
+#define DMPAPER_P32KBIG ( 0x005F )
+#define DMPAPER_PENV_1 ( 0x0060 )
+#define DMPAPER_PENV_2 ( 0x0061 )
+#define DMPAPER_PENV_3 ( 0x0062 )
+#define DMPAPER_PENV_4 ( 0x0063 )
+#define DMPAPER_PENV_5 ( 0x0064 )
+#define DMPAPER_PENV_6 ( 0x0065 )
+#define DMPAPER_PENV_7 ( 0x0066 )
+#define DMPAPER_PENV_8 ( 0x0067 )
+#define DMPAPER_PENV_9 ( 0x0068 )
+#define DMPAPER_PENV_10 ( 0x0069 )
+#define DMPAPER_P16K_ROTATED ( 0x006A )
+#define DMPAPER_P32K_ROTATED ( 0x006B )
+#define DMPAPER_P32KBIG_ROTATED ( 0x006C )
+#define DMPAPER_PENV_1_ROTATED ( 0x006D )
+#define DMPAPER_PENV_2_ROTATED ( 0x006E )
+#define DMPAPER_PENV_3_ROTATED ( 0x006F )
+#define DMPAPER_PENV_4_ROTATED ( 0x0070 )
+#define DMPAPER_PENV_5_ROTATED ( 0x0071 )
+#define DMPAPER_PENV_6_ROTATED ( 0x0072 )
+#define DMPAPER_PENV_7_ROTATED ( 0x0073 )
+#define DMPAPER_PENV_8_ROTATED ( 0x0074 )
+#define DMPAPER_PENV_9_ROTATED ( 0x0075 )
+#define DMPAPER_PENV_10_ROTATED ( 0x0076 )
+#endif
+;
+
+enum spoolss_DeviceModeDefaultSource
+#ifndef USE_UINT_ENUMS
+ {
+       DMBIN_UPPER=(int)(0x0001),
+       DMBIN_LOWER=(int)(0x0002),
+       DMBIN_MIDDLE=(int)(0x0003),
+       DMBIN_MANUAL=(int)(0x0004),
+       DMBIN_ENVELOPE=(int)(0x0005),
+       DMBIN_ENVMANUAL=(int)(0x0006),
+       DMBIN_AUTO=(int)(0x0007),
+       DMBIN_TRACTOR=(int)(0x0008),
+       DMBIN_SMALLFMT=(int)(0x0009),
+       DMBIN_LARGEFMT=(int)(0x000a),
+       DMBIN_LARGECAPACITY=(int)(0x000b),
+       DMBIN_CASSETTE=(int)(0x000e),
+       DMBIN_FORMSOURCE=(int)(0x000f)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeDefaultSource=0x7FFFFFFF}
+#define DMBIN_UPPER ( 0x0001 )
+#define DMBIN_LOWER ( 0x0002 )
+#define DMBIN_MIDDLE ( 0x0003 )
+#define DMBIN_MANUAL ( 0x0004 )
+#define DMBIN_ENVELOPE ( 0x0005 )
+#define DMBIN_ENVMANUAL ( 0x0006 )
+#define DMBIN_AUTO ( 0x0007 )
+#define DMBIN_TRACTOR ( 0x0008 )
+#define DMBIN_SMALLFMT ( 0x0009 )
+#define DMBIN_LARGEFMT ( 0x000a )
+#define DMBIN_LARGECAPACITY ( 0x000b )
+#define DMBIN_CASSETTE ( 0x000e )
+#define DMBIN_FORMSOURCE ( 0x000f )
+#endif
+;
+
+enum spoolss_DeviceModePrintQuality
+#ifndef USE_UINT_ENUMS
+ {
+       DMRES_HIGH=(int)(0xfffc),
+       DMRES_MEDIUM=(int)(0xfffd),
+       DMRES_LOW=(int)(0xfffe),
+       DMRES_DRAFT=(int)(0xffff)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModePrintQuality=0x7FFFFFFF}
+#define DMRES_HIGH ( 0xfffc )
+#define DMRES_MEDIUM ( 0xfffd )
+#define DMRES_LOW ( 0xfffe )
+#define DMRES_DRAFT ( 0xffff )
+#endif
+;
+
+enum spoolss_DeviceModeColor
+#ifndef USE_UINT_ENUMS
+ {
+       DMRES_MONOCHROME=(int)(0x0001),
+       DMRES_COLOR=(int)(0x0002)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeColor=0x7FFFFFFF}
+#define DMRES_MONOCHROME ( 0x0001 )
+#define DMRES_COLOR ( 0x0002 )
+#endif
+;
+
+enum spoolss_DeviceModeDuplex
+#ifndef USE_UINT_ENUMS
+ {
+       DMDUP_SIMPLEX=(int)(0x0001),
+       DMDUP_VERTICAL=(int)(0x0002),
+       DMDUP_HORIZONTAL=(int)(0x0003)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeDuplex=0x7FFFFFFF}
+#define DMDUP_SIMPLEX ( 0x0001 )
+#define DMDUP_VERTICAL ( 0x0002 )
+#define DMDUP_HORIZONTAL ( 0x0003 )
+#endif
+;
+
+enum spoolss_DeviceModeTTOption
+#ifndef USE_UINT_ENUMS
+ {
+       DMTT_BITMAP=(int)(0x0001),
+       DMTT_DOWNLOAD=(int)(0x0002),
+       DMTT_SUBDEV=(int)(0x0003),
+       DMTT_DOWNLOAD_OUTLINE=(int)(0x0004)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeTTOption=0x7FFFFFFF}
+#define DMTT_BITMAP ( 0x0001 )
+#define DMTT_DOWNLOAD ( 0x0002 )
+#define DMTT_SUBDEV ( 0x0003 )
+#define DMTT_DOWNLOAD_OUTLINE ( 0x0004 )
+#endif
+;
+
+enum spoolss_DeviceModeCollate
+#ifndef USE_UINT_ENUMS
+ {
+       DMCOLLATE_FALSE=(int)(0x0000),
+       DMCOLLATE_TRUE=(int)(0x0001)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeCollate=0x7FFFFFFF}
+#define DMCOLLATE_FALSE ( 0x0000 )
+#define DMCOLLATE_TRUE ( 0x0001 )
+#endif
+;
+
+enum spoolss_DeviceModeNUp
+#ifndef USE_UINT_ENUMS
+ {
+       DMNUP_SYSTEM=(int)(0x00000001),
+       DMNUP_ONEUP=(int)(0x00000002)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeNUp=0x7FFFFFFF}
+#define DMNUP_SYSTEM ( 0x00000001 )
+#define DMNUP_ONEUP ( 0x00000002 )
+#endif
+;
+
+enum spoolss_DeviceModeICMMethod
+#ifndef USE_UINT_ENUMS
+ {
+       DMICMMETHOD_NONE=(int)(0x00000001),
+       DMICMMETHOD_SYSTEM=(int)(0x00000002),
+       DMICMMETHOD_DRIVER=(int)(0x00000003),
+       DMICMMETHOD_DEVICE=(int)(0x00000004)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeICMMethod=0x7FFFFFFF}
+#define DMICMMETHOD_NONE ( 0x00000001 )
+#define DMICMMETHOD_SYSTEM ( 0x00000002 )
+#define DMICMMETHOD_DRIVER ( 0x00000003 )
+#define DMICMMETHOD_DEVICE ( 0x00000004 )
+#endif
+;
+
+enum spoolss_DeviceModeICMIntent
+#ifndef USE_UINT_ENUMS
+ {
+       DMICM_SATURATE=(int)(0x00000001),
+       DMICM_CONTRAST=(int)(0x00000002),
+       DMICM_COLORIMETRIC=(int)(0x00000003),
+       DMICM_ABS_COLORIMETRIC=(int)(0x00000004)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeICMIntent=0x7FFFFFFF}
+#define DMICM_SATURATE ( 0x00000001 )
+#define DMICM_CONTRAST ( 0x00000002 )
+#define DMICM_COLORIMETRIC ( 0x00000003 )
+#define DMICM_ABS_COLORIMETRIC ( 0x00000004 )
+#endif
+;
+
+enum spoolss_DeviceModeMediaType
+#ifndef USE_UINT_ENUMS
+ {
+       DMMEDIA_STANDARD=(int)(0x00000001),
+       DMMEDIA_TRANSPARENCY=(int)(0x00000002),
+       DMMEDIA_GLOSSY=(int)(0x00000003)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeMediaType=0x7FFFFFFF}
+#define DMMEDIA_STANDARD ( 0x00000001 )
+#define DMMEDIA_TRANSPARENCY ( 0x00000002 )
+#define DMMEDIA_GLOSSY ( 0x00000003 )
+#endif
+;
+
+enum spoolss_DeviceModeDitherType
+#ifndef USE_UINT_ENUMS
+ {
+       DMDITHER_NONE=(int)(0x00000001),
+       DMDITHER_COARSE=(int)(0x00000002),
+       DMDITHER_FINE=(int)(0x00000003),
+       DMDITHER_LINEART=(int)(0x00000004),
+       DMDITHER_ERRORDIFFUSION=(int)(0x00000005),
+       DMDITHER_RESERVED6=(int)(0x00000006),
+       DMDITHER_RESERVED7=(int)(0x00000007),
+       DMDITHER_RESERVED8=(int)(0x00000008),
+       DMDITHER_RESERVED9=(int)(0x00000009),
+       DMDITHER_GRAYSCALE=(int)(0x0000000A)
+}
+#else
+ { __donnot_use_enum_spoolss_DeviceModeDitherType=0x7FFFFFFF}
+#define DMDITHER_NONE ( 0x00000001 )
+#define DMDITHER_COARSE ( 0x00000002 )
+#define DMDITHER_FINE ( 0x00000003 )
+#define DMDITHER_LINEART ( 0x00000004 )
+#define DMDITHER_ERRORDIFFUSION ( 0x00000005 )
+#define DMDITHER_RESERVED6 ( 0x00000006 )
+#define DMDITHER_RESERVED7 ( 0x00000007 )
+#define DMDITHER_RESERVED8 ( 0x00000008 )
+#define DMDITHER_RESERVED9 ( 0x00000009 )
+#define DMDITHER_GRAYSCALE ( 0x0000000A )
+#endif
+;
 
 struct spoolss_DeviceMode {
        const char *devicename;/* [charset(UTF16)] */
-       uint16_t specversion;
+       enum spoolss_DeviceModeSpecVersion specversion;
        uint16_t driverversion;
        uint16_t size;
        uint16_t __driverextra_length;/* [value(r->driverextra_data.length)] */
        uint32_t fields;
-       uint16_t orientation;
-       uint16_t papersize;
+       enum spoolss_DeviceModeOrientation orientation;
+       enum spoolss_DeviceModePaperSize papersize;
        uint16_t paperlength;
        uint16_t paperwidth;
        uint16_t scale;
        uint16_t copies;
-       uint16_t defaultsource;
-       uint16_t printquality;
-       uint16_t color;
-       uint16_t duplex;
+       enum spoolss_DeviceModeDefaultSource defaultsource;
+       enum spoolss_DeviceModePrintQuality printquality;
+       enum spoolss_DeviceModeColor color;
+       enum spoolss_DeviceModeDuplex duplex;
        uint16_t yresolution;
-       uint16_t ttoption;
-       uint16_t collate;
+       enum spoolss_DeviceModeTTOption ttoption;
+       enum spoolss_DeviceModeCollate collate;
        const char *formname;/* [charset(UTF16)] */
        uint16_t logpixels;
        uint32_t bitsperpel;
        uint32_t pelswidth;
        uint32_t pelsheight;
-       uint32_t displayflags;
+       enum spoolss_DeviceModeNUp displayflags;
        uint32_t displayfrequency;
-       uint32_t icmmethod;
-       uint32_t icmintent;
-       uint32_t mediatype;
-       uint32_t dithertype;
+       enum spoolss_DeviceModeICMMethod icmmethod;
+       enum spoolss_DeviceModeICMIntent icmintent;
+       enum spoolss_DeviceModeMediaType mediatype;
+       enum spoolss_DeviceModeDitherType dithertype;
        uint32_t reserved1;
        uint32_t reserved2;
        uint32_t panningwidth;
@@ -134,13 +779,6 @@ struct spoolss_DeviceMode {
 #define PRINTER_ENUM_ICON8 ( 0x00800000 )
 #define PRINTER_ENUM_HIDE ( 0x01000000 )
 
-struct spoolss_PrinterInfo1 {
-       uint32_t flags;
-       const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
-
 /* bitmap spoolss_PrinterAttributes */
 #define PRINTER_ATTRIBUTE_QUEUED ( 0x00000001 )
 #define PRINTER_ATTRIBUTE_DIRECT ( 0x00000002 )
@@ -159,32 +797,12 @@ struct spoolss_PrinterInfo1 {
 #define PRINTER_ATTRIBUTE_FAX ( 0x00004000 )
 #define PRINTER_ATTRIBUTE_TS ( 0x00008000 )
 
-/* bitmap spoolss_PrinterStatus */
-#define PRINTER_STATUS_PAUSED ( 0x00000001 )
-#define PRINTER_STATUS_ERROR ( 0x00000002 )
-#define PRINTER_STATUS_PENDING_DELETION ( 0x00000004 )
-#define PRINTER_STATUS_PAPER_JAM ( 0x00000008 )
-#define PRINTER_STATUS_PAPER_OUT ( 0x00000010 )
-#define PRINTER_STATUS_MANUAL_FEED ( 0x00000020 )
-#define PRINTER_STATUS_PAPER_PROBLEM ( 0x00000040 )
-#define PRINTER_STATUS_OFFLINE ( 0x00000080 )
-#define PRINTER_STATUS_IO_ACTIVE ( 0x00000100 )
-#define PRINTER_STATUS_BUSY ( 0x00000200 )
-#define PRINTER_STATUS_PRINTING ( 0x00000400 )
-#define PRINTER_STATUS_OUTPUT_BIN_FULL ( 0x00000800 )
-#define PRINTER_STATUS_NOT_AVAILABLE ( 0x00001000 )
-#define PRINTER_STATUS_WAITING ( 0x00002000 )
-#define PRINTER_STATUS_PROCESSING ( 0x00004000 )
-#define PRINTER_STATUS_INITIALIZING ( 0x00008000 )
-#define PRINTER_STATUS_WARMING_UP ( 0x00010000 )
-#define PRINTER_STATUS_TONER_LOW ( 0x00020000 )
-#define PRINTER_STATUS_NO_TONER ( 0x00040000 )
-#define PRINTER_STATUS_PAGE_PUNT ( 0x00080000 )
-#define PRINTER_STATUS_USER_INTERVENTION ( 0x00100000 )
-#define PRINTER_STATUS_OUT_OF_MEMORY ( 0x00200000 )
-#define PRINTER_STATUS_DOOR_OPEN ( 0x00400000 )
-#define PRINTER_STATUS_SERVER_UNKNOWN ( 0x00800000 )
-#define PRINTER_STATUS_POWER_SAVE ( 0x01000000 )
+struct spoolss_PrinterInfo1 {
+       uint32_t flags;
+       const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,public] */;
 
 struct spoolss_PrinterInfo2 {
        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -201,24 +819,24 @@ struct spoolss_PrinterInfo2 {
        const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        struct security_descriptor *secdesc;/* [relative,subcontext(0)] */
        uint32_t attributes;
-       uint32_t priority;
+       uint32_t priority;/* [range(0,99)] */
        uint32_t defaultpriority;
        uint32_t starttime;
        uint32_t untiltime;
        uint32_t status;
        uint32_t cjobs;
        uint32_t averageppm;
-};
+}/* [gensize,public] */;
 
 struct spoolss_PrinterInfo3 {
        struct security_descriptor *secdesc;/* [relative,subcontext(0)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_PrinterInfo4 {
        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        uint32_t attributes;
-};
+}/* [gensize,public] */;
 
 struct spoolss_PrinterInfo5 {
        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -226,11 +844,11 @@ struct spoolss_PrinterInfo5 {
        uint32_t attributes;
        uint32_t device_not_selected_timeout;
        uint32_t transmission_retry_timeout;
-};
+}/* [gensize,public] */;
 
 struct spoolss_PrinterInfo6 {
        uint32_t status;
-};
+}/* [gensize,public] */;
 
 /* bitmap spoolss_DsPrintAction */
 #define DSPRINT_PUBLISH ( 0x00000001 )
@@ -242,7 +860,7 @@ struct spoolss_PrinterInfo6 {
 struct spoolss_PrinterInfo7 {
        const char * guid;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        uint32_t action;
-};
+}/* [gensize,public] */;
 
 struct spoolss_DeviceModeInfo {
        struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0)] */
@@ -259,7 +877,7 @@ union spoolss_PrinterInfo {
        struct spoolss_PrinterInfo7 info7;/* [case(7)] */
        struct spoolss_DeviceModeInfo info8;/* [case(8)] */
        struct spoolss_DeviceModeInfo info9;/* [case(9)] */
-}/* [relative_base,nodiscriminant,public] */;
+}/* [relative_base,gensize,public,nodiscriminant] */;
 
 struct spoolss_DevmodeContainer {
        uint32_t _ndr_size;/* [value(_ndr_size_spoolss_DeviceMode(devmode,ndr->iconv_convenience,ndr->flags))] */
@@ -275,32 +893,172 @@ struct spoolss_JobInfo1 {
        const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        uint32_t status;
-       uint32_t priority;
+       uint32_t priority;/* [range(0,99)] */
+       uint32_t position;
+       uint32_t total_pages;
+       uint32_t pages_printed;
+       struct spoolss_Time submitted;
+}/* [gensize,public] */;
+
+struct spoolss_JobInfo2 {
+       uint32_t job_id;
+       const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_DeviceMode *devmode;/* [relative] */
+       const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct security_descriptor *secdesc;/* [relative] */
+       uint32_t status;
+       uint32_t priority;/* [range(0,99)] */
+       uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
+       uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
+       uint32_t pages_printed;
+}/* [gensize,public] */;
+
+struct spoolss_JobInfo3 {
+       uint32_t job_id;
+       uint32_t next_job_id;
+       uint32_t reserved;
+}/* [gensize,public] */;
+
+struct spoolss_JobInfo4 {
+       uint32_t job_id;
+       const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_DeviceMode *devmode;/* [relative] */
+       const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct security_descriptor *secdesc;/* [relative] */
+       uint32_t status;
+       uint32_t priority;/* [range(0,99)] */
+       uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
+       uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
+       uint32_t pages_printed;
+       uint32_t size_high;
+}/* [gensize,public] */;
+
+union spoolss_JobInfo {
+       struct spoolss_JobInfo1 info1;/* [case] */
+       struct spoolss_JobInfo2 info2;/* [case(2)] */
+       struct spoolss_JobInfo3 info3;/* [case(3)] */
+       struct spoolss_JobInfo4 info4;/* [case(4)] */
+}/* [relative_base,gensize,public,nodiscriminant] */;
+
+struct spoolss_SetJobInfo1 {
+       uint32_t job_id;
+       const char *printer_name;/* [unique,charset(UTF16)] */
+       const char *server_name;/* [unique,charset(UTF16)] */
+       const char *user_name;/* [unique,charset(UTF16)] */
+       const char *document_name;/* [unique,charset(UTF16)] */
+       const char *data_type;/* [unique,charset(UTF16)] */
+       const char *text_status;/* [unique,charset(UTF16)] */
+       uint32_t status;
+       uint32_t priority;/* [range(0,99)] */
+       uint32_t position;
+       uint32_t total_pages;
+       uint32_t pages_printed;
+       struct spoolss_Time submitted;
+};
+
+struct spoolss_SetJobInfo2 {
+       uint32_t job_id;
+       const char *printer_name;/* [unique,charset(UTF16)] */
+       const char *server_name;/* [unique,charset(UTF16)] */
+       const char *user_name;/* [unique,charset(UTF16)] */
+       const char *document_name;/* [unique,charset(UTF16)] */
+       const char *notify_name;/* [unique,charset(UTF16)] */
+       const char *data_type;/* [unique,charset(UTF16)] */
+       const char *print_processor;/* [unique,charset(UTF16)] */
+       const char *parameters;/* [unique,charset(UTF16)] */
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       uint32_t _devmode_ptr;
+       const char *text_status;/* [unique,charset(UTF16)] */
+       uint32_t _secdesc_ptr;
+       uint32_t status;
+       uint32_t priority;/* [range(0,99)] */
+       uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
+       uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
+       uint32_t pages_printed;
+};
+
+struct spoolss_SetJobInfo4 {
+       uint32_t job_id;
+       const char *printer_name;/* [unique,charset(UTF16)] */
+       const char *server_name;/* [unique,charset(UTF16)] */
+       const char *user_name;/* [unique,charset(UTF16)] */
+       const char *document_name;/* [unique,charset(UTF16)] */
+       const char *notify_name;/* [unique,charset(UTF16)] */
+       const char *data_type;/* [unique,charset(UTF16)] */
+       const char *print_processor;/* [unique,charset(UTF16)] */
+       const char *parameters;/* [unique,charset(UTF16)] */
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       uint32_t _devmode_ptr;
+       const char *text_status;/* [unique,charset(UTF16)] */
+       uint32_t _secdesc_ptr;
+       uint32_t status;
+       uint32_t priority;/* [range(0,99)] */
        uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
        uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
        uint32_t pages_printed;
-       struct spoolss_Time time;
+       uint32_t size_high;
 };
 
-union spoolss_JobInfo {
-       struct spoolss_JobInfo1 info1;/* [case] */
-}/* [relative_base,nodiscriminant,public] */;
+union spoolss_SetJobInfo {
+       struct spoolss_SetJobInfo1 *info1;/* [unique,case] */
+       struct spoolss_SetJobInfo2 *info2;/* [unique,case(2)] */
+       struct spoolss_JobInfo3 *info3;/* [unique,case(3)] */
+       struct spoolss_SetJobInfo4 *info4;/* [unique,case(4)] */
+}/* [public] */;
 
 struct spoolss_JobInfoContainer {
        uint32_t level;
-       union spoolss_JobInfo info;/* [switch_is(level)] */
+       union spoolss_SetJobInfo info;/* [switch_is(level)] */
 };
 
 enum spoolss_JobControl
 #ifndef USE_UINT_ENUMS
  {
-       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_JOB_CONTROL_PAUSE=(int)(1),
+       SPOOLSS_JOB_CONTROL_RESUME=(int)(2),
+       SPOOLSS_JOB_CONTROL_CANCEL=(int)(3),
+       SPOOLSS_JOB_CONTROL_RESTART=(int)(4),
+       SPOOLSS_JOB_CONTROL_DELETE=(int)(5),
+       SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER=(int)(6),
+       SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED=(int)(7),
+       SPOOLSS_JOB_CONTROL_RETAIN=(int)(8),
+       SPOOLSS_JOB_CONTROL_RELEASE=(int)(9)
 }
 #else
  { __donnot_use_enum_spoolss_JobControl=0x7FFFFFFF}
@@ -311,17 +1069,19 @@ enum spoolss_JobControl
 #define SPOOLSS_JOB_CONTROL_DELETE ( 5 )
 #define SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER ( 6 )
 #define SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED ( 7 )
+#define SPOOLSS_JOB_CONTROL_RETAIN ( 8 )
+#define SPOOLSS_JOB_CONTROL_RELEASE ( 9 )
 #endif
 ;
 
 enum spoolss_PrinterControl
 #ifndef USE_UINT_ENUMS
  {
-       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_PRINTER_CONTROL_UNPAUSE=(int)(0),
+       SPOOLSS_PRINTER_CONTROL_PAUSE=(int)(1),
+       SPOOLSS_PRINTER_CONTROL_RESUME=(int)(2),
+       SPOOLSS_PRINTER_CONTROL_PURGE=(int)(3),
+       SPOOLSS_PRINTER_CONTROL_SET_STATUS=(int)(4)
 }
 #else
  { __donnot_use_enum_spoolss_PrinterControl=0x7FFFFFFF}
@@ -333,30 +1093,135 @@ enum spoolss_PrinterControl
 #endif
 ;
 
+struct spoolss_SetPrinterInfo0 {
+       const char *servername;/* [unique,charset(UTF16)] */
+       const char *printername;/* [unique,charset(UTF16)] */
+       uint32_t cjobs;
+       uint32_t total_jobs;
+       uint32_t total_bytes;
+       struct spoolss_Time time;
+       uint32_t global_counter;
+       uint32_t total_pages;
+       uint32_t version;
+       uint32_t free_build;
+       uint32_t spooling;
+       uint32_t max_spooling;
+       uint32_t session_counter;
+       uint32_t num_error_out_of_paper;
+       uint32_t num_error_not_ready;
+       uint32_t job_error;
+       uint32_t number_of_processors;
+       enum spoolss_ProcessorType processor_type;
+       uint32_t high_part_total_bytes;
+       uint32_t change_id;
+       WERROR last_error;
+       uint32_t status;
+       uint32_t enumerate_network_printers;
+       uint32_t c_setprinter;
+       enum spoolss_ProcessorArchitecture processor_architecture;
+       uint16_t processor_level;
+       uint32_t ref_ic;
+       uint32_t reserved2;
+       uint32_t reserved3;
+};
+
+struct spoolss_SetPrinterInfo1 {
+       uint32_t flags;
+       const char *description;/* [unique,charset(UTF16)] */
+       const char *name;/* [unique,charset(UTF16)] */
+       const char *comment;/* [unique,charset(UTF16)] */
+};
+
+struct spoolss_SetPrinterInfo2 {
+       const char *servername;/* [unique,charset(UTF16)] */
+       const char *printername;/* [unique,charset(UTF16)] */
+       const char *sharename;/* [unique,charset(UTF16)] */
+       const char *portname;/* [unique,charset(UTF16)] */
+       const char *drivername;/* [unique,charset(UTF16)] */
+       const char *comment;/* [unique,charset(UTF16)] */
+       const char *location;/* [unique,charset(UTF16)] */
+       struct spoolss_DeviceMode *devmode;/* [unique,subcontext(0)] */
+       const char *sepfile;/* [unique,charset(UTF16)] */
+       const char *printprocessor;/* [unique,charset(UTF16)] */
+       const char *datatype;/* [unique,charset(UTF16)] */
+       const char *parameters;/* [unique,charset(UTF16)] */
+       struct security_descriptor *secdesc;/* [unique,subcontext(0)] */
+       uint32_t attributes;
+       uint32_t priority;/* [range(0,99)] */
+       uint32_t defaultpriority;
+       uint32_t starttime;
+       uint32_t untiltime;
+       uint32_t status;
+       uint32_t cjobs;
+       uint32_t averageppm;
+};
+
+struct spoolss_SetPrinterInfo3 {
+       uint32_t sec_desc_ptr;
+};
+
+struct spoolss_SetPrinterInfo4 {
+       const char *printername;/* [unique,charset(UTF16)] */
+       const char *servername;/* [unique,charset(UTF16)] */
+       uint32_t attributes;
+};
+
+struct spoolss_SetPrinterInfo5 {
+       const char *printername;/* [unique,charset(UTF16)] */
+       const char *portname;/* [unique,charset(UTF16)] */
+       uint32_t attributes;
+       uint32_t device_not_selected_timeout;
+       uint32_t transmission_retry_timeout;
+};
+
+struct spoolss_SetPrinterInfo6 {
+       uint32_t status;
+};
+
+struct spoolss_SetPrinterInfo7 {
+       const char *guid;/* [unique,charset(UTF16)] */
+       uint32_t action;
+};
+
 union spoolss_SetPrinterInfo {
-       struct spoolss_PrinterInfo0 *info0;/* [unique,case(0)] */
-       struct spoolss_PrinterInfo1 *info1;/* [unique,case] */
-       struct spoolss_PrinterInfo2 *info2;/* [unique,case(2)] */
-       struct spoolss_PrinterInfo3 *info3;/* [unique,case(3)] */
-       struct spoolss_PrinterInfo4 *info4;/* [unique,case(4)] */
-       struct spoolss_PrinterInfo5 *info5;/* [unique,case(5)] */
-       struct spoolss_PrinterInfo6 *info6;/* [unique,case(6)] */
-       struct spoolss_PrinterInfo7 *info7;/* [unique,case(7)] */
+       struct spoolss_SetPrinterInfo0 *info0;/* [unique,case(0)] */
+       struct spoolss_SetPrinterInfo1 *info1;/* [unique,case] */
+       struct spoolss_SetPrinterInfo2 *info2;/* [unique,case(2)] */
+       struct spoolss_SetPrinterInfo3 *info3;/* [unique,case(3)] */
+       struct spoolss_SetPrinterInfo4 *info4;/* [unique,case(4)] */
+       struct spoolss_SetPrinterInfo5 *info5;/* [unique,case(5)] */
+       struct spoolss_SetPrinterInfo6 *info6;/* [unique,case(6)] */
+       struct spoolss_SetPrinterInfo7 *info7;/* [unique,case(7)] */
        struct spoolss_DeviceModeInfo *info8;/* [unique,case(8)] */
        struct spoolss_DeviceModeInfo *info9;/* [unique,case(9)] */
 }/* [switch_type(uint32)] */;
 
-struct spoolss_DriverInfo1 {
-       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+struct spoolss_SetPrinterInfoCtr {
+       uint32_t level;
+       union spoolss_SetPrinterInfo info;/* [switch_is(level)] */
+};
+
+struct spoolss_StringArray {
+       uint32_t _ndr_size;/* [value((ndr_size_spoolss_StringArray(r,ndr->iconv_convenience,ndr->flags)-4)/2)] */
+       const char ** string;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [public] */;
+
+struct spoolss_StringArray2 {
+       uint32_t _ndr_size;/* [value((ndr_size_spoolss_StringArray2(r,ndr->iconv_convenience,ndr->flags)-4)/2)] */
+       const char ** string;/* [subcontext_size(_ndr_size*2),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [nopush,public,nopull] */;
+
+struct spoolss_AddDriverInfo1 {
+       const char *driver_name;/* [unique,charset(UTF16)] */
 };
 
 enum spoolss_DriverOSVersion
 #ifndef USE_UINT_ENUMS
  {
-       SPOOLSS_DRIVER_VERSION_9X=0,
-       SPOOLSS_DRIVER_VERSION_NT35=1,
-       SPOOLSS_DRIVER_VERSION_NT4=2,
-       SPOOLSS_DRIVER_VERSION_200X=3
+       SPOOLSS_DRIVER_VERSION_9X=(int)(0),
+       SPOOLSS_DRIVER_VERSION_NT35=(int)(1),
+       SPOOLSS_DRIVER_VERSION_NT4=(int)(2),
+       SPOOLSS_DRIVER_VERSION_200X=(int)(3)
 }
 #else
  { __donnot_use_enum_spoolss_DriverOSVersion=0x7FFFFFFF}
@@ -367,6 +1232,132 @@ enum spoolss_DriverOSVersion
 #endif
 ;
 
+struct spoolss_AddDriverInfo2 {
+       enum spoolss_DriverOSVersion version;
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       const char *architecture;/* [unique,charset(UTF16)] */
+       const char *driver_path;/* [unique,charset(UTF16)] */
+       const char *data_file;/* [unique,charset(UTF16)] */
+       const char *config_file;/* [unique,charset(UTF16)] */
+};
+
+struct spoolss_AddDriverInfo3 {
+       enum spoolss_DriverOSVersion version;
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       const char *architecture;/* [unique,charset(UTF16)] */
+       const char *driver_path;/* [unique,charset(UTF16)] */
+       const char *data_file;/* [unique,charset(UTF16)] */
+       const char *config_file;/* [unique,charset(UTF16)] */
+       const char *help_file;/* [unique,charset(UTF16)] */
+       const char *monitor_name;/* [unique,charset(UTF16)] */
+       const char *default_datatype;/* [unique,charset(UTF16)] */
+       uint32_t _ndr_size_dependent_files;/* [value(((ndr_size_spoolss_StringArray(dependent_files,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *dependent_files;/* [unique] */
+};
+
+struct spoolss_AddDriverInfo4 {
+       enum spoolss_DriverOSVersion version;
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       const char *architecture;/* [unique,charset(UTF16)] */
+       const char *driver_path;/* [unique,charset(UTF16)] */
+       const char *data_file;/* [unique,charset(UTF16)] */
+       const char *config_file;/* [unique,charset(UTF16)] */
+       const char *help_file;/* [unique,charset(UTF16)] */
+       const char *monitor_name;/* [unique,charset(UTF16)] */
+       const char *default_datatype;/* [unique,charset(UTF16)] */
+       uint32_t _ndr_size_dependent_files;/* [value(((ndr_size_spoolss_StringArray(dependent_files,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *dependent_files;/* [unique] */
+       uint32_t _ndr_size_previous_names;/* [value(((ndr_size_spoolss_StringArray(previous_names,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *previous_names;/* [unique] */
+};
+
+/* bitmap spoolss_DriverAttributes */
+#define PRINTER_DRIVER_PACKAGE_AWARE ( 0x00000002 )
+
+struct spoolss_AddDriverInfo5 {
+       enum spoolss_DriverOSVersion version;
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       const char *architecture;/* [unique,charset(UTF16)] */
+       const char *driver_path;/* [unique,charset(UTF16)] */
+       const char *data_file;/* [unique,charset(UTF16)] */
+       const char *config_file;/* [unique,charset(UTF16)] */
+       uint32_t driver_attributes;
+       uint32_t config_version;
+       uint32_t driver_version;
+};
+
+struct spoolss_AddDriverInfo6 {
+       enum spoolss_DriverOSVersion version;
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       const char *architecture;/* [unique,charset(UTF16)] */
+       const char *driver_path;/* [unique,charset(UTF16)] */
+       const char *data_file;/* [unique,charset(UTF16)] */
+       const char *config_file;/* [unique,charset(UTF16)] */
+       const char *help_file;/* [unique,charset(UTF16)] */
+       const char *monitor_name;/* [unique,charset(UTF16)] */
+       const char *default_datatype;/* [unique,charset(UTF16)] */
+       uint32_t _ndr_size_dependent_files;/* [value(((ndr_size_spoolss_StringArray(dependent_files,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *dependent_files;/* [unique] */
+       uint32_t _ndr_size_previous_names;/* [value(((ndr_size_spoolss_StringArray(previous_names,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *previous_names;/* [unique] */
+       NTTIME driver_date;
+       uint64_t driver_version;
+       const char *manufacturer_name;/* [unique,charset(UTF16)] */
+       const char *manufacturer_url;/* [unique,charset(UTF16)] */
+       const char *hardware_id;/* [unique,charset(UTF16)] */
+       const char *provider;/* [unique,charset(UTF16)] */
+};
+
+struct spoolss_AddDriverInfo8 {
+       enum spoolss_DriverOSVersion version;
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       const char *architecture;/* [unique,charset(UTF16)] */
+       const char *driver_path;/* [unique,charset(UTF16)] */
+       const char *data_file;/* [unique,charset(UTF16)] */
+       const char *config_file;/* [unique,charset(UTF16)] */
+       const char *help_file;/* [unique,charset(UTF16)] */
+       const char *monitor_name;/* [unique,charset(UTF16)] */
+       const char *default_datatype;/* [unique,charset(UTF16)] */
+       uint32_t _ndr_size_dependent_files;/* [value(((ndr_size_spoolss_StringArray(dependent_files,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *dependent_files;/* [unique] */
+       uint32_t _ndr_size_previous_names;/* [value(((ndr_size_spoolss_StringArray(previous_names,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *previous_names;/* [unique] */
+       NTTIME driver_date;
+       uint64_t driver_version;
+       const char *manufacturer_name;/* [unique,charset(UTF16)] */
+       const char *manufacturer_url;/* [unique,charset(UTF16)] */
+       const char *hardware_id;/* [unique,charset(UTF16)] */
+       const char *provider;/* [unique,charset(UTF16)] */
+       const char *print_processor;/* [unique,charset(UTF16)] */
+       const char *vendor_setup;/* [unique,charset(UTF16)] */
+       uint32_t _ndr_size_color_profiles;/* [value(((ndr_size_spoolss_StringArray(color_profiles,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *color_profiles;/* [unique] */
+       const char *inf_path;/* [unique,charset(UTF16)] */
+       uint32_t printer_driver_attributes;
+       uint32_t _ndr_size_core_driver_dependencies;/* [value(((ndr_size_spoolss_StringArray(core_driver_dependencies,ndr->iconv_convenience,ndr->flags)-4)/2))] */
+       struct spoolss_StringArray *core_driver_dependencies;/* [unique] */
+       NTTIME min_inbox_driver_ver_date;
+       uint64_t min_inbox_driver_ver_version;
+};
+
+union spoolss_AddDriverInfo {
+       struct spoolss_AddDriverInfo1 *info1;/* [unique,case] */
+       struct spoolss_AddDriverInfo2 *info2;/* [unique,case(2)] */
+       struct spoolss_AddDriverInfo3 *info3;/* [unique,case(3)] */
+       struct spoolss_AddDriverInfo4 *info4;/* [unique,case(4)] */
+       struct spoolss_AddDriverInfo6 *info6;/* [unique,case(6)] */
+       struct spoolss_AddDriverInfo8 *info8;/* [unique,case(8)] */
+}/* [switch_type(uint32)] */;
+
+struct spoolss_AddDriverInfoCtr {
+       uint32_t level;
+       union spoolss_AddDriverInfo info;/* [switch_is(level)] */
+};
+
+struct spoolss_DriverInfo1 {
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,public] */;
+
 struct spoolss_DriverInfo2 {
        enum spoolss_DriverOSVersion version;
        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -374,7 +1365,7 @@ struct spoolss_DriverInfo2 {
        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo3 {
        enum spoolss_DriverOSVersion version;
@@ -387,7 +1378,7 @@ struct spoolss_DriverInfo3 {
        const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo4 {
        enum spoolss_DriverOSVersion version;
@@ -401,7 +1392,7 @@ struct spoolss_DriverInfo4 {
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo5 {
        enum spoolss_DriverOSVersion version;
@@ -413,7 +1404,7 @@ struct spoolss_DriverInfo5 {
        uint32_t driver_attributes;
        uint32_t config_version;
        uint32_t driver_version;
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo6 {
        enum spoolss_DriverOSVersion version;
@@ -427,13 +1418,83 @@ struct spoolss_DriverInfo6 {
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       NTTIME driver_data;
+       NTTIME driver_date;
        uint64_t driver_version;
        const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
+
+struct spoolss_DriverInfo8 {
+       enum spoolss_DriverOSVersion version;
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       NTTIME driver_date;
+       uint64_t driver_version;
+       const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * vendor_setup;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char ** color_profiles;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * inf_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t printer_driver_attributes;
+       const char ** core_driver_dependencies;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       NTTIME min_inbox_driver_ver_date;
+       uint64_t min_inbox_driver_ver_version;
+}/* [gensize,public] */;
+
+enum spoolss_DriverFileType
+#ifndef USE_UINT_ENUMS
+ {
+       SPOOLSS_DRIVER_FILE_TYPE_RENDERING=(int)(0x00000000),
+       SPOOLSS_DRIVER_FILE_TYPE_CONFIGURATION=(int)(0x00000001),
+       SPOOLSS_DRIVER_FILE_TYPE_DATA=(int)(0x00000002),
+       SPOOLSS_DRIVER_FILE_TYPE_HELP=(int)(0x00000003),
+       SPOOLSS_DRIVER_FILE_TYPE_OTHER=(int)(0x00000004)
+}
+#else
+ { __donnot_use_enum_spoolss_DriverFileType=0x7FFFFFFF}
+#define SPOOLSS_DRIVER_FILE_TYPE_RENDERING ( 0x00000000 )
+#define SPOOLSS_DRIVER_FILE_TYPE_CONFIGURATION ( 0x00000001 )
+#define SPOOLSS_DRIVER_FILE_TYPE_DATA ( 0x00000002 )
+#define SPOOLSS_DRIVER_FILE_TYPE_HELP ( 0x00000003 )
+#define SPOOLSS_DRIVER_FILE_TYPE_OTHER ( 0x00000004 )
+#endif
+;
+
+struct spoolss_DriverFileInfo {
+       const char * file_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       enum spoolss_DriverFileType file_type;
+       uint32_t file_version;
+}/* [public] */;
+
+struct spoolss_DriverInfo101 {
+       enum spoolss_DriverOSVersion version;
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_DriverFileInfo *file_info;/* [relative,size_is(file_count)] */
+       uint32_t file_count;
+       const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       NTTIME driver_date;
+       uint64_t driver_version;
+       const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,nopush,public,nopull] */;
 
 union spoolss_DriverInfo {
        struct spoolss_DriverInfo1 info1;/* [case] */
@@ -442,11 +1503,13 @@ union spoolss_DriverInfo {
        struct spoolss_DriverInfo4 info4;/* [case(4)] */
        struct spoolss_DriverInfo5 info5;/* [case(5)] */
        struct spoolss_DriverInfo6 info6;/* [case(6)] */
-}/* [relative_base,nodiscriminant,public] */;
+       struct spoolss_DriverInfo8 info8;/* [case(8)] */
+       struct spoolss_DriverInfo101 info101;/* [case(101)] */
+}/* [relative_base,gensize,public,nodiscriminant] */;
 
 struct spoolss_DriverDirectoryInfo1 {
        const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 union spoolss_DriverDirectoryInfo {
        struct spoolss_DriverDirectoryInfo1 info1;/* [case] */
@@ -454,12 +1517,20 @@ union spoolss_DriverDirectoryInfo {
 
 struct spoolss_PrintProcessorInfo1 {
        const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 union spoolss_PrintProcessorInfo {
        struct spoolss_PrintProcessorInfo1 info1;/* [case] */
 }/* [relative_base,nodiscriminant,public] */;
 
+struct spoolss_PrintProcessorDirectoryInfo1 {
+       const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,public] */;
+
+union spoolss_PrintProcessorDirectoryInfo {
+       struct spoolss_PrintProcessorDirectoryInfo1 info1;/* [case] */
+}/* [gensize,relative_base,nodiscriminant,public] */;
+
 struct spoolss_DocumentInfo1 {
        const char *document_name;/* [unique,charset(UTF16)] */
        const char *output_file;/* [unique,charset(UTF16)] */
@@ -475,7 +1546,7 @@ struct spoolss_OSVersion {
        uint32_t major;
        uint32_t minor;
        uint32_t build;
-       uint32_t unknown;/* [value(2)] */
+       uint32_t platform_id;/* [value(2)] */
        const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */
 }/* [gensize,public] */;
 
@@ -484,45 +1555,29 @@ struct spoolss_OSVersionEx {
        uint32_t major;
        uint32_t minor;
        uint32_t build;
-       uint32_t unknown1;/* [value(2)] */
+       uint32_t platform_id;/* [value(2)] */
        const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       uint32_t unknown2;
-       uint32_t unknown3;
+       uint16_t service_pack_major;
+       uint16_t service_pack_minor;
+       uint16_t suite_mask;
+       uint8_t product_type;
+       uint8_t reserved;
 }/* [gensize,public] */;
 
-enum spoolss_PrinterDataType
-#ifndef USE_UINT_ENUMS
- {
-       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
-}
-#else
- { __donnot_use_enum_spoolss_PrinterDataType=0x7FFFFFFF}
-#define SPOOLSS_PRINTER_DATA_TYPE_NULL ( 0 )
-#define SPOOLSS_PRINTER_DATA_TYPE_STRING ( 1 )
-#define SPOOLSS_PRINTER_DATA_TYPE_BINARY ( 3 )
-#define SPOOLSS_PRINTER_DATA_TYPE_UINT32 ( 4 )
-#define SPOOLSS_PRINTER_DATA_TYPE_STRING_ARRAY ( 7 )
-#endif
-;
-
 union spoolss_PrinterData {
-       const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(SPOOLSS_PRINTER_DATA_TYPE_STRING)] */
-       DATA_BLOB binary;/* [flag(LIBNDR_FLAG_REMAINING),case(SPOOLSS_PRINTER_DATA_TYPE_BINARY)] */
-       uint32_t value;/* [case(SPOOLSS_PRINTER_DATA_TYPE_UINT32)] */
-       const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(SPOOLSS_PRINTER_DATA_TYPE_STRING_ARRAY)] */
+       const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_SZ)] */
+       DATA_BLOB binary;/* [flag(LIBNDR_FLAG_REMAINING),case(REG_BINARY)] */
+       uint32_t value;/* [case(REG_DWORD)] */
+       const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_MULTI_SZ)] */
        DATA_BLOB data;/* [flag(LIBNDR_FLAG_REMAINING),default] */
 }/* [gensize,public,nodiscriminant] */;
 
 enum spoolss_FormFlags
 #ifndef USE_UINT_ENUMS
  {
-       SPOOLSS_FORM_USER=0,
-       SPOOLSS_FORM_BUILTIN=1,
-       SPOOLSS_FORM_PRINTER=2
+       SPOOLSS_FORM_USER=(int)(0),
+       SPOOLSS_FORM_BUILTIN=(int)(1),
+       SPOOLSS_FORM_PRINTER=(int)(2)
 }
 #else
  { __donnot_use_enum_spoolss_FormFlags=0x7FFFFFFF}
@@ -549,10 +1604,29 @@ struct spoolss_FormInfo1 {
        const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        struct spoolss_FormSize size;
        struct spoolss_FormArea area;
-};
+}/* [gensize,public] */;
+
+/* bitmap spoolss_FormStringType */
+#define SPOOLSS_FORM_STRING_TYPE_NONE ( 0x00000001 )
+#define SPOOLSS_FORM_STRING_TYPE_MUI_DLL ( 0x00000002 )
+#define SPOOLSS_FORM_STRING_TYPE_LANG_PAIR ( 0x00000004 )
+
+struct spoolss_FormInfo2 {
+       enum spoolss_FormFlags flags;
+       const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_FormSize size;
+       struct spoolss_FormArea area;
+       const char * keyword;/* [relative,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t string_type;
+       const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t ressource_id;
+       const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t lang_id;
+}/* [gensize,public] */;
 
 union spoolss_FormInfo {
        struct spoolss_FormInfo1 info1;/* [case] */
+       struct spoolss_FormInfo2 info2;/* [case(2)] */
 }/* [relative_base,gensize,public,nodiscriminant] */;
 
 struct spoolss_AddFormInfo1 {
@@ -562,13 +1636,27 @@ struct spoolss_AddFormInfo1 {
        struct spoolss_FormArea area;
 };
 
+struct spoolss_AddFormInfo2 {
+       enum spoolss_FormFlags flags;
+       const char *form_name;/* [unique,charset(UTF16)] */
+       struct spoolss_FormSize size;
+       struct spoolss_FormArea area;
+       const char *keyword;/* [unique,charset(DOS)] */
+       uint32_t string_type;
+       const char *mui_dll;/* [unique,charset(UTF16)] */
+       uint32_t ressource_id;
+       const char *display_name;/* [unique,charset(UTF16)] */
+       uint32_t lang_id;
+};
+
 union spoolss_AddFormInfo {
        struct spoolss_AddFormInfo1 *info1;/* [unique,case] */
+       struct spoolss_AddFormInfo2 *info2;/* [unique,case(2)] */
 }/* [switch_type(uint32)] */;
 
 struct spoolss_PortInfo1 {
        const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 /* bitmap spoolss_PortType */
 #define SPOOLSS_PORT_TYPE_WRITE ( 0x00000001 )
@@ -582,28 +1670,99 @@ struct spoolss_PortInfo2 {
        const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        uint32_t port_type;
        uint32_t reserved;
-};
+}/* [gensize,public] */;
+
+enum spoolss_PortStatus
+#ifndef USE_UINT_ENUMS
+ {
+       PORT_STATUS_CLEAR=(int)(0x00000000),
+       PORT_STATUS_OFFLINE=(int)(0x00000001),
+       PORT_STATUS_PAPER_JAM=(int)(0x00000002),
+       PORT_STATUS_PAPER_OUT=(int)(0x00000003),
+       PORT_STATUS_OUTPUT_BIN_FULL=(int)(0x00000004),
+       PORT_STATUS_PAPER_PROBLEM=(int)(0x00000005),
+       PORT_STATUS_NO_TONER=(int)(0x00000006),
+       PORT_STATUS_DOOR_OPEN=(int)(0x00000007),
+       PORT_STATUS_USER_INTERVENTION=(int)(0x00000008),
+       PORT_STATUS_OUT_OF_MEMORY=(int)(0x00000009),
+       PORT_STATUS_TONER_LOW=(int)(0x0000000A),
+       PORT_STATUS_WARMING_UP=(int)(0x0000000B),
+       PORT_STATUS_POWER_SAVE=(int)(0x0000000C)
+}
+#else
+ { __donnot_use_enum_spoolss_PortStatus=0x7FFFFFFF}
+#define PORT_STATUS_CLEAR ( 0x00000000 )
+#define PORT_STATUS_OFFLINE ( 0x00000001 )
+#define PORT_STATUS_PAPER_JAM ( 0x00000002 )
+#define PORT_STATUS_PAPER_OUT ( 0x00000003 )
+#define PORT_STATUS_OUTPUT_BIN_FULL ( 0x00000004 )
+#define PORT_STATUS_PAPER_PROBLEM ( 0x00000005 )
+#define PORT_STATUS_NO_TONER ( 0x00000006 )
+#define PORT_STATUS_DOOR_OPEN ( 0x00000007 )
+#define PORT_STATUS_USER_INTERVENTION ( 0x00000008 )
+#define PORT_STATUS_OUT_OF_MEMORY ( 0x00000009 )
+#define PORT_STATUS_TONER_LOW ( 0x0000000A )
+#define PORT_STATUS_WARMING_UP ( 0x0000000B )
+#define PORT_STATUS_POWER_SAVE ( 0x0000000C )
+#endif
+;
+
+enum spoolss_PortSeverity
+#ifndef USE_UINT_ENUMS
+ {
+       PORT_STATUS_TYPE_ERROR=(int)(0x00000001),
+       PORT_STATUS_TYPE_WARNING=(int)(0x00000002),
+       PORT_STATUS_TYPE_INFO=(int)(0x00000003)
+}
+#else
+ { __donnot_use_enum_spoolss_PortSeverity=0x7FFFFFFF}
+#define PORT_STATUS_TYPE_ERROR ( 0x00000001 )
+#define PORT_STATUS_TYPE_WARNING ( 0x00000002 )
+#define PORT_STATUS_TYPE_INFO ( 0x00000003 )
+#endif
+;
+
+struct spoolss_PortInfo3 {
+       enum spoolss_PortStatus status;
+       const char * status_string;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       enum spoolss_PortSeverity severity;
+}/* [gensize,public] */;
+
+struct spoolss_PortInfoFF {
+       const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       DATA_BLOB monitor_data;
+}/* [gensize,public] */;
 
 union spoolss_PortInfo {
        struct spoolss_PortInfo1 info1;/* [case] */
        struct spoolss_PortInfo2 info2;/* [case(2)] */
+       struct spoolss_PortInfo3 info3;/* [case(3)] */
+       struct spoolss_PortInfoFF infoFF;/* [case(0xff)] */
 }/* [relative_base,nodiscriminant,public] */;
 
 struct spoolss_MonitorInfo1 {
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_MonitorInfo2 {
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * environment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * dll_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 union spoolss_MonitorInfo {
        struct spoolss_MonitorInfo1 info1;/* [case] */
        struct spoolss_MonitorInfo2 info2;/* [case(2)] */
 }/* [relative_base,nodiscriminant,public] */;
 
+struct spoolss_PrintProcDataTypesInfo1 {
+       const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,public] */;
+
+union spoolss_PrintProcDataTypesInfo {
+       struct spoolss_PrintProcDataTypesInfo1 info1;/* [case] */
+}/* [relative_base,nodiscriminant,public] */;
+
 /* bitmap spoolss_PrinterChangeFlags */
 #define PRINTER_CHANGE_ADD_PRINTER ( 0x00000001 )
 #define PRINTER_CHANGE_SET_PRINTER ( 0x00000002 )
@@ -621,154 +1780,262 @@ union spoolss_MonitorInfo {
 #define PRINTER_CHANGE_DELETE_PORT ( 0x00400000 )
 #define PRINTER_CHANGE_ADD_PRINT_PROCESSOR ( 0x01000000 )
 #define PRINTER_CHANGE_DELETE_PRINT_PROCESSOR ( 0x04000000 )
+#define PRINTER_CHANGE_SERVER ( 0x08000000 )
 #define PRINTER_CHANGE_ADD_PRINTER_DRIVER ( 0x10000000 )
 #define PRINTER_CHANGE_SET_PRINTER_DRIVER ( 0x20000000 )
 #define PRINTER_CHANGE_DELETE_PRINTER_DRIVER ( 0x40000000 )
 #define PRINTER_CHANGE_TIMEOUT ( 0x80000000 )
 
-enum spoolss_Field
+enum spoolss_JobNotifyField
+#ifndef USE_UINT_ENUMS
+ {
+       JOB_NOTIFY_FIELD_PRINTER_NAME=(int)(0x00),
+       JOB_NOTIFY_FIELD_MACHINE_NAME=(int)(0x01),
+       JOB_NOTIFY_FIELD_PORT_NAME=(int)(0x02),
+       JOB_NOTIFY_FIELD_USER_NAME=(int)(0x03),
+       JOB_NOTIFY_FIELD_NOTIFY_NAME=(int)(0x04),
+       JOB_NOTIFY_FIELD_DATATYPE=(int)(0x05),
+       JOB_NOTIFY_FIELD_PRINT_PROCESSOR=(int)(0x06),
+       JOB_NOTIFY_FIELD_PARAMETERS=(int)(0x07),
+       JOB_NOTIFY_FIELD_DRIVER_NAME=(int)(0x08),
+       JOB_NOTIFY_FIELD_DEVMODE=(int)(0x09),
+       JOB_NOTIFY_FIELD_STATUS=(int)(0x0a),
+       JOB_NOTIFY_FIELD_STATUS_STRING=(int)(0x0b),
+       JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR=(int)(0x0c),
+       JOB_NOTIFY_FIELD_DOCUMENT=(int)(0x0d),
+       JOB_NOTIFY_FIELD_PRIORITY=(int)(0x0e),
+       JOB_NOTIFY_FIELD_POSITION=(int)(0x0f),
+       JOB_NOTIFY_FIELD_SUBMITTED=(int)(0x10),
+       JOB_NOTIFY_FIELD_START_TIME=(int)(0x11),
+       JOB_NOTIFY_FIELD_UNTIL_TIME=(int)(0x12),
+       JOB_NOTIFY_FIELD_TIME=(int)(0x13),
+       JOB_NOTIFY_FIELD_TOTAL_PAGES=(int)(0x14),
+       JOB_NOTIFY_FIELD_PAGES_PRINTED=(int)(0x15),
+       JOB_NOTIFY_FIELD_TOTAL_BYTES=(int)(0x16),
+       JOB_NOTIFY_FIELD_BYTES_PRINTED=(int)(0x17)
+}
+#else
+ { __donnot_use_enum_spoolss_JobNotifyField=0x7FFFFFFF}
+#define JOB_NOTIFY_FIELD_PRINTER_NAME ( 0x00 )
+#define JOB_NOTIFY_FIELD_MACHINE_NAME ( 0x01 )
+#define JOB_NOTIFY_FIELD_PORT_NAME ( 0x02 )
+#define JOB_NOTIFY_FIELD_USER_NAME ( 0x03 )
+#define JOB_NOTIFY_FIELD_NOTIFY_NAME ( 0x04 )
+#define JOB_NOTIFY_FIELD_DATATYPE ( 0x05 )
+#define JOB_NOTIFY_FIELD_PRINT_PROCESSOR ( 0x06 )
+#define JOB_NOTIFY_FIELD_PARAMETERS ( 0x07 )
+#define JOB_NOTIFY_FIELD_DRIVER_NAME ( 0x08 )
+#define JOB_NOTIFY_FIELD_DEVMODE ( 0x09 )
+#define JOB_NOTIFY_FIELD_STATUS ( 0x0a )
+#define JOB_NOTIFY_FIELD_STATUS_STRING ( 0x0b )
+#define JOB_NOTIFY_FIELD_SECURITY_DESCRIPTOR ( 0x0c )
+#define JOB_NOTIFY_FIELD_DOCUMENT ( 0x0d )
+#define JOB_NOTIFY_FIELD_PRIORITY ( 0x0e )
+#define JOB_NOTIFY_FIELD_POSITION ( 0x0f )
+#define JOB_NOTIFY_FIELD_SUBMITTED ( 0x10 )
+#define JOB_NOTIFY_FIELD_START_TIME ( 0x11 )
+#define JOB_NOTIFY_FIELD_UNTIL_TIME ( 0x12 )
+#define JOB_NOTIFY_FIELD_TIME ( 0x13 )
+#define JOB_NOTIFY_FIELD_TOTAL_PAGES ( 0x14 )
+#define JOB_NOTIFY_FIELD_PAGES_PRINTED ( 0x15 )
+#define JOB_NOTIFY_FIELD_TOTAL_BYTES ( 0x16 )
+#define JOB_NOTIFY_FIELD_BYTES_PRINTED ( 0x17 )
+#endif
+;
+
+enum spoolss_PrintNotifyField
 #ifndef USE_UINT_ENUMS
  {
-       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
+       PRINTER_NOTIFY_FIELD_SERVER_NAME=(int)(0x00),
+       PRINTER_NOTIFY_FIELD_PRINTER_NAME=(int)(0x01),
+       PRINTER_NOTIFY_FIELD_SHARE_NAME=(int)(0x02),
+       PRINTER_NOTIFY_FIELD_PORT_NAME=(int)(0x03),
+       PRINTER_NOTIFY_FIELD_DRIVER_NAME=(int)(0x04),
+       PRINTER_NOTIFY_FIELD_COMMENT=(int)(0x05),
+       PRINTER_NOTIFY_FIELD_LOCATION=(int)(0x06),
+       PRINTER_NOTIFY_FIELD_DEVMODE=(int)(0x07),
+       PRINTER_NOTIFY_FIELD_SEPFILE=(int)(0x08),
+       PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR=(int)(0x09),
+       PRINTER_NOTIFY_FIELD_PARAMETERS=(int)(0x0a),
+       PRINTER_NOTIFY_FIELD_DATATYPE=(int)(0x0b),
+       PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR=(int)(0x0c),
+       PRINTER_NOTIFY_FIELD_ATTRIBUTES=(int)(0x0d),
+       PRINTER_NOTIFY_FIELD_PRIORITY=(int)(0x0e),
+       PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY=(int)(0x0f),
+       PRINTER_NOTIFY_FIELD_START_TIME=(int)(0x10),
+       PRINTER_NOTIFY_FIELD_UNTIL_TIME=(int)(0x11),
+       PRINTER_NOTIFY_FIELD_STATUS=(int)(0x12),
+       PRINTER_NOTIFY_FIELD_STATUS_STRING=(int)(0x13),
+       PRINTER_NOTIFY_FIELD_CJOBS=(int)(0x14),
+       PRINTER_NOTIFY_FIELD_AVERAGE_PPM=(int)(0x15),
+       PRINTER_NOTIFY_FIELD_TOTAL_PAGES=(int)(0x16),
+       PRINTER_NOTIFY_FIELD_PAGES_PRINTED=(int)(0x17),
+       PRINTER_NOTIFY_FIELD_TOTAL_BYTES=(int)(0x18),
+       PRINTER_NOTIFY_FIELD_BYTES_PRINTED=(int)(0x19),
+       PRINTER_NOTIFY_FIELD_OBJECT_GUID=(int)(0x1a),
+       PRINTER_NOTIFY_FIELD_FRIENDLY_NAME=(int)(0x1b)
 }
 #else
- { __donnot_use_enum_spoolss_Field=0x7FFFFFFF}
-#define SPOOLSS_FIELD_SERVER_NAME ( 0 )
-#define SPOOLSS_FIELD_PRINTER_NAME ( 1 )
-#define SPOOLSS_FIELD_SHARE_NAME ( 2 )
-#define SPOOLSS_FIELD_PORT_NAME ( 3 )
-#define SPOOLSS_FIELD_DRIVER_NAME ( 4 )
-#define SPOOLSS_FIELD_COMMENT ( 5 )
-#define SPOOLSS_FIELD_LOCATION ( 6 )
-#define SPOOLSS_FIELD_DEVMODE ( 7 )
-#define SPOOLSS_FIELD_SEPFILE ( 8 )
-#define SPOOLSS_FIELD_PRINT_PROCESSOR ( 9 )
-#define SPOOLSS_FIELD_PARAMETERS ( 10 )
-#define SPOOLSS_FIELD_DATATYPE ( 11 )
-#define SPOOLSS_FIELD_SECURITY_DESCRIPTOR ( 12 )
-#define SPOOLSS_FIELD_ATTRIBUTES ( 13 )
-#define SPOOLSS_FIELD_PRIORITY ( 14 )
-#define SPOOLSS_FIELD_DEFAULT_PRIORITY ( 15 )
-#define SPOOLSS_FIELD_START_TIME ( 16 )
-#define SPOOLSS_FIELD_UNTIL_TIME ( 17 )
-#define SPOOLSS_FIELD_STATUS ( 18 )
-#define SPOOLSS_FIELD_STATUS_STRING ( 19 )
-#define SPOOLSS_FIELD_CJOBS ( 20 )
-#define SPOOLSS_FIELD_AVERAGE_PPM ( 21 )
-#define SPOOLSS_FIELD_TOTAL_PAGES ( 22 )
-#define SPOOLSS_FIELD_PAGES_PRINTED ( 23 )
-#define SPOOLSS_FIELD_TOTAL_BYTES ( 24 )
-#define SPOOLSS_FIELD_BYTES_PRINTED ( 25 )
+ { __donnot_use_enum_spoolss_PrintNotifyField=0x7FFFFFFF}
+#define PRINTER_NOTIFY_FIELD_SERVER_NAME ( 0x00 )
+#define PRINTER_NOTIFY_FIELD_PRINTER_NAME ( 0x01 )
+#define PRINTER_NOTIFY_FIELD_SHARE_NAME ( 0x02 )
+#define PRINTER_NOTIFY_FIELD_PORT_NAME ( 0x03 )
+#define PRINTER_NOTIFY_FIELD_DRIVER_NAME ( 0x04 )
+#define PRINTER_NOTIFY_FIELD_COMMENT ( 0x05 )
+#define PRINTER_NOTIFY_FIELD_LOCATION ( 0x06 )
+#define PRINTER_NOTIFY_FIELD_DEVMODE ( 0x07 )
+#define PRINTER_NOTIFY_FIELD_SEPFILE ( 0x08 )
+#define PRINTER_NOTIFY_FIELD_PRINT_PROCESSOR ( 0x09 )
+#define PRINTER_NOTIFY_FIELD_PARAMETERS ( 0x0a )
+#define PRINTER_NOTIFY_FIELD_DATATYPE ( 0x0b )
+#define PRINTER_NOTIFY_FIELD_SECURITY_DESCRIPTOR ( 0x0c )
+#define PRINTER_NOTIFY_FIELD_ATTRIBUTES ( 0x0d )
+#define PRINTER_NOTIFY_FIELD_PRIORITY ( 0x0e )
+#define PRINTER_NOTIFY_FIELD_DEFAULT_PRIORITY ( 0x0f )
+#define PRINTER_NOTIFY_FIELD_START_TIME ( 0x10 )
+#define PRINTER_NOTIFY_FIELD_UNTIL_TIME ( 0x11 )
+#define PRINTER_NOTIFY_FIELD_STATUS ( 0x12 )
+#define PRINTER_NOTIFY_FIELD_STATUS_STRING ( 0x13 )
+#define PRINTER_NOTIFY_FIELD_CJOBS ( 0x14 )
+#define PRINTER_NOTIFY_FIELD_AVERAGE_PPM ( 0x15 )
+#define PRINTER_NOTIFY_FIELD_TOTAL_PAGES ( 0x16 )
+#define PRINTER_NOTIFY_FIELD_PAGES_PRINTED ( 0x17 )
+#define PRINTER_NOTIFY_FIELD_TOTAL_BYTES ( 0x18 )
+#define PRINTER_NOTIFY_FIELD_BYTES_PRINTED ( 0x19 )
+#define PRINTER_NOTIFY_FIELD_OBJECT_GUID ( 0x1a )
+#define PRINTER_NOTIFY_FIELD_FRIENDLY_NAME ( 0x1b )
 #endif
 ;
 
 enum spoolss_NotifyType
 #ifndef USE_UINT_ENUMS
  {
-       SPOOLSS_NOTIFY_PRINTER=0,
-       SPOOLSS_NOTIFY_JOB=1
+       PRINTER_NOTIFY_TYPE=(int)(0x00),
+       JOB_NOTIFY_TYPE=(int)(0x01)
 }
 #else
  { __donnot_use_enum_spoolss_NotifyType=0x7FFFFFFF}
-#define SPOOLSS_NOTIFY_PRINTER ( 0 )
-#define SPOOLSS_NOTIFY_JOB ( 1 )
+#define PRINTER_NOTIFY_TYPE ( 0x00 )
+#define JOB_NOTIFY_TYPE ( 0x01 )
 #endif
 ;
 
-struct spoolss_NotifyOptionsArray {
+union spoolss_Field {
+       uint16_t field;/* [case(PRINTER_NOTIFY_TYPE)] */
+}/* [noprint,nodiscriminant] */;
+
+struct spoolss_NotifyOptionType {
        enum spoolss_NotifyType type;
        uint16_t u1;
        uint32_t u2;
        uint32_t u3;
        uint32_t count;
-       enum spoolss_Field *fields;/* [unique,size_is(count)] */
+       union spoolss_Field *fields;/* [unique,switch_is(type),size_is(count)] */
 };
 
-struct spoolss_NotifyOptionsContainer {
-       uint32_t version;
+/* bitmap spoolssNotifyOptionFlags */
+#define PRINTER_NOTIFY_OPTIONS_REFRESH ( 0x00000001 )
+
+struct spoolss_NotifyOption {
+       uint32_t version;/* [value(2)] */
        uint32_t flags;
        uint32_t count;
-       struct spoolss_NotifyOptionsArray *options;/* [unique,size_is(count)] */
+       struct spoolss_NotifyOptionType *types;/* [unique,size_is(count)] */
 };
 
-struct spoolss_NotifyUTF16String {
+struct spoolss_NotifyString {
        uint32_t size;
        const char *string;/* [unique,charset(UTF16),size_is(size/2)] */
 };
 
-struct spoolss_NotifyDOSString {
-       uint32_t size;
-       const char *string;/* [unique,charset(DOS),size_is(size)] */
-};
-
-struct spoolss_NotifyBlobData {
-       uint16_t data[8];
-};
-
-struct spoolss_NotifyBlob {
-       uint32_t len;
-       struct spoolss_NotifyBlobData *data;/* [unique] */
-};
+enum spoolss_NotifyTable
+#ifndef USE_UINT_ENUMS
+ {
+       NOTIFY_TABLE_DWORD=(int)(0x0001),
+       NOTIFY_TABLE_STRING=(int)(0x0002),
+       NOTIFY_TABLE_DEVMODE=(int)(0x0003),
+       NOTIFY_TABLE_TIME=(int)(0x0004),
+       NOTIFY_TABLE_SECURITYDESCRIPTOR=(int)(0x0005)
+}
+#else
+ { __donnot_use_enum_spoolss_NotifyTable=0x7FFFFFFF}
+#define NOTIFY_TABLE_DWORD ( 0x0001 )
+#define NOTIFY_TABLE_STRING ( 0x0002 )
+#define NOTIFY_TABLE_DEVMODE ( 0x0003 )
+#define NOTIFY_TABLE_TIME ( 0x0004 )
+#define NOTIFY_TABLE_SECURITYDESCRIPTOR ( 0x0005 )
+#endif
+;
 
 union spoolss_NotifyData {
-       int64_t integer;/* [case] */
-       struct spoolss_NotifyUTF16String utf16_string;/* [case(2)] */
-       struct spoolss_NotifyDOSString ascii_string;/* [case(3)] */
-       struct spoolss_NotifyBlob blob;/* [case(4)] */
+       uint32_t integer[2];/* [case] */
+       struct spoolss_NotifyString string;/* [case(2)] */
+       struct spoolss_DevmodeContainer devmode;/* [case(3)] */
+       struct spoolss_TimeCtr time;/* [case(4)] */
+       struct sec_desc_buf sd;/* [case(5)] */
 }/* [switch_type(uint32)] */;
 
 struct spoolss_Notify {
        enum spoolss_NotifyType type;
-       enum spoolss_Field field;
-       uint32_t variable_type;
+       union spoolss_Field field;/* [switch_is(type)] */
+       enum spoolss_NotifyTable variable_type;
        uint32_t job_id;
        union spoolss_NotifyData data;/* [switch_is(variable_type)] */
 };
 
 struct spoolss_NotifyInfo {
-       uint32_t version;
+       uint32_t version;/* [value(2)] */
        uint32_t flags;
        uint32_t count;
        struct spoolss_Notify *notifies;/* [size_is(count)] */
 };
 
+union spoolss_ReplyPrinterInfo {
+       struct spoolss_NotifyInfo *info0;/* [unique,case(0)] */
+}/* [switch_type(uint32)] */;
+
+/* bitmap spoolss_PrinterNotifyFlags */
+#define PRINTER_NOTIFY_INFO_DISCARDED ( 0x00000001 )
+#define PRINTER_NOTIFY_INFO_DISCARDNOTED ( 0x00010000 )
+#define PRINTER_NOTIFY_INFO_COLOR_MISMATCH ( 0x00080000 )
+
 struct spoolss_UserLevel1 {
        uint32_t size;
        const char *client;/* [unique,charset(UTF16)] */
        const char *user;/* [unique,charset(UTF16)] */
        uint32_t build;
-       uint32_t major;
-       uint32_t minor;
-       uint32_t processor;
+       enum spoolss_MajorVersion major;
+       enum spoolss_MinorVersion minor;
+       enum spoolss_ProcessorArchitecture processor;
+};
+
+struct spoolss_UserLevel2 {
+       uint32_t not_used;
+};
+
+struct spoolss_UserLevel3 {
+       uint32_t size;
+       uint32_t flags;
+       uint32_t size2;
+       const char *client;/* [unique,charset(UTF16)] */
+       const char *user;/* [unique,charset(UTF16)] */
+       uint32_t build;
+       enum spoolss_MajorVersion major;
+       enum spoolss_MinorVersion minor;
+       enum spoolss_ProcessorArchitecture processor;
+       uint64_t reserved;
 };
 
 union spoolss_UserLevel {
        struct spoolss_UserLevel1 *level1;/* [unique,case] */
+       struct spoolss_UserLevel2 *level2;/* [unique,case(2)] */
+       struct spoolss_UserLevel3 *level3;/* [unique,case(3)] */
+}/* [switch_type(uint32)] */;
+
+struct spoolss_UserLevelCtr {
+       uint32_t level;
+       union spoolss_UserLevel user_info;/* [switch_is(level)] */
 };
 
 /* bitmap spoolss_AccessRights */
@@ -777,12 +2044,90 @@ union spoolss_UserLevel {
 #define PRINTER_ACCESS_ADMINISTER ( 0x00000004 )
 #define PRINTER_ACCESS_USE ( 0x00000008 )
 #define JOB_ACCESS_ADMINISTER ( 0x00000010 )
+#define JOB_ACCESS_READ ( 0x00000020 )
+
+struct spoolss_PrinterEnumValues {
+       const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t value_name_len;/* [value(2*strlen_m_term(value_name))] */
+       enum winreg_Type type;
+       union spoolss_PrinterData *data;/* [relative,subcontext_size(r->data_length),subcontext(0),switch_is(type)] */
+       uint32_t data_length;/* [value(ndr_size_spoolss_PrinterData(data,type,ndr->iconv_convenience,ndr->flags))] */
+}/* [relative_base,gensize,public] */;
 
 /* bitmap spoolss_DeleteDriverFlags */
 #define DPD_DELETE_UNUSED_FILES ( 0x00000001 )
 #define DPD_DELETE_SPECIFIC_VERSION ( 0x00000002 )
 #define DPD_DELETE_ALL_FILES ( 0x00000004 )
 
+enum spoolss_PortProtocol
+#ifndef USE_UINT_ENUMS
+ {
+       PROTOCOL_RAWTCP_TYPE=(int)(1),
+       PROTOCOL_LPR_TYPE=(int)(2)
+}
+#else
+ { __donnot_use_enum_spoolss_PortProtocol=0x7FFFFFFF}
+#define PROTOCOL_RAWTCP_TYPE ( 1 )
+#define PROTOCOL_LPR_TYPE ( 2 )
+#endif
+;
+
+struct spoolss_PortData1 {
+       const char *portname;/* [charset(UTF16)] */
+       uint32_t version;/* [value(0x00000001)] */
+       enum spoolss_PortProtocol protocol;
+       uint32_t size;/* [value(sizeof(r))] */
+       uint32_t reserved;
+       const char *hostaddress;/* [charset(UTF16)] */
+       const char *snmpcommunity;/* [charset(UTF16)] */
+       uint32_t dblspool;
+       const char *queue;/* [charset(UTF16)] */
+       const char *ip_address;/* [charset(UTF16)] */
+       const char *hardware_address;/* [charset(UTF16)] */
+       const char *device_type;/* [charset(UTF16)] */
+       uint32_t port_number;
+       uint32_t snmp_enabled;
+       uint32_t snmp_dev_index;
+}/* [public] */;
+
+struct spoolss_PortData2 {
+       const char *portname;/* [charset(UTF16)] */
+       uint32_t version;/* [value(0x00000002)] */
+       enum spoolss_PortProtocol protocol;
+       uint32_t size;/* [value(sizeof(r))] */
+       uint32_t reserved;
+       const char *hostaddress;/* [charset(UTF16)] */
+       const char *snmpcommunity;/* [charset(UTF16)] */
+       uint32_t dblspool;
+       const char *queue;/* [charset(UTF16)] */
+       const char *device_type;/* [charset(UTF16)] */
+       uint32_t port_number;
+       uint32_t snmp_enabled;
+       uint32_t snmp_dev_index;
+       uint32_t port_monitor_mib_index;
+}/* [public] */;
+
+struct spoolss_MonitorUi {
+       const char * dll_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [public] */;
+
+/* bitmap spoolss_AddPrinterDriverExFlags */
+#define APD_STRICT_UPGRADE ( 0x00000001 )
+#define APD_STRICT_DOWNGRADE ( 0x00000002 )
+#define APD_COPY_ALL_FILES ( 0x00000004 )
+#define APD_COPY_NEW_FILES ( 0x00000008 )
+#define APD_COPY_FROM_DIRECTORY ( 0x00000010 )
+#define APD_DONT_COPY_FILES_TO_CLUSTER ( 0x00001000 )
+#define APD_COPY_TO_ALL_SPOOLERS ( 0x00002000 )
+#define APD_RETURN_BLOCKING_STATUS_CODE ( 0x00010000 )
+
+struct spoolss_CorePrinterDriver {
+       struct GUID core_driver_guid;
+       NTTIME driver_date;
+       uint64_t driver_version;
+       const char *formname;/* [charset(UTF8)] */
+};
+
 
 struct _spoolss_EnumPrinters {
        struct {
@@ -796,7 +2141,7 @@ struct _spoolss_EnumPrinters {
        struct {
                DATA_BLOB *info;/* [unique] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
+               uint32_t *count;/* [ref] */
                WERROR result;
        } out;
 
@@ -826,9 +2171,9 @@ struct spoolss_EnumPrinters {
        } in;
 
        struct {
-               union spoolss_PrinterInfo *info;/* [unique,switch_is(level),size_is(count)] */
+               uint32_t *count;/* [ref] */
+               union spoolss_PrinterInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
                WERROR result;
        } out;
 
@@ -897,7 +2242,7 @@ struct _spoolss_EnumJobs {
        struct {
                DATA_BLOB *info;/* [unique] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
+               uint32_t *count;/* [ref] */
                WERROR result;
        } out;
 
@@ -928,9 +2273,9 @@ struct spoolss_EnumJobs {
        } in;
 
        struct {
-               union spoolss_JobInfo *info;/* [unique,switch_is(level),size_is(count)] */
+               uint32_t *count;/* [ref] */
+               union spoolss_JobInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
                WERROR result;
        } out;
 
@@ -939,6 +2284,14 @@ struct spoolss_EnumJobs {
 
 struct spoolss_AddPrinter {
        struct {
+               const char *server;/* [unique,charset(UTF16)] */
+               struct spoolss_SetPrinterInfoCtr *info_ctr;/* [ref] */
+               struct spoolss_DevmodeContainer *devmode_ctr;/* [ref] */
+               struct sec_desc_buf *secdesc_ctr;/* [ref] */
+       } in;
+
+       struct {
+               struct policy_handle *handle;/* [ref] */
                WERROR result;
        } out;
 
@@ -960,10 +2313,9 @@ struct spoolss_DeletePrinter {
 struct spoolss_SetPrinter {
        struct {
                struct policy_handle *handle;/* [ref] */
-               uint32_t level;
-               union spoolss_SetPrinterInfo info;/* [switch_is(level)] */
-               struct spoolss_DevmodeContainer devmode_ctr;
-               struct sec_desc_buf secdesc_ctr;
+               struct spoolss_SetPrinterInfoCtr *info_ctr;/* [ref] */
+               struct spoolss_DevmodeContainer *devmode_ctr;/* [ref] */
+               struct sec_desc_buf *secdesc_ctr;/* [ref] */
                enum spoolss_PrinterControl command;
        } in;
 
@@ -992,6 +2344,11 @@ struct spoolss_GetPrinter {
 
 
 struct spoolss_AddPrinterDriver {
+       struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               struct spoolss_AddDriverInfoCtr *info_ctr;/* [ref] */
+       } in;
+
        struct {
                WERROR result;
        } out;
@@ -1011,7 +2368,7 @@ struct _spoolss_EnumPrinterDrivers {
        struct {
                DATA_BLOB *info;/* [unique] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
+               uint32_t *count;/* [ref] */
                WERROR result;
        } out;
 
@@ -1041,9 +2398,9 @@ struct spoolss_EnumPrinterDrivers {
        } in;
 
        struct {
-               union spoolss_DriverInfo *info;/* [unique,switch_is(level),size_is(count)] */
+               uint32_t *count;/* [ref] */
+               union spoolss_DriverInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
                WERROR result;
        } out;
 
@@ -1052,6 +2409,16 @@ struct spoolss_EnumPrinterDrivers {
 
 struct spoolss_GetPrinterDriver {
        struct {
+               struct policy_handle *handle;/* [ref] */
+               const char *architecture;/* [unique,charset(UTF16)] */
+               uint32_t level;
+               DATA_BLOB *buffer;/* [unique] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               union spoolss_DriverInfo *info;/* [unique,subcontext_size(offered),subcontext(4),switch_is(level)] */
+               uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
 
@@ -1117,7 +2484,7 @@ struct _spoolss_EnumPrintProcessors {
        struct {
                DATA_BLOB *info;/* [unique] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
+               uint32_t *count;/* [ref] */
                WERROR result;
        } out;
 
@@ -1147,9 +2514,9 @@ struct spoolss_EnumPrintProcessors {
        } in;
 
        struct {
-               union spoolss_PrintProcessorInfo *info;/* [unique,switch_is(level),size_is(count)] */
+               uint32_t *count;/* [ref] */
+               union spoolss_PrintProcessorInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
                WERROR result;
        } out;
 
@@ -1158,6 +2525,16 @@ struct spoolss_EnumPrintProcessors {
 
 struct spoolss_GetPrintProcessorDirectory {
        struct {
+               const char *server;/* [unique,charset(UTF16)] */
+               const char *environment;/* [unique,charset(UTF16)] */
+               uint32_t level;
+               DATA_BLOB *buffer;/* [unique] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               union spoolss_PrintProcessorDirectoryInfo *info;/* [unique,subcontext_size(offered),subcontext(4),switch_is(level)] */
+               uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
 
@@ -1295,8 +2672,8 @@ struct _spoolss_GetPrinterData {
        } in;
 
        struct {
-               enum spoolss_PrinterDataType *type;/* [ref] */
-               DATA_BLOB data;
+               enum winreg_Type *type;/* [ref] */
+               DATA_BLOB *data;/* [ref] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -1306,11 +2683,11 @@ struct _spoolss_GetPrinterData {
 
 struct __spoolss_GetPrinterData {
        struct {
-               enum spoolss_PrinterDataType type;
+               enum winreg_Type type;
        } in;
 
        struct {
-               union spoolss_PrinterData data;/* [switch_is(type)] */
+               union spoolss_PrinterData *data;/* [ref,switch_is(type)] */
        } out;
 
 };
@@ -1324,8 +2701,8 @@ struct spoolss_GetPrinterData {
        } in;
 
        struct {
-               enum spoolss_PrinterDataType *type;/* [ref] */
-               union spoolss_PrinterData data;/* [subcontext_size(offered),subcontext(4),switch_is(*type)] */
+               enum winreg_Type *type;/* [ref] */
+               union spoolss_PrinterData *data;/* [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -1337,7 +2714,7 @@ struct _spoolss_SetPrinterData {
        struct {
                struct policy_handle *handle;/* [ref] */
                const char *value_name;/* [charset(UTF16)] */
-               enum spoolss_PrinterDataType type;
+               enum winreg_Type type;
                DATA_BLOB data;
                uint32_t _offered;
        } in;
@@ -1351,11 +2728,11 @@ struct _spoolss_SetPrinterData {
 
 struct __spoolss_SetPrinterData {
        struct {
-               enum spoolss_PrinterDataType type;
+               enum winreg_Type type;
        } in;
 
        struct {
-               union spoolss_PrinterData data;/* [switch_is(type)] */
+               union spoolss_PrinterData *data;/* [ref,switch_is(type)] */
        } out;
 
 };
@@ -1365,7 +2742,7 @@ struct spoolss_SetPrinterData {
        struct {
                struct policy_handle *handle;/* [ref] */
                const char *value_name;/* [charset(UTF16)] */
-               enum spoolss_PrinterDataType type;
+               enum winreg_Type type;
                union spoolss_PrinterData data;/* [subcontext(4),switch_is(type)] */
                uint32_t _offered;/* [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */
        } in;
@@ -1469,7 +2846,7 @@ struct _spoolss_EnumForms {
        struct {
                DATA_BLOB *info;/* [unique] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
+               uint32_t *count;/* [ref] */
                WERROR result;
        } out;
 
@@ -1498,9 +2875,9 @@ struct spoolss_EnumForms {
        } in;
 
        struct {
-               union spoolss_FormInfo *info;/* [unique,switch_is(level),size_is(count)] */
+               uint32_t *count;/* [ref] */
+               union spoolss_FormInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
                WERROR result;
        } out;
 
@@ -1518,7 +2895,7 @@ struct _spoolss_EnumPorts {
        struct {
                DATA_BLOB *info;/* [unique] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
+               uint32_t *count;/* [ref] */
                WERROR result;
        } out;
 
@@ -1547,9 +2924,9 @@ struct spoolss_EnumPorts {
        } in;
 
        struct {
-               union spoolss_PortInfo *info;/* [unique,switch_is(level),size_is(count)] */
+               uint32_t *count;/* [ref] */
+               union spoolss_PortInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
                WERROR result;
        } out;
 
@@ -1567,7 +2944,7 @@ struct _spoolss_EnumMonitors {
        struct {
                DATA_BLOB *info;/* [unique] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
+               uint32_t *count;/* [ref] */
                WERROR result;
        } out;
 
@@ -1596,9 +2973,9 @@ struct spoolss_EnumMonitors {
        } in;
 
        struct {
-               union spoolss_MonitorInfo *info;/* [unique,switch_is(level),size_is(count)] */
+               uint32_t *count;/* [ref] */
+               union spoolss_MonitorInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
-               uint32_t count;
                WERROR result;
        } out;
 
@@ -1637,6 +3014,12 @@ struct spoolss_DeletePort {
 
 struct spoolss_CreatePrinterIC {
        struct {
+               struct policy_handle *handle;/* [ref] */
+               struct spoolss_DevmodeContainer *devmode_ctr;/* [ref] */
+       } in;
+
+       struct {
+               struct policy_handle *gdi_handle;/* [ref] */
                WERROR result;
        } out;
 
@@ -1653,6 +3036,11 @@ struct spoolss_PlayGDIScriptOnPrinterIC {
 
 struct spoolss_DeletePrinterIC {
        struct {
+               struct policy_handle *gdi_handle;/* [ref] */
+       } in;
+
+       struct {
+               struct policy_handle *gdi_handle;/* [ref] */
                WERROR result;
        } out;
 
@@ -1723,8 +3111,51 @@ struct spoolss_DeletePrintProvidor {
 };
 
 
+struct _spoolss_EnumPrintProcDataTypes {
+       struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               const char *print_processor_name;/* [unique,charset(UTF16)] */
+               uint32_t level;
+               DATA_BLOB *buffer;/* [unique] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               DATA_BLOB *info;/* [unique] */
+               uint32_t *needed;/* [ref] */
+               uint32_t *count;/* [ref] */
+               WERROR result;
+       } out;
+
+};
+
+
+struct __spoolss_EnumPrintProcDataTypes {
+       struct {
+               uint32_t level;
+               uint32_t count;
+       } in;
+
+       struct {
+               union spoolss_PrintProcDataTypesInfo *info;/* [switch_is(level)] */
+       } out;
+
+};
+
+
 struct spoolss_EnumPrintProcDataTypes {
        struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               const char *print_processor_name;/* [unique,charset(UTF16)] */
+               uint32_t level;
+               DATA_BLOB *buffer;/* [unique] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               uint32_t *count;/* [ref] */
+               union spoolss_PrintProcDataTypesInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
+               uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
 
@@ -1732,6 +3163,12 @@ struct spoolss_EnumPrintProcDataTypes {
 
 
 struct spoolss_ResetPrinter {
+       struct {
+               struct policy_handle *handle;/* [ref] */
+               const char *data_type;/* [unique,charset(UTF16)] */
+               struct spoolss_DevmodeContainer *devmode_ctr;/* [ref] */
+       } in;
+
        struct {
                WERROR result;
        } out;
@@ -1751,7 +3188,7 @@ struct spoolss_GetPrinterDriver2 {
        } in;
 
        struct {
-               DATA_BLOB *info;/* [unique] */
+               union spoolss_DriverInfo *info;/* [unique,subcontext_size(offered),subcontext(4),switch_is(level)] */
                uint32_t *needed;/* [ref] */
                uint32_t *server_major_version;/* [ref] */
                uint32_t *server_minor_version;/* [ref] */
@@ -1802,8 +3239,8 @@ struct spoolss_ReplyOpenPrinter {
                const char *server_name;/* [charset(UTF16)] */
                uint32_t printer_local;
                enum winreg_Type type;
-               uint32_t unknown1;
-               uint32_t unknown2;
+               uint32_t bufsize;/* [range(0,512)] */
+               uint8_t *buffer;/* [unique,size_is(bufsize)] */
        } in;
 
        struct {
@@ -1879,9 +3316,9 @@ struct spoolss_RemoteFindFirstPrinterChangeNotifyEx {
                struct policy_handle *handle;/* [ref] */
                uint32_t flags;
                uint32_t options;
-               const char *str;/* [unique,charset(UTF16)] */
+               const char *local_machine;/* [unique,charset(UTF16)] */
                uint32_t printer_local;
-               struct spoolss_NotifyOptionsContainer *t1;/* [unique] */
+               struct spoolss_NotifyOption *notify_options;/* [unique] */
        } in;
 
        struct {
@@ -1891,19 +3328,28 @@ struct spoolss_RemoteFindFirstPrinterChangeNotifyEx {
 };
 
 
-struct spoolss_RouterRefreshPrinterChangeNotification {
+struct spoolss_RouterReplyPrinterEx {
+       struct {
+               struct policy_handle *handle;/* [ref] */
+               uint32_t color;
+               uint32_t flags;
+               uint32_t reply_type;
+               union spoolss_ReplyPrinterInfo info;/* [switch_is(reply_type)] */
+       } in;
+
        struct {
+               uint32_t *reply_result;/* [ref] */
                WERROR result;
        } out;
 
 };
 
 
-struct spoolss_RemoteFindNextPrinterChangeNotifyEx {
+struct spoolss_RouterRefreshPrinterChangeNotify {
        struct {
                struct policy_handle *handle;/* [ref] */
                uint32_t change_low;
-               struct spoolss_NotifyOptionsContainer *container;/* [unique] */
+               struct spoolss_NotifyOption *options;/* [unique] */
        } in;
 
        struct {
@@ -1943,15 +3389,14 @@ struct spoolss_OpenPrinterEx {
 struct spoolss_AddPrinterEx {
        struct {
                const char *server;/* [unique,charset(UTF16)] */
-               uint32_t level;
-               union spoolss_PrinterInfo *info;/* [unique,switch_is(level)] */
-               struct spoolss_DevmodeContainer devmode_ctr;
-               struct security_descriptor *secdesc;/* [unique] */
-               uint32_t ulevel;
-               union spoolss_UserLevel userlevel;/* [switch_is(ulevel)] */
+               struct spoolss_SetPrinterInfoCtr *info_ctr;/* [ref] */
+               struct spoolss_DevmodeContainer *devmode_ctr;/* [ref] */
+               struct sec_desc_buf *secdesc_ctr;/* [ref] */
+               struct spoolss_UserLevelCtr *userlevel_ctr;/* [ref] */
        } in;
 
        struct {
+               struct policy_handle *handle;/* [ref] */
                WERROR result;
        } out;
 
@@ -1977,8 +3422,8 @@ struct spoolss_EnumPrinterData {
        struct {
                const char *value_name;/* [charset(UTF16),size_is(value_offered/2)] */
                uint32_t *value_needed;/* [ref] */
-               uint32_t *printerdata_type;/* [ref] */
-               DATA_BLOB *buffer;/* [ref] */
+               enum winreg_Type *type;/* [ref] */
+               uint8_t *data;/* [ref,flag(LIBNDR_PRINT_ARRAY_HEX),size_is(data_offered)] */
                uint32_t *data_needed;/* [ref] */
                WERROR result;
        } out;
@@ -2028,8 +3473,8 @@ struct spoolss_SetPrinterDataEx {
                struct policy_handle *handle;/* [ref] */
                const char *key_name;/* [charset(UTF16)] */
                const char *value_name;/* [charset(UTF16)] */
-               uint32_t type;
-               DATA_BLOB buffer;
+               enum winreg_Type type;
+               uint8_t *buffer;/* [ref,size_is(offered)] */
                uint32_t offered;
        } in;
 
@@ -2049,7 +3494,7 @@ struct spoolss_GetPrinterDataEx {
        } in;
 
        struct {
-               uint32_t *type;/* [ref] */
+               enum winreg_Type *type;/* [ref] */
                uint8_t *buffer;/* [ref,size_is(offered)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
@@ -2058,7 +3503,7 @@ struct spoolss_GetPrinterDataEx {
 };
 
 
-struct spoolss_EnumPrinterDataEx {
+struct _spoolss_EnumPrinterDataEx {
        struct {
                struct policy_handle *handle;/* [ref] */
                const char *key_name;/* [charset(UTF16)] */
@@ -2066,7 +3511,7 @@ struct spoolss_EnumPrinterDataEx {
        } in;
 
        struct {
-               uint8_t *buffer;/* [ref,size_is(offered)] */
+               DATA_BLOB info;
                uint32_t *needed;/* [ref] */
                uint32_t *count;/* [ref] */
                WERROR result;
@@ -2075,15 +3520,44 @@ struct spoolss_EnumPrinterDataEx {
 };
 
 
+struct __spoolss_EnumPrinterDataEx {
+       struct {
+               uint32_t count;
+       } in;
+
+       struct {
+               struct spoolss_PrinterEnumValues *info;
+       } out;
+
+};
+
+
+struct spoolss_EnumPrinterDataEx {
+       struct {
+               struct policy_handle *handle;/* [ref] */
+               const char *key_name;/* [charset(UTF16)] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               uint32_t *count;/* [ref] */
+               struct spoolss_PrinterEnumValues **info;/* [ref,size_is(,*count)] */
+               uint32_t *needed;/* [ref] */
+               WERROR result;
+       } out;
+
+};
+
+
 struct spoolss_EnumPrinterKey {
        struct {
                struct policy_handle *handle;/* [ref] */
                const char *key_name;/* [charset(UTF16)] */
-               uint32_t key_buffer_size;
+               uint32_t offered;
        } in;
 
        struct {
-               uint16_t *key_buffer;/* [ref,size_is(key_buffer_size/2)] */
+               struct spoolss_StringArray2 *key_buffer;/* [ref] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -2187,6 +3661,12 @@ struct spoolss_XcvData {
 
 
 struct spoolss_AddPrinterDriverEx {
+       struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               struct spoolss_AddDriverInfoCtr *info_ctr;/* [ref] */
+               uint32_t flags;
+       } in;
+
        struct {
                WERROR result;
        } out;
@@ -2241,4 +3721,136 @@ struct spoolss_5f {
 
 };
 
+
+struct spoolss_60 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_61 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_62 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_63 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_64 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_65 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_GetCorePrinterDrivers {
+       struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               const char *architecture;/* [ref,charset(UTF16)] */
+               uint32_t core_driver_size;
+               const char *core_driver_dependencies;/* [ref,charset(UTF16),size_is(core_driver_size)] */
+               uint32_t core_printer_driver_count;
+       } in;
+
+       struct {
+               struct spoolss_CorePrinterDriver *core_printer_drivers;/* [ref,size_is(core_printer_driver_count)] */
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_67 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_GetPrinterDriverPackagePath {
+       struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               const char *architecture;/* [ref,charset(UTF16)] */
+               const char *language;/* [unique,charset(UTF16)] */
+               const char *package_id;/* [ref,charset(UTF16)] */
+               uint32_t driver_package_cab_size;
+               const char *driver_package_cab;/* [unique,charset(UTF16),size_is(driver_package_cab_size)] */
+       } in;
+
+       struct {
+               uint32_t *required;/* [ref] */
+               const char *driver_package_cab;/* [unique,charset(UTF16),size_is(driver_package_cab_size)] */
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_69 {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_6a {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_6b {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_6c {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
+
+struct spoolss_6d {
+       struct {
+               WERROR result;
+       } out;
+
+};
+
 #endif /* _HEADER_spoolss */