diff options
author | Günther Deschner <gd@samba.org> | 2009-02-12 14:00:49 +0100 |
---|---|---|
committer | Günther Deschner <gd@samba.org> | 2009-02-12 18:02:50 +0100 |
commit | 135135e3a0a84d19d1bc6df1cc3c5813d1a244ec (patch) | |
tree | 0e07dd2df59cbb20782e74c70111ef36ad7c16d2 /librpc/idl/spoolss.idl | |
parent | aa9eac08cd2614eefca6c6bc673e07619a55f842 (diff) | |
download | samba-135135e3a0a84d19d1bc6df1cc3c5813d1a244ec.tar.gz samba-135135e3a0a84d19d1bc6df1cc3c5813d1a244ec.tar.bz2 samba-135135e3a0a84d19d1bc6df1cc3c5813d1a244ec.zip |
spoolss: fix some cases in the spoolss_NotifyData union.
Guenther
Diffstat (limited to 'librpc/idl/spoolss.idl')
-rw-r--r-- | librpc/idl/spoolss.idl | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index c45e49c70d..79df1a15a4 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -14,7 +14,7 @@ import "misc.idl", "security.idl", "winreg.idl"; ] interface spoolss { typedef [v1_enum] enum winreg_Type winreg_Type; - typedef struct { + typedef [gensize] struct { uint16 year; uint16 month; uint16 day_of_week; @@ -26,6 +26,11 @@ import "misc.idl", "security.idl", "winreg.idl"; } spoolss_Time; typedef struct { + [value(ndr_size_spoolss_Time(time, ndr->iconv_convenience, ndr->flags))] uint32 size; + [unique] spoolss_Time *time; + } spoolss_TimeCtr; + + typedef struct { [relative] nstring *printername; [relative] nstring *servername; uint32 cjobs; @@ -1474,28 +1479,14 @@ import "misc.idl", "security.idl", "winreg.idl"; typedef struct { uint32 size; [size_is(size/2),unique,charset(UTF16)] uint16 *string; - } spoolss_NotifyUTF16String; - - typedef struct { - uint32 size; - [size_is(size),charset(DOS)] uint8 *string; - } spoolss_NotifyDOSString; - - typedef struct { - uint16 data[8]; - } spoolss_NotifyBlobData; - - typedef struct { - uint32 len; - [unique] spoolss_NotifyBlobData *data; - } spoolss_NotifyBlob; + } spoolss_NotifyString; typedef [switch_type(uint32)] union { - [case(1)] dlong integer; - [case(2)] spoolss_NotifyUTF16String utf16_string; - [case(3)] spoolss_NotifyDOSString ascii_string; - [case(4)] spoolss_NotifyBlob blob; - [case(5)] spoolss_NotifyDOSString ascii_string; + [case(1)] uint32 integer[2]; + [case(2)] spoolss_NotifyString string; + [case(3)] spoolss_DeviceMode *devmode; + [case(4)] spoolss_TimeCtr time; + [case(5)] sec_desc_buf sd; } spoolss_NotifyData; typedef struct { |