1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-31 01:48:16 +03:00

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 commit is contained in:
Stefan Metzmacher 2005-03-28 18:25:47 +00:00 committed by Gerald (Jerry) Carter
parent ff32e2182e
commit 87d48b2076

View File

@ -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;