svn commit: samba r6100 - in branches/SAMBA_4_0/source/librpc/idl: .

[metze at samba.org]

Author: metze
Date: 2005-03-28 18:25:47 +0000 (Mon, 28 Mar 2005)
New Revision: 6100

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6100

Log:
- fix nondiscriminant -> nodiscriminant (that takes me 2 days to find...:-( )

- use a DATA_BLOB for the driver specific data in the devmode

metze

Modified:
   branches/SAMBA_4_0/source/librpc/idl/spoolss.idl


Changeset:
Modified: branches/SAMBA_4_0/source/librpc/idl/spoolss.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/spoolss.idl	2005-03-28 18:23:54 UTC (rev 6099)
+++ branches/SAMBA_4_0/source/librpc/idl/spoolss.idl	2005-03-28 18:25:47 UTC (rev 6100)
@@ -60,7 +60,7 @@
 		uint16 specversion;
 		uint16 driverversion;
 		uint16 size;
-		uint16 driverextra;
+		[value(r->driverextra_data.length)] uint16 __driverextra_length;
 		uint32 fields;
 		uint16 orientation;
 		uint16 papersize;
@@ -90,10 +90,10 @@
 		uint32 reserved2;
 		uint32 panningwidth;
 		uint32 panningheight;
-		uint8  private[driverextra];
+		[subcontext_size(r->__driverextra_length),subcontext(0),flag(NDR_REMAINING)] DATA_BLOB driverextra_data;
 	} spoolss_DeviceMode;
 
-	typedef bitmap {
+	typedef [public] bitmap {
 		PRINTER_ENUM_DEFAULT     = 0x00000001,
 		PRINTER_ENUM_LOCAL       = 0x00000002,
 		PRINTER_ENUM_CONNECTIONS = 0x00000004,
@@ -701,7 +701,7 @@
 		uint32 reserved;
 	} spoolss_PortInfo2;
 
-	typedef [nondiscriminant,public] union {
+	typedef [nodiscriminant,public] union {
 		[case(1)] spoolss_PortInfo1 info1;
 		[case(2)] spoolss_PortInfo2 info2;
 	} spoolss_PortInfo;