diff options
author | Günther Deschner <gd@samba.org> | 2009-12-01 02:38:19 +0100 |
---|---|---|
committer | Karolin Seeger <kseeger@samba.org> | 2009-12-08 09:15:23 +0100 |
commit | 70091fbf3e417a8e6ea67a3de2d09827ad5d8a36 (patch) | |
tree | 5624b492257470cfd8f1423091c051b47a21545a /librpc | |
parent | f7094cb508de4a321e1c3825ebedacf595ea8349 (diff) | |
download | samba-70091fbf3e417a8e6ea67a3de2d09827ad5d8a36.tar.gz samba-70091fbf3e417a8e6ea67a3de2d09827ad5d8a36.tar.xz samba-70091fbf3e417a8e6ea67a3de2d09827ad5d8a36.zip |
s3-spoolss: move MAXDEVICENAME to spoolss idl.
Guenther
(cherry picked from commit 91bb0659776d397bc4b8ca7a534f6f2327e2e6fe)
(cherry picked from commit 31217f3edaf2565947d3e79f4d655503b013bd18)
Diffstat (limited to 'librpc')
-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 |
3 files changed, 9 insertions, 6 deletions
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index 53b07f70585..8bf1c8f8190 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -1045,7 +1045,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)); @@ -1064,7 +1064,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)); @@ -1101,7 +1101,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)); @@ -1120,7 +1120,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 a4c0010d5c7..3153672194a 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 bb517a10e12..0e71e1a6bc6 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 */ |