[SCM] Samba Shared Repository - branch master updated

Günther Deschner gd at samba.org
Tue Feb 23 08:57:56 MST 2010


The branch, master has been updated
       via  f6497a5... s3: re-run make samba3-idl.
       via  2288e16... spoolss: add various DM extradata formats (including PostScript and UniDriver).
      from  a2cd203... s3:spoolss: construct the devmode the same way for level 2 and 8

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f6497a58079621fd0d8b0d9a8365371263c6a1e3
Author: Günther Deschner <gd at samba.org>
Date:   Tue Aug 11 00:15:58 2009 +0200

    s3: re-run make samba3-idl.
    
    Guenther

commit 2288e16d72443d946a53744cb2b57e71e9950d10
Author: Günther Deschner <gd at samba.org>
Date:   Tue Aug 11 00:14:55 2009 +0200

    spoolss: add various DM extradata formats (including PostScript and UniDriver).
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 librpc/gen_ndr/ndr_spoolss.c |  295 +++++++++++++++++++++++++++++++++
 librpc/gen_ndr/ndr_spoolss.h |   11 ++
 librpc/gen_ndr/spoolss.h     |  369 ++++++++++++++++++++++++++++++++++++++++++
 librpc/idl/spoolss.idl       |  307 +++++++++++++++++++++++++++++++++++
 4 files changed, 982 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index 112e993..861fda5 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -531,6 +531,301 @@ _PUBLIC_ size_t ndr_size_spoolss_PrinterInfo0(const struct spoolss_PrinterInfo0
 	return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_PrinterInfo0, ic);
 }
 
+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));
+	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));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DM_Signature(struct ndr_print *ndr, const char *name, enum spoolss_DM_Signature r)
+{
+	const char *val = NULL;
+
+	switch (r) {
+		case SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA: val = "SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA"; break;
+		case SPOOLSS_DM_SIGNATURE_JTEXP: val = "SPOOLSS_DM_SIGNATURE_JTEXP"; break;
+		case SPOOLSS_DM_SIGNATURE_PSEXTRA: val = "SPOOLSS_DM_SIGNATURE_PSEXTRA"; break;
+	}
+	ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+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));
+	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));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DM_Layout(struct ndr_print *ndr, const char *name, enum spoolss_DM_Layout r)
+{
+	const char *val = NULL;
+
+	switch (r) {
+		case SPOOLSS_DM_LAYOUT_NUP_DISABLED: val = "SPOOLSS_DM_LAYOUT_NUP_DISABLED"; break;
+		case SPOOLSS_DM_LAYOUT_NUP_2: val = "SPOOLSS_DM_LAYOUT_NUP_2"; break;
+		case SPOOLSS_DM_LAYOUT_NUP_4: val = "SPOOLSS_DM_LAYOUT_NUP_4"; break;
+		case SPOOLSS_DM_LAYOUT_NUP_6: val = "SPOOLSS_DM_LAYOUT_NUP_6"; break;
+		case SPOOLSS_DM_LAYOUT_NUP_9: val = "SPOOLSS_DM_LAYOUT_NUP_9"; break;
+		case SPOOLSS_DM_LAYOUT_NUP_16: val = "SPOOLSS_DM_LAYOUT_NUP_16"; break;
+		case SPOOLSS_DM_LAYOUT_BOOKLET: val = "SPOOLSS_DM_LAYOUT_BOOKLET"; break;
+	}
+	ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+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));
+	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));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DM_NupDirection(struct ndr_print *ndr, const char *name, enum spoolss_DM_NupDirection r)
+{
+	const char *val = NULL;
+
+	switch (r) {
+		case SPOOLSS_DM_NUP_DIRECTION_L2R_T2B: val = "SPOOLSS_DM_NUP_DIRECTION_L2R_T2B"; break;
+		case SPOOLSS_DM_NUP_DIRECTION_T2B_L2R: val = "SPOOLSS_DM_NUP_DIRECTION_T2B_L2R"; break;
+		case SPOOLSS_DM_NUP_DIRECTION_R2L_T2B: val = "SPOOLSS_DM_NUP_DIRECTION_R2L_T2B"; break;
+		case SPOOLSS_DM_NUP_DIRECTION_T2B_R2L: val = "SPOOLSS_DM_NUP_DIRECTION_T2B_R2L"; break;
+	}
+	ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+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));
+	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));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DM_NupBorderFlags(struct ndr_print *ndr, const char *name, enum spoolss_DM_NupBorderFlags r)
+{
+	const char *val = NULL;
+
+	switch (r) {
+		case SPOOLSS_DM_NUP_BORDER_PRINT: val = "SPOOLSS_DM_NUP_BORDER_PRINT"; break;
+		case SPOOLSS_DM_NUP_BORDER_NONE: val = "SPOOLSS_DM_NUP_BORDER_NONE"; break;
+	}
+	ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+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));
+	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));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DM_BookletFlags(struct ndr_print *ndr, const char *name, enum spoolss_DM_BookletFlags r)
+{
+	const char *val = NULL;
+
+	switch (r) {
+		case SPOOLSS_DM_BOOKLET_LEFT_FLIP: val = "SPOOLSS_DM_BOOKLET_LEFT_FLIP"; break;
+		case SPOOLSS_DM_BOOKLET_RIGHT_FLIP: val = "SPOOLSS_DM_BOOKLET_RIGHT_FLIP"; break;
+	}
+	ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+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));
+	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));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DMUNI_Quality(struct ndr_print *ndr, const char *name, enum spoolss_DMUNI_Quality r)
+{
+	const char *val = NULL;
+
+	switch (r) {
+		case SPOOLSS_DM_UNI_QUALITY_BEST: val = "SPOOLSS_DM_UNI_QUALITY_BEST"; break;
+		case SPOOLSS_DM_UNI_QUALITY_MEDIUM: val = "SPOOLSS_DM_UNI_QUALITY_MEDIUM"; break;
+		case SPOOLSS_DM_UNI_QUALITY_DRAFT: val = "SPOOLSS_DM_UNI_QUALITY_DRAFT"; break;
+	}
+	ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+static enum ndr_err_code ndr_push_spoolss_DMUNI_Flags(struct ndr_push *ndr, int ndr_flags, uint32_t r)
+{
+	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+	return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolss_DMUNI_Flags(struct ndr_pull *ndr, int ndr_flags, uint32_t *r)
+{
+	uint32_t v;
+	NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+	*r = v;
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DMUNI_Flags(struct ndr_print *ndr, const char *name, uint32_t r)
+{
+	ndr_print_uint32(ndr, name, r);
+	ndr->depth++;
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS", SPOOLSS_DM_UNI_FLAGS_PRINT_TEXT_AS_GRAPHICS, r);
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SPOOLSS_DM_UNI_FLAGS_AVOID_EMFSPOOL", SPOOLSS_DM_UNI_FLAGS_AVOID_EMFSPOOL, r);
+	ndr_print_bitmap_flag(ndr, sizeof(uint32_t), "SPOOLSS_DM_UNI_FLAGS_CUSTOM_HALFTONING", SPOOLSS_DM_UNI_FLAGS_CUSTOM_HALFTONING, r);
+	ndr->depth--;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_UNIDRVEXTRA(struct ndr_push *ndr, int ndr_flags, const struct spoolss_UNIDRVEXTRA *r)
+{
+	uint32_t cntr_wReserved_0;
+	uint32_t cntr_aOptions_0;
+	if (ndr_flags & NDR_SCALARS) {
+		NDR_CHECK(ndr_push_align(ndr, 4));
+		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, r->wOEMExtra));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->dwChecksum32));
+		NDR_CHECK(ndr_push_spoolss_DMUNI_Flags(ndr, NDR_SCALARS, r->dwFlags));
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->bReversePrint));
+		NDR_CHECK(ndr_push_spoolss_DM_Layout(ndr, NDR_SCALARS, r->iLayout));
+		NDR_CHECK(ndr_push_spoolss_DMUNI_Quality(ndr, NDR_SCALARS, r->iQuality));
+		for (cntr_wReserved_0 = 0; cntr_wReserved_0 < 6; cntr_wReserved_0++) {
+			NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->wReserved[cntr_wReserved_0]));
+		}
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->dwOptions));
+		for (cntr_aOptions_0 = 0; cntr_aOptions_0 < 128; cntr_aOptions_0++) {
+			NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->aOptions[cntr_aOptions_0]));
+		}
+		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));
+	}
+	if (ndr_flags & NDR_BUFFERS) {
+	}
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_UNIDRVEXTRA(struct ndr_pull *ndr, int ndr_flags, struct spoolss_UNIDRVEXTRA *r)
+{
+	uint32_t cntr_wReserved_0;
+	uint32_t cntr_aOptions_0;
+	if (ndr_flags & NDR_SCALARS) {
+		NDR_CHECK(ndr_pull_align(ndr, 4));
+		NDR_CHECK(ndr_pull_spoolss_DM_Signature(ndr, NDR_SCALARS, &r->dwSignature));
+		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->wVer));
+		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->wCoreJTExpSize));
+		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->wCoreFullSize));
+		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->wOEMExtra));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->dwChecksum32));
+		NDR_CHECK(ndr_pull_spoolss_DMUNI_Flags(ndr, NDR_SCALARS, &r->dwFlags));
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->bReversePrint));
+		NDR_CHECK(ndr_pull_spoolss_DM_Layout(ndr, NDR_SCALARS, &r->iLayout));
+		NDR_CHECK(ndr_pull_spoolss_DMUNI_Quality(ndr, NDR_SCALARS, &r->iQuality));
+		for (cntr_wReserved_0 = 0; cntr_wReserved_0 < 6; cntr_wReserved_0++) {
+			NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->wReserved[cntr_wReserved_0]));
+		}
+		NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->dwOptions));
+		for (cntr_aOptions_0 = 0; cntr_aOptions_0 < 128; cntr_aOptions_0++) {
+			NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->aOptions[cntr_aOptions_0]));
+		}
+		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));
+	}
+	if (ndr_flags & NDR_BUFFERS) {
+	}
+	return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_UNIDRVEXTRA(struct ndr_print *ndr, const char *name, const struct spoolss_UNIDRVEXTRA *r)
+{
+	uint32_t cntr_wReserved_0;
+	uint32_t cntr_aOptions_0;
+	ndr_print_struct(ndr, name, "spoolss_UNIDRVEXTRA");
+	ndr->depth++;
+	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, "wOEMExtra", r->wOEMExtra);
+	ndr_print_uint32(ndr, "dwChecksum32", r->dwChecksum32);
+	ndr_print_spoolss_DMUNI_Flags(ndr, "dwFlags", r->dwFlags);
+	ndr_print_uint32(ndr, "bReversePrint", r->bReversePrint);
+	ndr_print_spoolss_DM_Layout(ndr, "iLayout", r->iLayout);
+	ndr_print_spoolss_DMUNI_Quality(ndr, "iQuality", r->iQuality);
+	ndr->print(ndr, "%s: ARRAY(%d)", "wReserved", (int)6);
+	ndr->depth++;
+	for (cntr_wReserved_0=0;cntr_wReserved_0<6;cntr_wReserved_0++) {
+		char *idx_0=NULL;
+		if (asprintf(&idx_0, "[%d]", cntr_wReserved_0) != -1) {
+			ndr_print_uint16(ndr, "wReserved", r->wReserved[cntr_wReserved_0]);
+			free(idx_0);
+		}
+	}
+	ndr->depth--;
+	ndr_print_uint32(ndr, "dwOptions", r->dwOptions);
+	ndr->print(ndr, "%s: ARRAY(%d)", "aOptions", (int)128);
+	ndr->depth++;
+	for (cntr_aOptions_0=0;cntr_aOptions_0<128;cntr_aOptions_0++) {
+		char *idx_0=NULL;
+		if (asprintf(&idx_0, "[%d]", cntr_aOptions_0) != -1) {
+			ndr_print_uint32(ndr, "aOptions", r->aOptions[cntr_aOptions_0]);
+			free(idx_0);
+		}
+	}
+	ndr->depth--;
+	ndr_print_spoolss_DM_NupDirection(ndr, "dwNupDirection", r->dwNupDirection);
+	ndr_print_spoolss_DM_NupBorderFlags(ndr, "dwNupBorderFlags", r->dwNupBorderFlags);
+	ndr_print_spoolss_DM_BookletFlags(ndr, "dwBookletFlags", r->dwBookletFlags);
+	ndr->depth--;
+}
+
+_PUBLIC_ size_t ndr_size_spoolss_UNIDRVEXTRA(const struct spoolss_UNIDRVEXTRA *r, struct smb_iconv_convenience *ic, int flags)
+{
+	return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_UNIDRVEXTRA, ic);
+}
+
 static enum ndr_err_code ndr_push_spoolss_DeviceModeFields(struct ndr_push *ndr, int ndr_flags, uint32_t r)
 {
 	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
diff --git a/librpc/gen_ndr/ndr_spoolss.h b/librpc/gen_ndr/ndr_spoolss.h
index 0591980..52873de 100644
--- a/librpc/gen_ndr/ndr_spoolss.h
+++ b/librpc/gen_ndr/ndr_spoolss.h
@@ -247,6 +247,17 @@ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, int ndr_fl
 enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, int ndr_flags, struct spoolss_PrinterInfo0 *r);
 void ndr_print_spoolss_PrinterInfo0(struct ndr_print *ndr, const char *name, const struct spoolss_PrinterInfo0 *r);
 size_t ndr_size_spoolss_PrinterInfo0(const struct spoolss_PrinterInfo0 *r, struct smb_iconv_convenience *ic, int flags);
+void ndr_print_spoolss_DM_Signature(struct ndr_print *ndr, const char *name, enum spoolss_DM_Signature r);
+void ndr_print_spoolss_DM_Layout(struct ndr_print *ndr, const char *name, enum spoolss_DM_Layout r);
+void ndr_print_spoolss_DM_NupDirection(struct ndr_print *ndr, const char *name, enum spoolss_DM_NupDirection r);
+void ndr_print_spoolss_DM_NupBorderFlags(struct ndr_print *ndr, const char *name, enum spoolss_DM_NupBorderFlags r);
+void ndr_print_spoolss_DM_BookletFlags(struct ndr_print *ndr, const char *name, enum spoolss_DM_BookletFlags r);
+void ndr_print_spoolss_DMUNI_Quality(struct ndr_print *ndr, const char *name, enum spoolss_DMUNI_Quality r);
+void ndr_print_spoolss_DMUNI_Flags(struct ndr_print *ndr, const char *name, uint32_t r);
+enum ndr_err_code ndr_push_spoolss_UNIDRVEXTRA(struct ndr_push *ndr, int ndr_flags, const struct spoolss_UNIDRVEXTRA *r);
+enum ndr_err_code ndr_pull_spoolss_UNIDRVEXTRA(struct ndr_pull *ndr, int ndr_flags, struct spoolss_UNIDRVEXTRA *r);
+void ndr_print_spoolss_UNIDRVEXTRA(struct ndr_print *ndr, const char *name, const struct spoolss_UNIDRVEXTRA *r);
+size_t ndr_size_spoolss_UNIDRVEXTRA(const struct spoolss_UNIDRVEXTRA *r, struct smb_iconv_convenience *ic, int flags);
 void ndr_print_spoolss_DeviceModeFields(struct ndr_print *ndr, const char *name, uint32_t r);
 void ndr_print_spoolss_DeviceModeSpecVersion(struct ndr_print *ndr, const char *name, enum spoolss_DeviceModeSpecVersion r);
 void ndr_print_spoolss_DeviceModeOrientation(struct ndr_print *ndr, const char *name, enum spoolss_DeviceModeOrientation r);
diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h
index 945453c..40607ab 100644
--- a/librpc/gen_ndr/spoolss.h
+++ b/librpc/gen_ndr/spoolss.h
@@ -275,6 +275,375 @@ struct spoolss_PrinterInfo0 {
 	uint32_t reserved3;
 }/* [gensize,public] */;
 
+enum spoolss_DM_Signature
+#ifndef USE_UINT_ENUMS
+ {
+	SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA=0x554e4944,
+	SPOOLSS_DM_SIGNATURE_JTEXP=0x4a544d53,
+	SPOOLSS_DM_SIGNATURE_PSEXTRA=0x50524956
+}
+#else
+ { __donnot_use_enum_spoolss_DM_Signature=0x7FFFFFFF}
+#define SPOOLSS_DM_SIGNATURE_UNIDRVEXTRA ( 0x554e4944 )
+#define SPOOLSS_DM_SIGNATURE_JTEXP ( 0x4a544d53 )
+#define SPOOLSS_DM_SIGNATURE_PSEXTRA ( 0x50524956 )
+#endif
+;
+
+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
+}
+#else
+ { __donnot_use_enum_spoolss_DM_Layout=0x7FFFFFFF}
+#define SPOOLSS_DM_LAYOUT_NUP_DISABLED ( 0x00000000 )
+#define SPOOLSS_DM_LAYOUT_NUP_2 ( 0x00000001 )
+#define SPOOLSS_DM_LAYOUT_NUP_4 ( 0x00000002 )
+#define SPOOLSS_DM_LAYOUT_NUP_6 ( 0x00000003 )
+#define SPOOLSS_DM_LAYOUT_NUP_9 ( 0x00000004 )
+#define SPOOLSS_DM_LAYOUT_NUP_16 ( 0x00000005 )
+#define SPOOLSS_DM_LAYOUT_BOOKLET ( 0x00000006 )
+#endif
+;
+
+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
+}
+#else
+ { __donnot_use_enum_spoolss_DM_NupDirection=0x7FFFFFFF}
+#define SPOOLSS_DM_NUP_DIRECTION_L2R_T2B ( 0x00000001 )
+#define SPOOLSS_DM_NUP_DIRECTION_T2B_L2R ( 0x00000002 )
+#define SPOOLSS_DM_NUP_DIRECTION_R2L_T2B ( 0x00000004 )
+#define SPOOLSS_DM_NUP_DIRECTION_T2B_R2L ( 0x00000008 )
+#endif
+;
+
+enum spoolss_DM_NupBorderFlags
+#ifndef USE_UINT_ENUMS
+ {
+	SPOOLSS_DM_NUP_BORDER_PRINT=0x00000000,
+	SPOOLSS_DM_NUP_BORDER_NONE=0x00000001
+}
+#else
+ { __donnot_use_enum_spoolss_DM_NupBorderFlags=0x7FFFFFFF}
+#define SPOOLSS_DM_NUP_BORDER_PRINT ( 0x00000000 )
+#define SPOOLSS_DM_NUP_BORDER_NONE ( 0x00000001 )
+#endif
+;
+
+enum spoolss_DM_BookletFlags
+#ifndef USE_UINT_ENUMS
+ {
+	SPOOLSS_DM_BOOKLET_LEFT_FLIP=0x00000000,
+	SPOOLSS_DM_BOOKLET_RIGHT_FLIP=0x00000001
+}
+#else
+ { __donnot_use_enum_spoolss_DM_BookletFlags=0x7FFFFFFF}
+#define SPOOLSS_DM_BOOKLET_LEFT_FLIP ( 0x00000000 )
+#define SPOOLSS_DM_BOOKLET_RIGHT_FLIP ( 0x00000001 )
+#endif
+;
+
+/* bitmap spoolss_DMPS_Flags */
+#define SPOOLSS_DM_PS_FLAGS_DRV_ERROR_HANDLER ( 0x00000002 )
+#define SPOOLSS_DM_PS_FLAGS_PRINT_MIRROR ( 0x00000004 )
+#define SPOOLSS_DM_PS_FLAGS_PRINT_NEGATIVE ( 0x00000010 )
+#define SPOOLSS_DM_PS_FLAGS_COMPRESS_BITMAP ( 0x00000040 )
+#define SPOOLSS_DM_PS_FLAGS_ROTATE_180 ( 0x00000200 )
+#define SPOOLSS_DM_PS_FLAGS_GDI_METAFILE_SPOOL ( 0x00002000 )
+
+struct spoolss_PSDRVEXTRA351 {
+	enum spoolss_DM_Signature dwSignature;/* [value(SPOOLSS_DM_SIGNATURE_PSEXTRA)] */
+	uint32_t dwFlags;
+	uint32_t wchEPSFile[12];
+	uint16_t caSize;/* [value(24)] */
+	uint16_t caFlags;
+	uint16_t caIlluminantIndex;
+	uint16_t caRedGamma;
+	uint16_t caGreenGamma;
+	uint16_t caBlueGamma;
+	uint16_t caReferenceBlack;
+	uint16_t caReferenceWhite;
+	uint16_t caContrast;
+	uint16_t caBrightness;
+	uint16_t caColorfulness;
+	uint16_t caRedGreenTint;
+};
+
+struct spoolss_PSDRVEXTRA400 {
+	enum spoolss_DM_Signature dwSignature;/* [value(SPOOLSS_DM_SIGNATURE_PSEXTRA)] */
+	uint32_t dwFlags;
+	uint32_t wchEPSFile[12];
+	uint16_t caSize;/* [value(24)] */
+	uint16_t caFlags;
+	uint16_t caIlluminantIndex;
+	uint16_t caRedGamma;
+	uint16_t caGreenGamma;
+	uint16_t caBlueGamma;
+	uint16_t caReferenceBlack;
+	uint16_t caReferenceWhite;
+	uint16_t caContrast;
+	uint16_t caBrightness;
+	uint16_t caColorfulness;
+	uint16_t caRedGreenTint;
+	uint16_t wChecksum;
+	uint16_t wOptions;
+	uint32_t aubOptions[8];
+};
+
+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
+}
+#else
+ { __donnot_use_enum_spoolss_DMPS_Dialect=0x7FFFFFFF}
+#define SPOOLSS_DM_PS_OPTIMIZE_SPEED ( 0x00000000 )
+#define SPOOLSS_DM_PS_OPTIMIZE_PORTABILITY ( 0x00000001 )
+#define SPOOLSS_DM_PS_OPTIMIZE_EPS ( 0x00000002 )
+#define SPOOLSS_DM_PS_OPTIMIZE_ARCHIVAL ( 0x00000003 )
+#endif
+;
+
+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
+}
+#else
+ { __donnot_use_enum_spoolss_DMPS_TTDLFmt=0x7FFFFFFF}
+#define SPOOLSS_DM_PS_TTDLFMT_DEFAULT ( 0x00000000 )
+#define SPOOLSS_DM_PS_TTDLFMT_TYPE_1 ( 0x00000001 )
+#define SPOOLSS_DM_PS_TTDLFMT_TYPE_3 ( 0x00000002 )
+#define SPOOLSS_DM_PS_TTDLFMT_TYPE_42 ( 0x00000003 )
+#endif
+;
+
+enum spoolss_DMPS_PSLevel
+#ifndef USE_UINT_ENUMS


-- 
Samba Shared Repository


More information about the samba-cvs mailing list