[SCM] Samba Shared Repository - branch master updated
Günther Deschner
gd at samba.org
Tue Feb 23 09:02:53 MST 2010
The branch, master has been updated
via 0278ef8... s3: re-run make samba3-idl.
via d22b54c... spoolss: some fixes for devicemode dm extra structs.
from f6497a5... s3: re-run make samba3-idl.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0278ef8ce30518c3a3e4c20a51c751ea2aab9add
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 23 17:02:37 2010 +0100
s3: re-run make samba3-idl.
Guenther
commit d22b54c4eb1da075041b640f6b9eeb5ec263b9be
Author: Günther Deschner <gd at samba.org>
Date: Tue Feb 23 17:01:26 2010 +0100
spoolss: some fixes for devicemode dm extra structs.
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/ndr_spoolss.c | 30 ++++++++-------
librpc/gen_ndr/spoolss.h | 80 +++++++++++++++++++++---------------------
librpc/idl/spoolss.idl | 12 +-----
3 files changed, 58 insertions(+), 64 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 861fda5..2448f73 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -533,14 +533,14 @@ _PUBLIC_ size_t ndr_size_spoolss_PrinterInfo0(const struct spoolss_PrinterInfo0
static enum ndr_err_code ndr_push_spoolss_DM_Signature(struct ndr_push *ndr, int ndr_flags, enum spoolss_DM_Signature r)
{
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_spoolss_DM_Signature(struct ndr_pull *ndr, int ndr_flags, enum spoolss_DM_Signature *r)
{
uint32_t v;
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
@@ -559,14 +559,14 @@ _PUBLIC_ void ndr_print_spoolss_DM_Signature(struct ndr_print *ndr, const char *
static enum ndr_err_code ndr_push_spoolss_DM_Layout(struct ndr_push *ndr, int ndr_flags, enum spoolss_DM_Layout r)
{
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_spoolss_DM_Layout(struct ndr_pull *ndr, int ndr_flags, enum spoolss_DM_Layout *r)
{
uint32_t v;
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
@@ -589,14 +589,14 @@ _PUBLIC_ void ndr_print_spoolss_DM_Layout(struct ndr_print *ndr, const char *nam
static enum ndr_err_code ndr_push_spoolss_DM_NupDirection(struct ndr_push *ndr, int ndr_flags, enum spoolss_DM_NupDirection r)
{
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_spoolss_DM_NupDirection(struct ndr_pull *ndr, int ndr_flags, enum spoolss_DM_NupDirection *r)
{
uint32_t v;
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
@@ -616,14 +616,14 @@ _PUBLIC_ void ndr_print_spoolss_DM_NupDirection(struct ndr_print *ndr, const cha
static enum ndr_err_code ndr_push_spoolss_DM_NupBorderFlags(struct ndr_push *ndr, int ndr_flags, enum spoolss_DM_NupBorderFlags r)
{
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_spoolss_DM_NupBorderFlags(struct ndr_pull *ndr, int ndr_flags, enum spoolss_DM_NupBorderFlags *r)
{
uint32_t v;
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
@@ -641,14 +641,14 @@ _PUBLIC_ void ndr_print_spoolss_DM_NupBorderFlags(struct ndr_print *ndr, const c
static enum ndr_err_code ndr_push_spoolss_DM_BookletFlags(struct ndr_push *ndr, int ndr_flags, enum spoolss_DM_BookletFlags r)
{
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_spoolss_DM_BookletFlags(struct ndr_pull *ndr, int ndr_flags, enum spoolss_DM_BookletFlags *r)
{
uint32_t v;
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
@@ -666,14 +666,14 @@ _PUBLIC_ void ndr_print_spoolss_DM_BookletFlags(struct ndr_print *ndr, const cha
static enum ndr_err_code ndr_push_spoolss_DMUNI_Quality(struct ndr_push *ndr, int ndr_flags, enum spoolss_DMUNI_Quality r)
{
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ NDR_CHECK(ndr_push_enum_uint32(ndr, NDR_SCALARS, r));
return NDR_ERR_SUCCESS;
}
static enum ndr_err_code ndr_pull_spoolss_DMUNI_Quality(struct ndr_pull *ndr, int ndr_flags, enum spoolss_DMUNI_Quality *r)
{
uint32_t v;
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ NDR_CHECK(ndr_pull_enum_uint32(ndr, NDR_SCALARS, &v));
*r = v;
return NDR_ERR_SUCCESS;
}
@@ -723,7 +723,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_UNIDRVEXTRA(struct ndr_push *ndr, in
NDR_CHECK(ndr_push_spoolss_DM_Signature(ndr, NDR_SCALARS, SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, 0x0022));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->wCoreJTExpSize));
- NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, ndr_size_spoolss_UNIDRVEXTRA(r, NULL, 0) + r->wCoreJTExpSize));
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, ndr_size_spoolss_UNIDRVEXTRA(r, ndr->iconv_convenience, ndr->flags) + r->wCoreJTExpSize));
NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->wOEMExtra));
NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->dwChecksum32));
NDR_CHECK(ndr_push_spoolss_DMUNI_Flags(ndr, NDR_SCALARS, r->dwFlags));
@@ -740,6 +740,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_UNIDRVEXTRA(struct ndr_push *ndr, in
NDR_CHECK(ndr_push_spoolss_DM_NupDirection(ndr, NDR_SCALARS, r->dwNupDirection));
NDR_CHECK(ndr_push_spoolss_DM_NupBorderFlags(ndr, NDR_SCALARS, r->dwNupBorderFlags));
NDR_CHECK(ndr_push_spoolss_DM_BookletFlags(ndr, NDR_SCALARS, r->dwBookletFlags));
+ NDR_CHECK(ndr_push_trailer_align(ndr, 4));
}
if (ndr_flags & NDR_BUFFERS) {
}
@@ -772,6 +773,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_UNIDRVEXTRA(struct ndr_pull *ndr, in
NDR_CHECK(ndr_pull_spoolss_DM_NupDirection(ndr, NDR_SCALARS, &r->dwNupDirection));
NDR_CHECK(ndr_pull_spoolss_DM_NupBorderFlags(ndr, NDR_SCALARS, &r->dwNupBorderFlags));
NDR_CHECK(ndr_pull_spoolss_DM_BookletFlags(ndr, NDR_SCALARS, &r->dwBookletFlags));
+ NDR_CHECK(ndr_pull_trailer_align(ndr, 4));
}
if (ndr_flags & NDR_BUFFERS) {
}
@@ -787,7 +789,7 @@ _PUBLIC_ void ndr_print_spoolss_UNIDRVEXTRA(struct ndr_print *ndr, const char *n
ndr_print_spoolss_DM_Signature(ndr, "dwSignature", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA:r->dwSignature);
ndr_print_uint16(ndr, "wVer", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?0x0022:r->wVer);
ndr_print_uint16(ndr, "wCoreJTExpSize", r->wCoreJTExpSize);
- ndr_print_uint16(ndr, "wCoreFullSize", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?ndr_size_spoolss_UNIDRVEXTRA(r, NULL, 0) + r->wCoreJTExpSize:r->wCoreFullSize);
+ ndr_print_uint16(ndr, "wCoreFullSize", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?ndr_size_spoolss_UNIDRVEXTRA(r, ndr->iconv_convenience, ndr->flags) + r->wCoreJTExpSize:r->wCoreFullSize);
ndr_print_uint16(ndr, "wOEMExtra", r->wOEMExtra);
ndr_print_uint32(ndr, "dwChecksum32", r->dwChecksum32);
ndr_print_spoolss_DMUNI_Flags(ndr, "dwFlags", r->dwFlags);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 40607ab..1111ece 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -278,9 +278,9 @@ struct spoolss_PrinterInfo0 {
enum spoolss_DM_Signature
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA=0x554e4944,
- SPOOLSS_DM_SIGNATURE_JTEXP=0x4a544d53,
- SPOOLSS_DM_SIGNATURE_PSEXTRA=0x50524956
+ SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA=(int)(0x554e4944),
+ SPOOLSS_DM_SIGNATURE_JTEXP=(int)(0x4a544d53),
+ SPOOLSS_DM_SIGNATURE_PSEXTRA=(int)(0x50524956)
}
#else
{ __donnot_use_enum_spoolss_DM_Signature=0x7FFFFFFF}
@@ -293,13 +293,13 @@ enum spoolss_DM_Signature
enum spoolss_DM_Layout
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_LAYOUT_NUP_DISABLED=0x00000000,
- SPOOLSS_DM_LAYOUT_NUP_2=0x00000001,
- SPOOLSS_DM_LAYOUT_NUP_4=0x00000002,
- SPOOLSS_DM_LAYOUT_NUP_6=0x00000003,
- SPOOLSS_DM_LAYOUT_NUP_9=0x00000004,
- SPOOLSS_DM_LAYOUT_NUP_16=0x00000005,
- SPOOLSS_DM_LAYOUT_BOOKLET=0x00000006
+ SPOOLSS_DM_LAYOUT_NUP_DISABLED=(int)(0x00000000),
+ SPOOLSS_DM_LAYOUT_NUP_2=(int)(0x00000001),
+ SPOOLSS_DM_LAYOUT_NUP_4=(int)(0x00000002),
+ SPOOLSS_DM_LAYOUT_NUP_6=(int)(0x00000003),
+ SPOOLSS_DM_LAYOUT_NUP_9=(int)(0x00000004),
+ SPOOLSS_DM_LAYOUT_NUP_16=(int)(0x00000005),
+ SPOOLSS_DM_LAYOUT_BOOKLET=(int)(0x00000006)
}
#else
{ __donnot_use_enum_spoolss_DM_Layout=0x7FFFFFFF}
@@ -316,10 +316,10 @@ enum spoolss_DM_Layout
enum spoolss_DM_NupDirection
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_NUP_DIRECTION_L2R_T2B=0x00000001,
- SPOOLSS_DM_NUP_DIRECTION_T2B_L2R=0x00000002,
- SPOOLSS_DM_NUP_DIRECTION_R2L_T2B=0x00000004,
- SPOOLSS_DM_NUP_DIRECTION_T2B_R2L=0x00000008
+ SPOOLSS_DM_NUP_DIRECTION_L2R_T2B=(int)(0x00000001),
+ SPOOLSS_DM_NUP_DIRECTION_T2B_L2R=(int)(0x00000002),
+ SPOOLSS_DM_NUP_DIRECTION_R2L_T2B=(int)(0x00000004),
+ SPOOLSS_DM_NUP_DIRECTION_T2B_R2L=(int)(0x00000008)
}
#else
{ __donnot_use_enum_spoolss_DM_NupDirection=0x7FFFFFFF}
@@ -333,8 +333,8 @@ enum spoolss_DM_NupDirection
enum spoolss_DM_NupBorderFlags
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_NUP_BORDER_PRINT=0x00000000,
- SPOOLSS_DM_NUP_BORDER_NONE=0x00000001
+ SPOOLSS_DM_NUP_BORDER_PRINT=(int)(0x00000000),
+ SPOOLSS_DM_NUP_BORDER_NONE=(int)(0x00000001)
}
#else
{ __donnot_use_enum_spoolss_DM_NupBorderFlags=0x7FFFFFFF}
@@ -346,8 +346,8 @@ enum spoolss_DM_NupBorderFlags
enum spoolss_DM_BookletFlags
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_BOOKLET_LEFT_FLIP=0x00000000,
- SPOOLSS_DM_BOOKLET_RIGHT_FLIP=0x00000001
+ SPOOLSS_DM_BOOKLET_LEFT_FLIP=(int)(0x00000000),
+ SPOOLSS_DM_BOOKLET_RIGHT_FLIP=(int)(0x00000001)
}
#else
{ __donnot_use_enum_spoolss_DM_BookletFlags=0x7FFFFFFF}
@@ -406,10 +406,10 @@ struct spoolss_PSDRVEXTRA400 {
enum spoolss_DMPS_Dialect
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_PS_OPTIMIZE_SPEED=0x00000000,
- SPOOLSS_DM_PS_OPTIMIZE_PORTABILITY=0x00000001,
- SPOOLSS_DM_PS_OPTIMIZE_EPS=0x00000002,
- SPOOLSS_DM_PS_OPTIMIZE_ARCHIVAL=0x00000003
+ SPOOLSS_DM_PS_OPTIMIZE_SPEED=(int)(0x00000000),
+ SPOOLSS_DM_PS_OPTIMIZE_PORTABILITY=(int)(0x00000001),
+ SPOOLSS_DM_PS_OPTIMIZE_EPS=(int)(0x00000002),
+ SPOOLSS_DM_PS_OPTIMIZE_ARCHIVAL=(int)(0x00000003)
}
#else
{ __donnot_use_enum_spoolss_DMPS_Dialect=0x7FFFFFFF}
@@ -423,10 +423,10 @@ enum spoolss_DMPS_Dialect
enum spoolss_DMPS_TTDLFmt
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_PS_TTDLFMT_DEFAULT=0x00000000,
- SPOOLSS_DM_PS_TTDLFMT_TYPE_1=0x00000001,
- SPOOLSS_DM_PS_TTDLFMT_TYPE_3=0x00000002,
- SPOOLSS_DM_PS_TTDLFMT_TYPE_42=0x00000003
+ SPOOLSS_DM_PS_TTDLFMT_DEFAULT=(int)(0x00000000),
+ SPOOLSS_DM_PS_TTDLFMT_TYPE_1=(int)(0x00000001),
+ SPOOLSS_DM_PS_TTDLFMT_TYPE_3=(int)(0x00000002),
+ SPOOLSS_DM_PS_TTDLFMT_TYPE_42=(int)(0x00000003)
}
#else
{ __donnot_use_enum_spoolss_DMPS_TTDLFmt=0x7FFFFFFF}
@@ -440,9 +440,9 @@ enum spoolss_DMPS_TTDLFmt
enum spoolss_DMPS_PSLevel
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_PS_PSLEVEL_1=0x00000001,
- SPOOLSS_DM_PS_PSLEVEL_2=0x00000002,
- SPOOLSS_DM_PS_PSLEVEL_3=0x00000003
+ SPOOLSS_DM_PS_PSLEVEL_1=(int)(0x00000001),
+ SPOOLSS_DM_PS_PSLEVEL_2=(int)(0x00000002),
+ SPOOLSS_DM_PS_PSLEVEL_3=(int)(0x00000003)
}
#else
{ __donnot_use_enum_spoolss_DMPS_PSLevel=0x7FFFFFFF}
@@ -455,10 +455,10 @@ enum spoolss_DMPS_PSLevel
enum spoolss_DMPS_FeedDirection
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_PS_FEED_DIRECTION_LONG_EDGE_FIRST=0x0000,
- SPOOLSS_DM_PS_FEED_DIRECTION_SHORT_EDGE_FIRST=0x0001,
- SPOOLSS_DM_PS_FEED_DIRECTION_LONG_EDGE_FIRST_UPSIDEDOWN=0x0002,
- SPOOLSS_DM_PS_FEED_DIRECTION_SHORT_EDGE_FIRST_UPSIDEDOWN=0x0003
+ SPOOLSS_DM_PS_FEED_DIRECTION_LONG_EDGE_FIRST=(int)(0x0000),
+ SPOOLSS_DM_PS_FEED_DIRECTION_SHORT_EDGE_FIRST=(int)(0x0001),
+ SPOOLSS_DM_PS_FEED_DIRECTION_LONG_EDGE_FIRST_UPSIDEDOWN=(int)(0x0002),
+ SPOOLSS_DM_PS_FEED_DIRECTION_SHORT_EDGE_FIRST_UPSIDEDOWN=(int)(0x0003)
}
#else
{ __donnot_use_enum_spoolss_DMPS_FeedDirection=0x7FFFFFFF}
@@ -526,7 +526,7 @@ struct spoolss_PSDRVEXTRA {
uint16_t caColorfulness;
uint16_t caRedGreenTint;
uint16_t wCoreJTExpSize;
- uint16_t wCoreFullSize;/* [value(sizeof(spoolss_PSDRVEXTRA)+wCoreJTExpSize)] */
+ uint16_t wCoreFullSize;/* [value(ndr_size_spoolss_PSDRVEXTRA(r,ndr->iconv_convenience,ndr->flags)+wCoreJTExpSize)] */
uint32_t fxScrFreq;
uint32_t fxScrAngle;
enum spoolss_DMPS_Dialect iDialect;
@@ -560,9 +560,9 @@ struct spoolss_UNIDRVEXTRA3_4 {
enum spoolss_DMUNI_Quality
#ifndef USE_UINT_ENUMS
{
- SPOOLSS_DM_UNI_QUALITY_BEST=0x00000000,
- SPOOLSS_DM_UNI_QUALITY_MEDIUM=0x00000001,
- SPOOLSS_DM_UNI_QUALITY_DRAFT=0x00000002
+ SPOOLSS_DM_UNI_QUALITY_BEST=(int)(0x00000000),
+ SPOOLSS_DM_UNI_QUALITY_MEDIUM=(int)(0x00000001),
+ SPOOLSS_DM_UNI_QUALITY_DRAFT=(int)(0x00000002)
}
#else
{ __donnot_use_enum_spoolss_DMUNI_Quality=0x7FFFFFFF}
@@ -597,7 +597,7 @@ struct spoolss_UNIDRVEXTRA {
enum spoolss_DM_Signature dwSignature;/* [value(SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA)] */
uint16_t wVer;/* [value(0x0022)] */
uint16_t wCoreJTExpSize;
- uint16_t wCoreFullSize;/* [value(ndr_size_spoolss_UNIDRVEXTRA(r,NULL,0)+wCoreJTExpSize)] */
+ uint16_t wCoreFullSize;/* [value(ndr_size_spoolss_UNIDRVEXTRA(r,ndr->iconv_convenience,ndr->flags)+wCoreJTExpSize)] */
uint16_t wOEMExtra;
uint32_t dwChecksum32;
uint32_t dwFlags;
@@ -634,14 +634,14 @@ union spoolss_DeviceModeExtraDataPostScript {
struct spoolss_PSDRVEXTRA400 psdrvextra400;/* [case(0x0400)] */
struct spoolss_PSDRVEXTRA500 psdrvextra500;/* [case(0x0501)] */
struct spoolss_PSDRVEXTRA psdrvextra;/* [case(0x0600)] */
- DATA_BLOB blob;/* [default,flag(LIBNDR_FLAG_REMAINING)] */
+ DATA_BLOB psblob;/* [default,flag(LIBNDR_FLAG_REMAINING)] */
}/* [nodiscriminant] */;
union spoolss_DeviceModeExtraDataUniDriver {
struct spoolss_UNIDRVEXTRA3_4 unidrvextra3_4;/* [case(0x0301)] */
struct spoolss_UNIDRVEXTRA500 unidrvextra500;/* [case(0x0500)] */
struct spoolss_UNIDRVEXTRA unidrvextra;/* [case(0x0600)] */
- DATA_BLOB blob;/* [default,flag(LIBNDR_FLAG_REMAINING)] */
+ DATA_BLOB uniblob;/* [default,flag(LIBNDR_FLAG_REMAINING)] */
}/* [nodiscriminant] */;
/* bitmap spoolss_DeviceModeFields */
diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 62dec2c..7dad795 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 */
--
Samba Shared Repository
More information about the samba-cvs
mailing list