diff options
| author | Günther Deschner <gd@samba.org> | 2009-12-12 02:51:44 +0100 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2009-12-15 08:16:50 +0100 |
| commit | c760b755f637d0b91f8758c963de903133d847f5 (patch) | |
| tree | b33eec32e3ed8d12fb0d50a5a6f43191f8a2d81f /librpc | |
| parent | 581982da3bcfb0533f28f0e667df47528250e61e (diff) | |
| download | samba-c760b755f637d0b91f8758c963de903133d847f5.tar.gz | |
spoolss: trivial fix for spoolss_FormInfo2 IDL.
Guenther
(cherry picked from commit 5ae61cfbc281f346fd3712a975c5796f9cfbc6c2)
(cherry picked from commit 43ff4f2628882f9fa51bbe37f6cbe776f62241a3)
Diffstat (limited to 'librpc')
| -rw-r--r-- | librpc/gen_ndr/ndr_spoolss.c | 9 | ||||
| -rw-r--r-- | librpc/gen_ndr/spoolss.h | 3 | ||||
| -rw-r--r-- | librpc/idl/spoolss.idl | 3 |
3 files changed, 10 insertions, 5 deletions
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c index bf832eef824..009c9f43d15 100644 --- a/librpc/gen_ndr/ndr_spoolss.c +++ b/librpc/gen_ndr/ndr_spoolss.c @@ -15621,7 +15621,8 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int NDR_CHECK(ndr_push_relative_ptr1(ndr, r->display_name)); ndr->flags = _flags_save_string; } - NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->lang_id)); + NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->lang_id)); + NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unused)); NDR_CHECK(ndr_push_trailer_align(ndr, 5)); } if (ndr_flags & NDR_BUFFERS) { @@ -15730,7 +15731,8 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int } ndr->flags = _flags_save_string; } - NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->lang_id)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->lang_id)); + NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unused)); NDR_CHECK(ndr_pull_trailer_align(ndr, 5)); } if (ndr_flags & NDR_BUFFERS) { @@ -15831,7 +15833,8 @@ _PUBLIC_ void ndr_print_spoolss_FormInfo2(struct ndr_print *ndr, const char *nam ndr_print_string(ndr, "display_name", r->display_name); } ndr->depth--; - ndr_print_uint32(ndr, "lang_id", r->lang_id); + ndr_print_uint16(ndr, "lang_id", r->lang_id); + ndr_print_uint16(ndr, "unused", r->unused); ndr->depth--; } diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h index 77d7c52850c..146dde5e2d4 100644 --- a/librpc/gen_ndr/spoolss.h +++ b/librpc/gen_ndr/spoolss.h @@ -1620,7 +1620,8 @@ struct spoolss_FormInfo2 { const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ uint32_t ressource_id; const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ - uint32_t lang_id; + uint16_t lang_id; + uint16_t unused; }/* [gensize,public] */; union spoolss_FormInfo { diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl index ceff885ac8c..14ddba8173d 100644 --- a/librpc/idl/spoolss.idl +++ b/librpc/idl/spoolss.idl @@ -1697,7 +1697,8 @@ import "misc.idl", "security.idl", "winreg.idl"; [relative] nstring *mui_dll; uint32 ressource_id; [relative] nstring *display_name; - uint32 lang_id; + uint16 lang_id; + uint16 unused; } spoolss_FormInfo2; typedef [nodiscriminant,relative_base,public,gensize] union { |