spoolss: more mork on SetPrinterInfo() levels.

[ira/wip.git] / librpc / gen_ndr / spoolss.h

diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 146dde5e2d47fad01c4a723035da0abebbd3bbc0..08d1a38829243643ef843e74dd33bce746193cc7 100644 (file)
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -1144,12 +1144,12 @@ struct spoolss_SetPrinterInfo2 {
        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)] */
+       uint32_t devmode_ptr;
        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 secdesc_ptr;
        uint32_t attributes;
        uint32_t priority;/* [range(0,99)] */
        uint32_t defaultpriority;
@@ -1187,6 +1187,14 @@ struct spoolss_SetPrinterInfo7 {
        uint32_t action;
 };
 
+struct spoolss_SetPrinterInfo8 {
+       uint32_t devmode_ptr;
+};
+
+struct spoolss_SetPrinterInfo9 {
+       uint32_t devmode_ptr;
+};
+
 union spoolss_SetPrinterInfo {
        struct spoolss_SetPrinterInfo0 *info0;/* [unique,case(0)] */
        struct spoolss_SetPrinterInfo1 *info1;/* [unique,case] */
@@ -1196,8 +1204,8 @@ union spoolss_SetPrinterInfo {
        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)] */
+       struct spoolss_SetPrinterInfo8 *info8;/* [unique,case(8)] */
+       struct spoolss_SetPrinterInfo9 *info9;/* [unique,case(9)] */
 }/* [switch_type(uint32)] */;
 
 struct spoolss_SetPrinterInfoCtr {
@@ -1425,6 +1433,14 @@ struct spoolss_DriverInfo6 {
        const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
 }/* [gensize,public] */;
 
+struct spoolss_DriverInfo7 {
+       uint32_t size;
+       enum spoolss_DriverOSVersion version;
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * inf_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * install_source_root;/* [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)] */
@@ -1502,6 +1518,7 @@ union spoolss_DriverInfo {
        struct spoolss_DriverInfo4 info4;/* [case(4)] */
        struct spoolss_DriverInfo5 info5;/* [case(5)] */
        struct spoolss_DriverInfo6 info6;/* [case(6)] */
+       struct spoolss_DriverInfo7 info7;/* [case(7)] */
        struct spoolss_DriverInfo8 info8;/* [case(8)] */
        struct spoolss_DriverInfo101 info101;/* [case(101)] */
 }/* [relative_base,gensize,public,nodiscriminant] */;
@@ -1569,7 +1586,7 @@ union spoolss_PrinterData {
        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] */;
+}/* [nodiscriminant,public] */;
 
 enum spoolss_FormFlags
 #ifndef USE_UINT_ENUMS