diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-03-28 18:25:47 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:11:19 -0500 |
| commit | 4931dfc8c673360c216b0db9c44e45e51bd2a5ca (patch) | |
| tree | 22cfc52af6adb3c8c687d1f7bf983a696d3e645c | |
| parent | 3b05dae2009ef48491f012fa09b403102c92cb06 (diff) | |
| download | samba-4931dfc8c673360c216b0db9c44e45e51bd2a5ca.tar.gz samba-4931dfc8c673360c216b0db9c44e45e51bd2a5ca.tar.bz2 samba-4931dfc8c673360c216b0db9c44e45e51bd2a5ca.zip | |
r6100: - fix nondiscriminant -> nodiscriminant (that takes me 2 days to find...:-( )
- use a DATA_BLOB for the driver specific data in the devmode
metze
(This used to be commit 87d48b20769666b568ac1115246b58995d221148)
| -rw-r--r-- | source4/librpc/idl/spoolss.idl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl index 6278498f15..79b8d5b7cc 100644 --- a/source4/librpc/idl/spoolss.idl +++ b/source4/librpc/idl/spoolss.idl @@ -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; |