diff options
| author | Günther Deschner <gd@samba.org> | 2010-02-23 17:01:26 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2010-02-23 17:01:26 +0100 |
| commit | d22b54c4eb1da075041b640f6b9eeb5ec263b9be (patch) | |
| tree | 78487bdd6ff2257b614aa30a41b804457bbdbef1 | |
| parent | f6497a58079621fd0d8b0d9a8365371263c6a1e3 (diff) | |
| download | samba-d22b54c4eb1da075041b640f6b9eeb5ec263b9be.tar.gz samba-d22b54c4eb1da075041b640f6b9eeb5ec263b9be.tar.bz2 samba-d22b54c4eb1da075041b640f6b9eeb5ec263b9be.zip | |
spoolss: some fixes for devicemode dm extra structs.
Guenther
| -rw-r--r-- | librpc/idl/spoolss.idl | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index 62dec2c003..7dad7950cb 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -328,7 +328,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") uint16 caColorfulness; uint16 caRedGreenTint; uint16 wCoreJTExpSize; - [value(sizeof(spoolss_PSDRVEXTRA) + wCoreJTExpSize)] uint16 wCoreFullSize; + [value(ndr_size_spoolss_PSDRVEXTRA(r, ndr->iconv_convenience, ndr->flags) + wCoreJTExpSize)] uint16 wCoreFullSize; uint32 fxScrFreq; uint32 fxScrAngle; spoolss_DMPS_Dialect iDialect; @@ -399,7 +399,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") [value(SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA)] spoolss_DM_Signature dwSignature; [value(0x0022)] uint16 wVer; uint16 wCoreJTExpSize; - [value(ndr_size_spoolss_UNIDRVEXTRA(r, NULL, 0) + wCoreJTExpSize)] uint16 wCoreFullSize; + [value(ndr_size_spoolss_UNIDRVEXTRA(r, ndr->iconv_convenience, ndr->flags) + wCoreJTExpSize)] uint16 wCoreFullSize; uint16 wOEMExtra; uint32 dwChecksum32; spoolss_DMUNI_Flags dwFlags; @@ -422,16 +422,8 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") [value(0)] uint32 dwVersion; [value(16)] uint32 wJTHdrSize; uint32 wCoreMFOSize; -// [value(strlen_m(ModelName) + ndr_size_X)] uint32 wCoreMFOSize; [string,charset(UTF16)] uint16 *ModelName; nstring_array FeatureOptionPairs; - /* - FeatureOptionPairs (variable): Must be a concatenation of an - even number of zero-terminated ASCII strings, terminated by an - additional zero character. Each pair of two consecutive strings - specifies a print schema feature and the currently selected - option. - */ } spoolss_JTEXP; /* Device Mode Extra Data: OEM_DMEXTRA */ |