diff options
| author | Günther Deschner <gd@samba.org> | 2009-12-01 02:38:19 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-12-02 14:36:36 +0100 |
| commit | 91bb0659776d397bc4b8ca7a534f6f2327e2e6fe (patch) | |
| tree | 7a204903465d647a0d8d5ddf9dde344295d1ba59 | |
| parent | 53744f01dc7f74f87e4c71057cc175e4c47d3a67 (diff) | |
| download | samba-91bb0659776d397bc4b8ca7a534f6f2327e2e6fe.tar.gz samba-91bb0659776d397bc4b8ca7a534f6f2327e2e6fe.tar.bz2 samba-91bb0659776d397bc4b8ca7a534f6f2327e2e6fe.zip | |
s3-spoolss: move MAXDEVICENAME to spoolss idl.
Guenther
| -rw-r--r-- | librpc/gen_ndr/ndr_spoolss.c | 8 | ||||
| -rw-r--r-- | librpc/gen_ndr/spoolss.h | 1 | ||||
| -rw-r--r-- | librpc/idl/spoolss.idl | 6 | ||||
| -rw-r--r-- | source3/include/nt_printing.h | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index a578ed8a85..2bde1cad10 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -1051,7 +1051,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DeviceMode(struct ndr_push *ndr, int { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_push_align(ndr, 4)); - NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->devicename, 32, sizeof(uint16_t), CH_UTF16)); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->devicename, MAXDEVICENAME, sizeof(uint16_t), CH_UTF16)); NDR_CHECK(ndr_push_spoolss_DeviceModeSpecVersion(ndr, NDR_SCALARS, r->specversion)); NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->driverversion)); NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->size)); @@ -1070,7 +1070,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DeviceMode(struct ndr_push *ndr, int NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->yresolution)); NDR_CHECK(ndr_push_spoolss_DeviceModeTTOption(ndr, NDR_SCALARS, r->ttoption)); NDR_CHECK(ndr_push_spoolss_DeviceModeCollate(ndr, NDR_SCALARS, r->collate)); - NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->formname, 32, sizeof(uint16_t), CH_UTF16)); + NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->formname, MAXDEVICENAME, sizeof(uint16_t), CH_UTF16)); NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->logpixels)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->bitsperpel)); NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->pelswidth)); @@ -1107,7 +1107,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DeviceMode(struct ndr_pull *ndr, int { if (ndr_flags & NDR_SCALARS) { NDR_CHECK(ndr_pull_align(ndr, 4)); - NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->devicename, 32, sizeof(uint16_t), CH_UTF16)); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->devicename, MAXDEVICENAME, sizeof(uint16_t), CH_UTF16)); NDR_CHECK(ndr_pull_spoolss_DeviceModeSpecVersion(ndr, NDR_SCALARS, &r->specversion)); NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->driverversion)); NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->size)); @@ -1126,7 +1126,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DeviceMode(struct ndr_pull *ndr, int NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->yresolution)); NDR_CHECK(ndr_pull_spoolss_DeviceModeTTOption(ndr, NDR_SCALARS, &r->ttoption)); NDR_CHECK(ndr_pull_spoolss_DeviceModeCollate(ndr, NDR_SCALARS, &r->collate)); - NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->formname, 32, sizeof(uint16_t), CH_UTF16)); + NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->formname, MAXDEVICENAME, sizeof(uint16_t), CH_UTF16)); NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->logpixels)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->bitsperpel)); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->pelswidth)); diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h index a4c0010d5c..3153672194 100644 --- a/librpc/gen_ndr/spoolss.h +++ b/librpc/gen_ndr/spoolss.h @@ -12,6 +12,7 @@ #define PRINTER_STATUS_OK ( 0x00000000 ) #define JOB_STATUS_QUEUED ( 0x0000 ) +#define MAXDEVICENAME ( 32 ) #define PRINTER_ENUM_ICONMASK ( (PRINTER_ENUM_ICON1|PRINTER_ENUM_ICON2|PRINTER_ENUM_ICON3|PRINTER_ENUM_ICON4|PRINTER_ENUM_ICON5|PRINTER_ENUM_ICON6|PRINTER_ENUM_ICON7|PRINTER_ENUM_ICON8) ) #define SPL_ARCH_WIN40 ( "WIN40" ) #define SPL_ARCH_W32X86 ( "W32X86" ) diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index bb517a10e1..0e71e1a6bc 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -368,8 +368,10 @@ import "misc.idl", "security.idl", "winreg.idl"; DMDITHER_GRAYSCALE = 0x0000000A } spoolss_DeviceModeDitherType; + const int MAXDEVICENAME = 32; + typedef [public,gensize] struct { - [charset(UTF16)] uint16 devicename[32]; + [charset(UTF16)] uint16 devicename[MAXDEVICENAME]; spoolss_DeviceModeSpecVersion specversion; uint16 driverversion; uint16 size; @@ -388,7 +390,7 @@ import "misc.idl", "security.idl", "winreg.idl"; uint16 yresolution; spoolss_DeviceModeTTOption ttoption; spoolss_DeviceModeCollate collate; - [charset(UTF16)] uint16 formname[32]; + [charset(UTF16)] uint16 formname[MAXDEVICENAME]; uint16 logpixels; /* reserved */ uint32 bitsperpel; /* reserved */ uint32 pelswidth; /* reserved */ diff --git a/source3/include/nt_printing.h b/source3/include/nt_printing.h index 3a509a243a..713443a4fa 100644 --- a/source3/include/nt_printing.h +++ b/source3/include/nt_printing.h @@ -36,8 +36,6 @@ typedef struct { NT_PRINTER_KEY *keys; } NT_PRINTER_DATA; -#define MAXDEVICENAME 32 - typedef struct ntdevicemode { fstring devicename; |