The Samba-Bugzilla – Attachment 6274 Details for
Bug 7567
printing from Windows 7 fails with 0x000003e6 (in AD w2k8r2 controlled domain)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for v3-5
tmp.diff (text/plain), 306.05 KB, created by
Stefan Metzmacher
on 2011-03-02 03:54:41 UTC
(
hide
)
Description:
Patch for v3-5
Filename:
MIME Type:
Creator:
Stefan Metzmacher
Created:
2011-03-02 03:54:41 UTC
Size:
306.05 KB
patch
obsolete
>From ea681ca7d81e0d7b599f1f5dd270420e64cf1c36 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Mon, 2 Aug 2010 15:52:09 +0200 >Subject: [PATCH 01/10] spoolss: fix potential crash bug in spoolss_PrinterEnumValues push path. > >Guenther >(cherry picked from commit 45952b56797982d27731b20d97f5648c9414814a) >(cherry picked from commit ad68e45b505331683a2510de20f113a7c20e68e1) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/idl/spoolss.idl | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index bfaca4a..44839be 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -2551,7 +2551,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") > [value(2*strlen_m_term(value_name))] uint32 value_name_len; > winreg_Type type; > [relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING)] DATA_BLOB *data; >- [value(data->length)] uint32 data_length; >+ [value(data ? data->length : 0)] uint32 data_length; > } spoolss_PrinterEnumValues; > > [public,noopnum,noprint] WERROR _spoolss_EnumPrinterDataEx( >-- >1.7.0.4 > > >From a5f0b84b3baf8c616cea2e5544bc3c0c65a0b8e7 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org> >Date: Thu, 22 Apr 2010 11:42:45 +0200 >Subject: [PATCH 02/10] spoolss: pretty-print a struct spoolss_Time. > >Guenther >(cherry picked from commit 440075247d11a7852d8567753f426fa67f41d875) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/gen_ndr/ndr_spoolss.c | 15 --------------- > librpc/gen_ndr/spoolss.h | 2 +- > librpc/idl/spoolss.idl | 2 +- > librpc/ndr/ndr_spoolss_buf.c | 27 +++++++++++++++++++++++++++ > librpc/ndr/ndr_spoolss_buf.h | 1 + > 5 files changed, 30 insertions(+), 17 deletions(-) > >diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c >index af555d7..18ca3f6 100644 >--- a/librpc/gen_ndr/ndr_spoolss.c >+++ b/librpc/gen_ndr/ndr_spoolss.c >@@ -44,21 +44,6 @@ static enum ndr_err_code ndr_pull_spoolss_Time(struct ndr_pull *ndr, int ndr_fla > return NDR_ERR_SUCCESS; > } > >-_PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, const struct spoolss_Time *r) >-{ >- ndr_print_struct(ndr, name, "spoolss_Time"); >- ndr->depth++; >- ndr_print_uint16(ndr, "year", r->year); >- ndr_print_uint16(ndr, "month", r->month); >- ndr_print_uint16(ndr, "day_of_week", r->day_of_week); >- ndr_print_uint16(ndr, "day", r->day); >- ndr_print_uint16(ndr, "hour", r->hour); >- ndr_print_uint16(ndr, "minute", r->minute); >- ndr_print_uint16(ndr, "second", r->second); >- ndr_print_uint16(ndr, "millisecond", r->millisecond); >- ndr->depth--; >-} >- > static size_t ndr_size_spoolss_Time(const struct spoolss_Time *r, struct smb_iconv_convenience *ic, int flags) > { > return ndr_size_struct(r, flags, (ndr_push_flags_fn_t)ndr_push_spoolss_Time, ic); >diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h >index fc7114a..15ad886 100644 >--- a/librpc/gen_ndr/spoolss.h >+++ b/librpc/gen_ndr/spoolss.h >@@ -126,7 +126,7 @@ struct spoolss_Time { > uint16_t minute; > uint16_t second; > uint16_t millisecond; >-}/* [gensize] */; >+}/* [noprint,gensize] */; > > struct spoolss_TimeCtr { > uint32_t size;/* [value(ndr_size_spoolss_Time(time,ndr->iconv_convenience,ndr->flags))] */ >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index 44839be..e0d9d2f 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -17,7 +17,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") > ] interface spoolss > { > typedef [v1_enum] enum winreg_Type winreg_Type; >- typedef [gensize] struct { >+ typedef [gensize,noprint] struct { > uint16 year; > uint16 month; > uint16 day_of_week; >diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c >index 5aa89e4..811a8e2 100644 >--- a/librpc/ndr/ndr_spoolss_buf.c >+++ b/librpc/ndr/ndr_spoolss_buf.c >@@ -1382,3 +1382,30 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo2(struct ndr_push *ndr, i > } > return NDR_ERR_SUCCESS; > } >+ >+_PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, const struct spoolss_Time *r) >+{ >+ struct tm tm; >+ time_t t; >+ char *str; >+ >+ tm.tm_sec = r->second; >+ tm.tm_min = r->minute; >+ tm.tm_hour = r->hour; >+ tm.tm_mday = r->day; >+ tm.tm_mon = r->month - 1; >+ tm.tm_year = r->year - 1900; >+ tm.tm_wday = r->day_of_week; >+ tm.tm_yday = 0; >+ tm.tm_isdst = -1; >+ >+ t = mktime(&tm); >+ >+ str = timestring(ndr, t); >+ >+ ndr_print_struct(ndr, name, "spoolss_Time"); >+ ndr->depth++; >+ ndr_print_string(ndr, "", str); >+ ndr->depth--; >+ talloc_free(str); >+} >diff --git a/librpc/ndr/ndr_spoolss_buf.h b/librpc/ndr/ndr_spoolss_buf.h >index 2766abb..89dcb46 100644 >--- a/librpc/ndr/ndr_spoolss_buf.h >+++ b/librpc/ndr/ndr_spoolss_buf.h >@@ -51,6 +51,7 @@ size_t ndr_size_spoolss_PrinterData(const union spoolss_PrinterData *r, uint32_t > void ndr_print_spoolss_security_descriptor(struct ndr_print *ndr, const char *name, const struct security_descriptor *r); > enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r); > enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r); >+_PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, const struct spoolss_Time *r); > > #undef _PRINTF_ATTRIBUTE > #define _PRINTF_ATTRIBUTE(a1, a2) >-- >1.7.0.4 > > >From 9811bff1d91bbf45422e8116da3145e98dd4a168 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 22 Feb 2011 18:19:13 +0100 >Subject: [PATCH 03/10] librpc/ndr: let ndr_push/pull_DATA_BLOB() look at LIBNDR_FLAG_REMAINING before LIBNDR_ALIGN_FLAGS > >metze >(cherry picked from commit 6c3a49ced333988b21d86e47b2b1dd1a5957e15c) >(cherry picked from commit 5f8b7f95e9ce5946f048b242dbbaa14897aea919) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/ndr/ndr_basic.c | 9 +++++---- > 1 files changed, 5 insertions(+), 4 deletions(-) > >diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c >index 50a8922..f913eff 100644 >--- a/librpc/ndr/ndr_basic.c >+++ b/librpc/ndr/ndr_basic.c >@@ -1011,7 +1011,8 @@ _PUBLIC_ void ndr_print_DATA_BLOB(struct ndr_print *ndr, const char *name, DATA_ > */ > _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob) > { >- if (ndr->flags & LIBNDR_ALIGN_FLAGS) { >+ if (ndr->flags & LIBNDR_FLAG_REMAINING) { >+ } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) { > if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > blob.length = NDR_ALIGN(ndr, 2); > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { >@@ -1035,7 +1036,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flag > { > uint32_t length = 0; > >- if (ndr->flags & LIBNDR_ALIGN_FLAGS) { >+ if (ndr->flags & LIBNDR_FLAG_REMAINING) { >+ length = ndr->data_size - ndr->offset; >+ } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) { > if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > length = NDR_ALIGN(ndr, 2); > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { >@@ -1046,8 +1049,6 @@ _PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flag > if (ndr->data_size - ndr->offset < length) { > length = ndr->data_size - ndr->offset; > } >- } else if (ndr->flags & LIBNDR_FLAG_REMAINING) { >- length = ndr->data_size - ndr->offset; > } else { > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &length)); > } >-- >1.7.0.4 > > >From ba33e2a67b0b51d2beb158e80734887c0c7f1b52 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 22 Feb 2011 15:45:44 +0100 >Subject: [PATCH 04/10] librpc/ndr: ndr align relative pointers based on the given flags > >We used to do this only for the reverse relative pointers >and now we always do it. > >metze >(cherry picked from commit 84b884eb4bec38b721d6c38704f12d1d2c601bcb) >(cherry picked from commit 6648ce8990a97da739d4be69657e9ace6198068c) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/ndr/ndr.c | 26 ++++++++++++++++++++++++++ > 1 files changed, 26 insertions(+), 0 deletions(-) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 5030443..42d0e81 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1105,6 +1105,32 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, co > return NDR_ERR_SUCCESS; > } > if (!(ndr->flags & LIBNDR_FLAG_RELATIVE_REVERSE)) { >+ uint32_t relative_offset; >+ size_t pad; >+ /* TODO: remove this hack and let the idl use FLAG_ALIGN2 explicit */ >+ size_t align = 2; >+ >+ if (ndr->offset < ndr->relative_base_offset) { >+ return ndr_push_error(ndr, NDR_ERR_BUFSIZE, >+ "ndr_push_relative_ptr2_start ndr->offset(%u) < ndr->relative_base_offset(%u)", >+ ndr->offset, ndr->relative_base_offset); >+ } >+ >+ relative_offset = ndr->offset - ndr->relative_base_offset; >+ >+ if (ndr->flags & LIBNDR_FLAG_ALIGN2) { >+ align = 2; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { >+ align = 4; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN8) { >+ align = 8; >+ } >+ >+ pad = ndr_align_size(relative_offset, align); >+ if (pad) { >+ NDR_CHECK(ndr_push_zero(ndr, pad)); >+ } >+ > return ndr_push_relative_ptr2(ndr, p); > } > if (ndr->relative_end_offset == -1) { >-- >1.7.0.4 > > >From 6852dcfbbefe000b5290752426ee392311ce8957 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 22 Feb 2011 15:57:21 +0100 >Subject: [PATCH 05/10] librpc: align nstring and nstring_array to 2 byte > >metze >(cherry picked from commit 712ef2590d0ee59a4a659926cdf8aac6e968dfa8) >(cherry picked from commit 0fb64a26b3b35b75f2f548d882bed41aa0386c6b) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/idl/idl_types.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > >diff --git a/librpc/idl/idl_types.h b/librpc/idl/idl_types.h >index 3c6c12c..88ece20 100644 >--- a/librpc/idl/idl_types.h >+++ b/librpc/idl/idl_types.h >@@ -12,7 +12,7 @@ > /* > a null terminated UCS2 string > */ >-#define nstring [flag(STR_NULLTERM)] string >+#define nstring [flag(STR_NULLTERM|NDR_ALIGN2)] string > > /* > an ascii string prefixed with [offset] [length], both 32 bits >@@ -50,7 +50,7 @@ > /* > a null terminated UCS2 string > */ >-#define nstring_array [flag(STR_NULLTERM)] string_array >+#define nstring_array [flag(STR_NULLTERM|NDR_ALIGN2)] string_array > > #define NDR_NOALIGN LIBNDR_FLAG_NOALIGN > #define NDR_REMAINING LIBNDR_FLAG_REMAINING >-- >1.7.0.4 > > >From 8dd777e8b63405f05ddf9db86836aa431a59344d Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 22 Feb 2011 15:58:45 +0100 >Subject: [PATCH 06/10] librpc/ndr: remove align2 hack for relative pointers > >metze >(cherry picked from commit 23f6f449792d889538e0d0028bb8fbd5c807b0da) >(cherry picked from commit 9313b5d1da24406dd7d26afb2488fee0cbea44a9) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/ndr/ndr.c | 6 +----- > 1 files changed, 1 insertions(+), 5 deletions(-) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 42d0e81..9f2042d 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1107,8 +1107,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, co > if (!(ndr->flags & LIBNDR_FLAG_RELATIVE_REVERSE)) { > uint32_t relative_offset; > size_t pad; >- /* TODO: remove this hack and let the idl use FLAG_ALIGN2 explicit */ >- size_t align = 2; >+ size_t align = 1; > > if (ndr->offset < ndr->relative_base_offset) { > return ndr_push_error(ndr, NDR_ERR_BUFSIZE, >@@ -1197,9 +1196,6 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, cons > /* the reversed offset is at the end of the main buffer */ > correct_offset = ndr->relative_end_offset - len; > >- /* TODO: remove this hack and let the idl use FLAG_ALIGN2 explicit */ >- align = 2; >- > if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > align = 2; > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { >-- >1.7.0.4 > > >From 19fb2559e0a96fdf7666e87b1fe547069f306386 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 22 Feb 2011 19:23:33 +0100 >Subject: [PATCH 07/10] spoolss.idl: align spoolss_PrinterEnumValues 'data' based on the type > >metze >(cherry picked from commit 341330600aebcec92fba64ea343888c15a0c3d44) >(cherry picked from commit 757471a5fcd4f95da28402bae6c9ceccff7d6548) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/idl/spoolss.idl | 2 +- > librpc/ndr/ndr_spoolss_buf.c | 32 ++++++++++++++++++++++++++++++++ > librpc/ndr/ndr_spoolss_buf.h | 1 + > 3 files changed, 34 insertions(+), 1 deletions(-) > >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index e0d9d2f..4b277f8 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -2550,7 +2550,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") > [relative] nstring *value_name; > [value(2*strlen_m_term(value_name))] uint32 value_name_len; > winreg_Type type; >- [relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING)] DATA_BLOB *data; >+ [relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type))] DATA_BLOB *data; > [value(data ? data->length : 0)] uint32 data_length; > } spoolss_PrinterEnumValues; > >diff --git a/librpc/ndr/ndr_spoolss_buf.c b/librpc/ndr/ndr_spoolss_buf.c >index 811a8e2..e132e70 100644 >--- a/librpc/ndr/ndr_spoolss_buf.c >+++ b/librpc/ndr/ndr_spoolss_buf.c >@@ -1409,3 +1409,35 @@ _PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, co > ndr->depth--; > talloc_free(str); > } >+ >+_PUBLIC_ uint32_t ndr_spoolss_PrinterEnumValues_align(enum winreg_Type type) >+{ >+ switch(type) { >+ case REG_NONE: >+ return 0; >+ case REG_SZ: >+ return LIBNDR_FLAG_ALIGN2; >+ case REG_EXPAND_SZ: >+ return LIBNDR_FLAG_ALIGN2; >+ case REG_BINARY: >+ return 0; >+ case REG_DWORD: >+ return LIBNDR_FLAG_ALIGN4; >+ case REG_DWORD_BIG_ENDIAN: >+ return LIBNDR_FLAG_ALIGN4; >+ case REG_LINK: >+ return 0; >+ case REG_MULTI_SZ: >+ return LIBNDR_FLAG_ALIGN2; >+ case REG_RESOURCE_LIST: >+ return LIBNDR_FLAG_ALIGN2; >+ case REG_FULL_RESOURCE_DESCRIPTOR: >+ return LIBNDR_FLAG_ALIGN4; >+ case REG_RESOURCE_REQUIREMENTS_LIST: >+ return LIBNDR_FLAG_ALIGN2; >+ case REG_QWORD: >+ return LIBNDR_FLAG_ALIGN8; >+ } >+ >+ return 0; >+} >diff --git a/librpc/ndr/ndr_spoolss_buf.h b/librpc/ndr/ndr_spoolss_buf.h >index 89dcb46..0b75de0 100644 >--- a/librpc/ndr/ndr_spoolss_buf.h >+++ b/librpc/ndr/ndr_spoolss_buf.h >@@ -52,6 +52,7 @@ void ndr_print_spoolss_security_descriptor(struct ndr_print *ndr, const char *na > enum ndr_err_code ndr_pull_spoolss_security_descriptor(struct ndr_pull *ndr, int ndr_flags, struct security_descriptor *r); > enum ndr_err_code ndr_push_spoolss_security_descriptor(struct ndr_push *ndr, int ndr_flags, const struct security_descriptor *r); > _PUBLIC_ void ndr_print_spoolss_Time(struct ndr_print *ndr, const char *name, const struct spoolss_Time *r); >+_PUBLIC_ uint32_t ndr_spoolss_PrinterEnumValues_align(enum winreg_Type type); > > #undef _PRINTF_ATTRIBUTE > #define _PRINTF_ATTRIBUTE(a1, a2) >-- >1.7.0.4 > > >From 0ea41cc191904b92537401549cf6efa567ab0899 Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 22 Feb 2011 15:56:30 +0100 >Subject: [PATCH 08/10] spoolss.idl: align spoolss_DriverFileInfo relative pointer to 4 byte > >metze >(cherry picked from commit b6ece01c7922adeb3c9e718bc8cc610cae7c543c) >(cherry picked from commit ba1a72cb153892e491af91a6bb61e1820135fa12) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/idl/spoolss.idl | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > >diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl >index 4b277f8..d17b0b4 100644 >--- a/librpc/idl/spoolss.idl >+++ b/librpc/idl/spoolss.idl >@@ -1256,7 +1256,7 @@ cpp_quote("#define spoolss_security_descriptor security_descriptor") > spoolss_DriverOSVersion version; > [relative] nstring *driver_name; > [relative] nstring *architecture; >- [relative] [size_is(file_count)] spoolss_DriverFileInfo *file_info; >+ [relative,size_is(file_count),flag(NDR_ALIGN4)] spoolss_DriverFileInfo *file_info; > uint32 file_count; > [relative] nstring *monitor_name; > [relative] nstring *default_datatype; >-- >1.7.0.4 > > >From c8650bcbc0d5e9f23ee8661df7dc86a23c6c10aa Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Tue, 1 Mar 2011 14:20:32 +0100 >Subject: [PATCH 09/10] librpc/ndr: handle NOALIGN flag for relative pointers and alignment DATA_BLOBs > >metze > >Autobuild-User: Stefan Metzmacher <metze@samba.org> >Autobuild-Date: Tue Mar 1 17:11:03 CET 2011 on sn-devel-104 >(cherry picked from commit ef224aa004d5f1726d8dca020e0ef96d8c58565e) >(cherry picked from commit 1ea17bacdb09d28a12a8b6ddeba3ac285cd9f905) > >Signed-off-by: Stefan Metzmacher <metze@samba.org> >--- > librpc/ndr/ndr.c | 8 ++++++-- > librpc/ndr/ndr_basic.c | 11 ++++++++--- > 2 files changed, 14 insertions(+), 5 deletions(-) > >diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c >index 9f2042d..2439374 100644 >--- a/librpc/ndr/ndr.c >+++ b/librpc/ndr/ndr.c >@@ -1117,7 +1117,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_start(struct ndr_push *ndr, co > > relative_offset = ndr->offset - ndr->relative_base_offset; > >- if (ndr->flags & LIBNDR_FLAG_ALIGN2) { >+ if (ndr->flags & LIBNDR_FLAG_NOALIGN) { >+ align = 1; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > align = 2; > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { > align = 4; >@@ -1196,7 +1198,9 @@ _PUBLIC_ enum ndr_err_code ndr_push_relative_ptr2_end(struct ndr_push *ndr, cons > /* the reversed offset is at the end of the main buffer */ > correct_offset = ndr->relative_end_offset - len; > >- if (ndr->flags & LIBNDR_FLAG_ALIGN2) { >+ if (ndr->flags & LIBNDR_FLAG_NOALIGN) { >+ align = 1; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > align = 2; > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { > align = 4; >diff --git a/librpc/ndr/ndr_basic.c b/librpc/ndr/ndr_basic.c >index f913eff..64ea6d7 100644 >--- a/librpc/ndr/ndr_basic.c >+++ b/librpc/ndr/ndr_basic.c >@@ -1012,8 +1012,11 @@ _PUBLIC_ void ndr_print_DATA_BLOB(struct ndr_print *ndr, const char *name, DATA_ > _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flags, DATA_BLOB blob) > { > if (ndr->flags & LIBNDR_FLAG_REMAINING) { >+ /* nothing to do */ > } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) { >- if (ndr->flags & LIBNDR_FLAG_ALIGN2) { >+ if (ndr->flags & LIBNDR_FLAG_NOALIGN) { >+ blob.length = 0; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > blob.length = NDR_ALIGN(ndr, 2); > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { > blob.length = NDR_ALIGN(ndr, 4); >@@ -1022,7 +1025,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_DATA_BLOB(struct ndr_push *ndr, int ndr_flag > } > NDR_PUSH_ALLOC_SIZE(ndr, blob.data, blob.length); > data_blob_clear(&blob); >- } else if (!(ndr->flags & LIBNDR_FLAG_REMAINING)) { >+ } else { > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, blob.length)); > } > NDR_CHECK(ndr_push_bytes(ndr, blob.data, blob.length)); >@@ -1039,7 +1042,9 @@ _PUBLIC_ enum ndr_err_code ndr_pull_DATA_BLOB(struct ndr_pull *ndr, int ndr_flag > if (ndr->flags & LIBNDR_FLAG_REMAINING) { > length = ndr->data_size - ndr->offset; > } else if (ndr->flags & LIBNDR_ALIGN_FLAGS) { >- if (ndr->flags & LIBNDR_FLAG_ALIGN2) { >+ if (ndr->flags & LIBNDR_FLAG_NOALIGN) { >+ length = 0; >+ } else if (ndr->flags & LIBNDR_FLAG_ALIGN2) { > length = NDR_ALIGN(ndr, 2); > } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) { > length = NDR_ALIGN(ndr, 4); >-- >1.7.0.4 > > >From 21892e628352d59fd1e552da64ed27d48feb6deb Mon Sep 17 00:00:00 2001 >From: Stefan Metzmacher <metze@samba.org> >Date: Wed, 2 Mar 2011 10:14:54 +0100 >Subject: [PATCH 10/10] rerun 'make samba3-idl' > >metze >--- > librpc/gen_ndr/drsblobs.h | 4 +- > librpc/gen_ndr/eventlog.h | 12 +- > librpc/gen_ndr/misc.h | 4 +- > librpc/gen_ndr/nbt.h | 26 +- > librpc/gen_ndr/ndr_drsblobs.c | 16 +- > librpc/gen_ndr/ndr_eventlog.c | 24 +- > librpc/gen_ndr/ndr_misc.c | 12 +- > librpc/gen_ndr/ndr_nbt.c | 44 +- > librpc/gen_ndr/ndr_netlogon.c | 8 +- > librpc/gen_ndr/ndr_spoolss.c | 1056 ++++++++++++++++++++-------------------- > librpc/gen_ndr/ndr_svcctl.c | 40 +- > librpc/gen_ndr/netlogon.h | 4 +- > librpc/gen_ndr/spoolss.h | 304 ++++++------ > librpc/gen_ndr/svcctl.h | 10 +- > 14 files changed, 782 insertions(+), 782 deletions(-) > >diff --git a/librpc/gen_ndr/drsblobs.h b/librpc/gen_ndr/drsblobs.h >index 64f6ce8..f4adc57 100644 >--- a/librpc/gen_ndr/drsblobs.h >+++ b/librpc/gen_ndr/drsblobs.h >@@ -84,9 +84,9 @@ struct repsFromTo1 { > > struct repsFromTo2OtherInfo { > uint32_t __ndr_size;/* [value(ndr_size_repsFromTo2OtherInfo(this,ndr->iconv_convenience,ndr->flags))] */ >- const char * dns_name1;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * dns_name1;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t unknown1; >- const char * dns_name2;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * dns_name2;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint64_t unknown2; > }/* [relative_base,gensize,public] */; > >diff --git a/librpc/gen_ndr/eventlog.h b/librpc/gen_ndr/eventlog.h >index dc2e877..2ff0cbc 100644 >--- a/librpc/gen_ndr/eventlog.h >+++ b/librpc/gen_ndr/eventlog.h >@@ -59,13 +59,13 @@ struct eventlog_Record_tdb { > uint32_t data_length;/* [value(data.length)] */ > uint32_t data_offset; > uint32_t source_name_len;/* [value(2*strlen_m_term(source_name))] */ >- const char * source_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * source_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t computer_name_len;/* [value(2*strlen_m_term(computer_name))] */ >- const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t sid_padding; > DATA_BLOB sid; > uint32_t strings_len;/* [value(2*ndr_size_string_array(strings,num_of_strings,LIBNDR_FLAG_STR_NULLTERM))] */ >- const char * *strings;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * *strings;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > DATA_BLOB data; > uint32_t padding; > }/* [public,flag(LIBNDR_FLAG_NOALIGN|LIBNDR_PRINT_ARRAY_HEX)] */; >@@ -119,10 +119,10 @@ struct EVENTLOGRECORD { > uint32_t UserSidOffset;/* [value(56+2*(strlen_m_term(SourceName)+strlen_m_term(Computername)))] */ > uint32_t DataLength; > uint32_t DataOffset;/* [value(56+2*(strlen_m_term(SourceName)+strlen_m_term(Computername))+UserSidLength+(2*ndr_size_string_array(Strings,NumStrings,LIBNDR_FLAG_STR_NULLTERM)))] */ >- const char * SourceName;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * Computername;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * SourceName;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * Computername;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct dom_sid0 UserSid;/* [subcontext_size(UserSidLength),subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >- const char * *Strings;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * *Strings;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint8_t *Data;/* [flag(LIBNDR_PRINT_ARRAY_HEX)] */ > const char * Pad;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > uint32_t Length2;/* [value(Length)] */ >diff --git a/librpc/gen_ndr/misc.h b/librpc/gen_ndr/misc.h >index 6672c61..90330b3 100644 >--- a/librpc/gen_ndr/misc.h >+++ b/librpc/gen_ndr/misc.h >@@ -84,10 +84,10 @@ enum winreg_Type > ; > > union winreg_Data { >- const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_SZ)] */ >+ const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2),case(REG_SZ)] */ > DATA_BLOB binary;/* [flag(LIBNDR_FLAG_REMAINING),case(REG_BINARY)] */ > uint32_t value;/* [case(REG_DWORD)] */ >- const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_MULTI_SZ)] */ >+ const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2),case(REG_MULTI_SZ)] */ > DATA_BLOB data;/* [flag(LIBNDR_FLAG_REMAINING),default] */ > }/* [public,nodiscriminant,flag(LIBNDR_FLAG_LITTLE_ENDIAN)] */; > >diff --git a/librpc/gen_ndr/nbt.h b/librpc/gen_ndr/nbt.h >index ec234e1..31ea414 100644 >--- a/librpc/gen_ndr/nbt.h >+++ b/librpc/gen_ndr/nbt.h >@@ -456,8 +456,8 @@ enum netlogon_command > > struct NETLOGON_SAM_LOGON_REQUEST { > uint16_t request_count; >- const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * computer_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > const char * mailslot_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > uint32_t acct_control; > uint32_t sid_size;/* [value(ndr_size_dom_sid0(&sid,ndr->flags))] */ >@@ -470,9 +470,9 @@ struct NETLOGON_SAM_LOGON_REQUEST { > > struct NETLOGON_SAM_LOGON_RESPONSE_NT40 { > enum netlogon_command command; >- const char * server;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * server;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t nt_version; > uint16_t lmnt_token; > uint16_t lm20_token; >@@ -480,9 +480,9 @@ struct NETLOGON_SAM_LOGON_RESPONSE_NT40 { > > struct NETLOGON_SAM_LOGON_RESPONSE { > enum netlogon_command command; >- const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * user_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct GUID domain_uuid; > struct GUID zero_uuid; > const char * forest; >@@ -520,7 +520,7 @@ struct nbt_netlogon_query_for_pdc { > const char * computer_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > const char * mailslot_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN2)] */ >- const char * unicode_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * unicode_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t nt_version; > uint16_t lmnt_token; > uint16_t lm20_token; >@@ -530,8 +530,8 @@ struct nbt_netlogon_response_from_pdc { > enum netlogon_command command; > const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN2)] */ >- const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * domain_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t nt_version; > uint16_t lmnt_token; > uint16_t lm20_token; >@@ -551,8 +551,8 @@ struct NETLOGON_DB_CHANGE { > const char * pdc_name;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > const char * domain;/* [flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > DATA_BLOB _pad;/* [flag(LIBNDR_FLAG_ALIGN2)] */ >- const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * unicode_domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * unicode_pdc_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * unicode_domain;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t db_count; > struct nbt_db_change_info *dbchange; > uint32_t sid_size;/* [value(ndr_size_dom_sid0(&sid,ndr->flags))] */ >diff --git a/librpc/gen_ndr/ndr_drsblobs.c b/librpc/gen_ndr/ndr_drsblobs.c >index 33ebf4c..948fdc5 100644 >--- a/librpc/gen_ndr/ndr_drsblobs.c >+++ b/librpc/gen_ndr/ndr_drsblobs.c >@@ -638,14 +638,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2OtherInfo(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_repsFromTo2OtherInfo(r, ndr->iconv_convenience, ndr->flags))); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dns_name1)); > ndr->flags = _flags_save_string; > } > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown1)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dns_name2)); > ndr->flags = _flags_save_string; > } >@@ -656,7 +656,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2OtherInfo(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dns_name1) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dns_name1)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dns_name1)); >@@ -666,7 +666,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_repsFromTo2OtherInfo(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dns_name2) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dns_name2)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dns_name2)); >@@ -692,7 +692,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_repsFromTo2OtherInfo(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->__ndr_size)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dns_name1)); > if (_ptr_dns_name1) { > NDR_PULL_ALLOC(ndr, r->dns_name1); >@@ -705,7 +705,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_repsFromTo2OtherInfo(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dns_name2)); > if (_ptr_dns_name2) { > NDR_PULL_ALLOC(ndr, r->dns_name2); >@@ -722,7 +722,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_repsFromTo2OtherInfo(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dns_name1) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -737,7 +737,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_repsFromTo2OtherInfo(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dns_name2) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >diff --git a/librpc/gen_ndr/ndr_eventlog.c b/librpc/gen_ndr/ndr_eventlog.c >index a7e502c..e0ac6d2 100644 >--- a/librpc/gen_ndr/ndr_eventlog.c >+++ b/librpc/gen_ndr/ndr_eventlog.c >@@ -121,14 +121,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_eventlog_Record_tdb(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2 * strlen_m_term(r->source_name))); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->source_name)); > ndr->flags = _flags_save_string; > } > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2 * strlen_m_term(r->computer_name))); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->computer_name)); > ndr->flags = _flags_save_string; > } >@@ -137,7 +137,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_eventlog_Record_tdb(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2 * ndr_size_string_array(r->strings, r->num_of_strings, LIBNDR_FLAG_STR_NULLTERM))); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > for (cntr_strings_0 = 0; cntr_strings_0 < r->num_of_strings; cntr_strings_0++) { > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->strings[cntr_strings_0])); > } >@@ -185,14 +185,14 @@ _PUBLIC_ enum ndr_err_code ndr_pull_eventlog_Record_tdb(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->source_name_len)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->source_name)); > ndr->flags = _flags_save_string; > } > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->computer_name_len)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->computer_name)); > ndr->flags = _flags_save_string; > } >@@ -201,7 +201,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_eventlog_Record_tdb(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->strings_len)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_PULL_ALLOC_N(ndr, r->strings, r->num_of_strings); > _mem_save_strings_0 = NDR_PULL_GET_MEM_CTX(ndr); > NDR_PULL_SET_MEM_CTX(ndr, r->strings, 0); >@@ -385,13 +385,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_EVENTLOGRECORD(struct ndr_push *ndr, int ndr > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 56 + 2 * (strlen_m_term(r->SourceName) + strlen_m_term(r->Computername)) + ndr_size_dom_sid0(&r->UserSid, ndr->flags) + (2 * ndr_size_string_array(r->Strings, r->NumStrings, LIBNDR_FLAG_STR_NULLTERM)))); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->SourceName)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->Computername)); > ndr->flags = _flags_save_string; > } >@@ -408,7 +408,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_EVENTLOGRECORD(struct ndr_push *ndr, int ndr > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > for (cntr_Strings_0 = 0; cntr_Strings_0 < r->NumStrings; cntr_Strings_0++) { > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->Strings[cntr_Strings_0])); > } >@@ -463,13 +463,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EVENTLOGRECORD(struct ndr_pull *ndr, int ndr > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->DataOffset)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->SourceName)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->Computername)); > ndr->flags = _flags_save_string; > } >@@ -486,7 +486,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_EVENTLOGRECORD(struct ndr_pull *ndr, int ndr > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_PULL_ALLOC_N(ndr, r->Strings, r->NumStrings); > _mem_save_Strings_0 = NDR_PULL_GET_MEM_CTX(ndr); > NDR_PULL_SET_MEM_CTX(ndr, r->Strings, 0); >diff --git a/librpc/gen_ndr/ndr_misc.c b/librpc/gen_ndr/ndr_misc.c >index 1f4d0c9..99cb045 100644 >--- a/librpc/gen_ndr/ndr_misc.c >+++ b/librpc/gen_ndr/ndr_misc.c >@@ -226,7 +226,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_winreg_Data(struct ndr_push *ndr, int ndr_fl > case REG_SZ: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->string)); > ndr->flags = _flags_save_string; > } >@@ -235,7 +235,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_winreg_Data(struct ndr_push *ndr, int ndr_fl > case REG_EXPAND_SZ: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->string)); > ndr->flags = _flags_save_string; > } >@@ -266,7 +266,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_winreg_Data(struct ndr_push *ndr, int ndr_fl > case REG_MULTI_SZ: { > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->string_array)); > ndr->flags = _flags_save_string_array; > } >@@ -333,7 +333,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_Data(struct ndr_pull *ndr, int ndr_fl > case REG_SZ: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->string)); > ndr->flags = _flags_save_string; > } >@@ -342,7 +342,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_Data(struct ndr_pull *ndr, int ndr_fl > case REG_EXPAND_SZ: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->string)); > ndr->flags = _flags_save_string; > } >@@ -373,7 +373,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_winreg_Data(struct ndr_pull *ndr, int ndr_fl > case REG_MULTI_SZ: { > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->string_array)); > ndr->flags = _flags_save_string_array; > } >diff --git a/librpc/gen_ndr/ndr_nbt.c b/librpc/gen_ndr/ndr_nbt.c >index 491dfd6..bffb25a 100644 >--- a/librpc/gen_ndr/ndr_nbt.c >+++ b/librpc/gen_ndr/ndr_nbt.c >@@ -1749,19 +1749,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE_NT40(struct ndr_ > NDR_CHECK(ndr_push_netlogon_command(ndr, NDR_SCALARS, r->command)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain)); > ndr->flags = _flags_save_string; > } >@@ -1787,19 +1787,19 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE_NT40(struct ndr_ > NDR_CHECK(ndr_pull_netlogon_command(ndr, NDR_SCALARS, &r->command)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->server)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->user_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain)); > ndr->flags = _flags_save_string; > } >@@ -1844,19 +1844,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_NETLOGON_SAM_LOGON_RESPONSE(struct ndr_push > NDR_CHECK(ndr_push_netlogon_command(ndr, NDR_SCALARS, r->command)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->pdc_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain_name)); > ndr->flags = _flags_save_string; > } >@@ -1889,19 +1889,19 @@ _PUBLIC_ enum ndr_err_code ndr_pull_NETLOGON_SAM_LOGON_RESPONSE(struct ndr_pull > NDR_CHECK(ndr_pull_netlogon_command(ndr, NDR_SCALARS, &r->command)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->pdc_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->user_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain_name)); > ndr->flags = _flags_save_string; > } >@@ -2082,7 +2082,7 @@ static enum ndr_err_code ndr_push_nbt_netlogon_query_for_pdc(struct ndr_push *nd > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_name)); > ndr->flags = _flags_save_string; > } >@@ -2120,7 +2120,7 @@ static enum ndr_err_code ndr_pull_nbt_netlogon_query_for_pdc(struct ndr_pull *nd > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_name)); > ndr->flags = _flags_save_string; > } >@@ -2170,13 +2170,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_nbt_netlogon_response_from_pdc(struct ndr_pu > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_pdc_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->domain_name)); > ndr->flags = _flags_save_string; > } >@@ -2214,13 +2214,13 @@ _PUBLIC_ enum ndr_err_code ndr_pull_nbt_netlogon_response_from_pdc(struct ndr_pu > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_pdc_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->domain_name)); > ndr->flags = _flags_save_string; > } >@@ -2323,13 +2323,13 @@ static enum ndr_err_code ndr_push_NETLOGON_DB_CHANGE(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_pdc_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->unicode_domain)); > ndr->flags = _flags_save_string; > } >@@ -2383,13 +2383,13 @@ static enum ndr_err_code ndr_pull_NETLOGON_DB_CHANGE(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_pdc_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->unicode_domain)); > ndr->flags = _flags_save_string; > } >diff --git a/librpc/gen_ndr/ndr_netlogon.c b/librpc/gen_ndr/ndr_netlogon.c >index 8773439..0ea551d 100644 >--- a/librpc/gen_ndr/ndr_netlogon.c >+++ b/librpc/gen_ndr/ndr_netlogon.c >@@ -6712,7 +6712,7 @@ static enum ndr_err_code ndr_push_netr_ChangeLogObject(struct ndr_push *ndr, int > case NETR_CHANGELOG_NAME_INCLUDED: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->object_name)); > ndr->flags = _flags_save_string; > } >@@ -6754,7 +6754,7 @@ static enum ndr_err_code ndr_pull_netr_ChangeLogObject(struct ndr_pull *ndr, int > case NETR_CHANGELOG_NAME_INCLUDED: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->object_name)); > ndr->flags = _flags_save_string; > } >@@ -7519,7 +7519,7 @@ static enum ndr_err_code ndr_push_netr_OsVersionInfoEx(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->PlatformId)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > { > struct ndr_push *_ndr_CSDVersion; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_CSDVersion, 0, 256)); >@@ -7551,7 +7551,7 @@ static enum ndr_err_code ndr_pull_netr_OsVersionInfoEx(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->PlatformId)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > { > struct ndr_pull *_ndr_CSDVersion; > NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_CSDVersion, 0, 256)); >diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c >index 18ca3f6..c94edef 100644 >--- a/librpc/gen_ndr/ndr_spoolss.c >+++ b/librpc/gen_ndr/ndr_spoolss.c >@@ -299,13 +299,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printername)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->servername)); > ndr->flags = _flags_save_string; > } >@@ -341,7 +341,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printername) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >@@ -351,7 +351,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo0(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->servername) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername)); >@@ -373,7 +373,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printername)); > if (_ptr_printername) { > NDR_PULL_ALLOC(ndr, r->printername); >@@ -385,7 +385,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_servername)); > if (_ptr_servername) { > NDR_PULL_ALLOC(ndr, r->servername); >@@ -427,7 +427,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -442,7 +442,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo0(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->servername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1271,19 +1271,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_spoolss_PrinterAttributes(ndr, NDR_SCALARS, r->flags)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->description)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->comment)); > ndr->flags = _flags_save_string; > } >@@ -1292,7 +1292,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->description) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->description)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description)); >@@ -1302,7 +1302,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->name)); >@@ -1312,7 +1312,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo1(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->comment) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->comment)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->comment)); >@@ -1337,7 +1337,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_spoolss_PrinterAttributes(ndr, NDR_SCALARS, &r->flags)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_description)); > if (_ptr_description) { > NDR_PULL_ALLOC(ndr, r->description); >@@ -1349,7 +1349,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name)); > if (_ptr_name) { > NDR_PULL_ALLOC(ndr, r->name); >@@ -1361,7 +1361,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_comment)); > if (_ptr_comment) { > NDR_PULL_ALLOC(ndr, r->comment); >@@ -1376,7 +1376,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->description) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1391,7 +1391,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1406,7 +1406,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo1(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->comment) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1486,7 +1486,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_servername)); > if (_ptr_servername) { > NDR_PULL_ALLOC(ndr, r->servername); >@@ -1498,7 +1498,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printername)); > if (_ptr_printername) { > NDR_PULL_ALLOC(ndr, r->printername); >@@ -1510,7 +1510,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sharename)); > if (_ptr_sharename) { > NDR_PULL_ALLOC(ndr, r->sharename); >@@ -1522,7 +1522,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_portname)); > if (_ptr_portname) { > NDR_PULL_ALLOC(ndr, r->portname); >@@ -1534,7 +1534,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_drivername)); > if (_ptr_drivername) { > NDR_PULL_ALLOC(ndr, r->drivername); >@@ -1546,7 +1546,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_comment)); > if (_ptr_comment) { > NDR_PULL_ALLOC(ndr, r->comment); >@@ -1558,7 +1558,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_location)); > if (_ptr_location) { > NDR_PULL_ALLOC(ndr, r->location); >@@ -1582,7 +1582,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_sepfile)); > if (_ptr_sepfile) { > NDR_PULL_ALLOC(ndr, r->sepfile); >@@ -1594,7 +1594,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printprocessor)); > if (_ptr_printprocessor) { > NDR_PULL_ALLOC(ndr, r->printprocessor); >@@ -1606,7 +1606,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_datatype)); > if (_ptr_datatype) { > NDR_PULL_ALLOC(ndr, r->datatype); >@@ -1618,7 +1618,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_parameters)); > if (_ptr_parameters) { > NDR_PULL_ALLOC(ndr, r->parameters); >@@ -1656,7 +1656,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->servername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1671,7 +1671,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1686,7 +1686,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->sharename) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1701,7 +1701,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->portname) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1716,7 +1716,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->drivername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1731,7 +1731,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->comment) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1746,7 +1746,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->location) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1781,7 +1781,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->sepfile) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1796,7 +1796,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printprocessor) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1811,7 +1811,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->datatype) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1826,7 +1826,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->parameters) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -2062,13 +2062,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printername)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->servername)); > ndr->flags = _flags_save_string; > } >@@ -2078,7 +2078,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printername) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >@@ -2088,7 +2088,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo4(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->servername) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->servername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->servername)); >@@ -2110,7 +2110,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo4(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printername)); > if (_ptr_printername) { > NDR_PULL_ALLOC(ndr, r->printername); >@@ -2122,7 +2122,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo4(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_servername)); > if (_ptr_servername) { > NDR_PULL_ALLOC(ndr, r->servername); >@@ -2138,7 +2138,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo4(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -2153,7 +2153,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo4(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->servername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -2201,13 +2201,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printername)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->portname)); > ndr->flags = _flags_save_string; > } >@@ -2219,7 +2219,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printername) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printername)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printername)); >@@ -2229,7 +2229,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo5(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->portname) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->portname)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->portname)); >@@ -2251,7 +2251,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo5(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printername)); > if (_ptr_printername) { > NDR_PULL_ALLOC(ndr, r->printername); >@@ -2263,7 +2263,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo5(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_portname)); > if (_ptr_portname) { > NDR_PULL_ALLOC(ndr, r->portname); >@@ -2281,7 +2281,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo5(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printername) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -2296,7 +2296,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo5(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->portname) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -2409,7 +2409,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo7(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->guid)); > ndr->flags = _flags_save_string; > } >@@ -2419,7 +2419,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterInfo7(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->guid) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->guid)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->guid)); >@@ -2439,7 +2439,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo7(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_guid)); > if (_ptr_guid) { > NDR_PULL_ALLOC(ndr, r->guid); >@@ -2455,7 +2455,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterInfo7(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->guid) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -2975,37 +2975,37 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->job_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printer_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->server_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->user_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->document_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_type)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->text_status)); > ndr->flags = _flags_save_string; > } >@@ -3020,7 +3020,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printer_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printer_name)); >@@ -3030,7 +3030,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->server_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->server_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server_name)); >@@ -3040,7 +3040,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->user_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->user_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); >@@ -3050,7 +3050,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->document_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->document_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->document_name)); >@@ -3060,7 +3060,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_type) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_type)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_type)); >@@ -3070,7 +3070,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo1(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->text_status) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->text_status)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->text_status)); >@@ -3101,7 +3101,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->job_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printer_name)); > if (_ptr_printer_name) { > NDR_PULL_ALLOC(ndr, r->printer_name); >@@ -3113,7 +3113,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_server_name)); > if (_ptr_server_name) { > NDR_PULL_ALLOC(ndr, r->server_name); >@@ -3125,7 +3125,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_user_name)); > if (_ptr_user_name) { > NDR_PULL_ALLOC(ndr, r->user_name); >@@ -3137,7 +3137,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_document_name)); > if (_ptr_document_name) { > NDR_PULL_ALLOC(ndr, r->document_name); >@@ -3149,7 +3149,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_type)); > if (_ptr_data_type) { > NDR_PULL_ALLOC(ndr, r->data_type); >@@ -3161,7 +3161,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_text_status)); > if (_ptr_text_status) { > NDR_PULL_ALLOC(ndr, r->text_status); >@@ -3185,7 +3185,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printer_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3200,7 +3200,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->server_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3215,7 +3215,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->user_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3230,7 +3230,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->document_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3245,7 +3245,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_type) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3260,7 +3260,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo1(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->text_status) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3339,55 +3339,55 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->job_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printer_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->server_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->user_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->document_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->notify_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_type)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->print_processor)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->parameters)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } >@@ -3399,7 +3399,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->text_status)); > ndr->flags = _flags_save_string; > } >@@ -3424,7 +3424,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printer_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printer_name)); >@@ -3434,7 +3434,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->server_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->server_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server_name)); >@@ -3444,7 +3444,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->user_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->user_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); >@@ -3454,7 +3454,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->document_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->document_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->document_name)); >@@ -3464,7 +3464,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->notify_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->notify_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->notify_name)); >@@ -3474,7 +3474,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_type) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_type)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_type)); >@@ -3484,7 +3484,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor)); >@@ -3494,7 +3494,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->parameters) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters)); >@@ -3504,7 +3504,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -3529,7 +3529,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo2(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->text_status) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->text_status)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->text_status)); >@@ -3587,7 +3587,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->job_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printer_name)); > if (_ptr_printer_name) { > NDR_PULL_ALLOC(ndr, r->printer_name); >@@ -3599,7 +3599,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_server_name)); > if (_ptr_server_name) { > NDR_PULL_ALLOC(ndr, r->server_name); >@@ -3611,7 +3611,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_user_name)); > if (_ptr_user_name) { > NDR_PULL_ALLOC(ndr, r->user_name); >@@ -3623,7 +3623,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_document_name)); > if (_ptr_document_name) { > NDR_PULL_ALLOC(ndr, r->document_name); >@@ -3635,7 +3635,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_notify_name)); > if (_ptr_notify_name) { > NDR_PULL_ALLOC(ndr, r->notify_name); >@@ -3647,7 +3647,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_type)); > if (_ptr_data_type) { > NDR_PULL_ALLOC(ndr, r->data_type); >@@ -3659,7 +3659,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_print_processor)); > if (_ptr_print_processor) { > NDR_PULL_ALLOC(ndr, r->print_processor); >@@ -3671,7 +3671,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_parameters)); > if (_ptr_parameters) { > NDR_PULL_ALLOC(ndr, r->parameters); >@@ -3683,7 +3683,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -3707,7 +3707,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_text_status)); > if (_ptr_text_status) { > NDR_PULL_ALLOC(ndr, r->text_status); >@@ -3747,7 +3747,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printer_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3762,7 +3762,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->server_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3777,7 +3777,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->user_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3792,7 +3792,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->document_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3807,7 +3807,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->notify_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3822,7 +3822,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_type) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3837,7 +3837,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3852,7 +3852,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->parameters) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3867,7 +3867,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -3902,7 +3902,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo2(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->text_status) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4084,55 +4084,55 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->job_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->printer_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->server_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->user_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->document_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->notify_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_type)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->print_processor)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->parameters)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } >@@ -4144,7 +4144,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->text_status)); > ndr->flags = _flags_save_string; > } >@@ -4170,7 +4170,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printer_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->printer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->printer_name)); >@@ -4180,7 +4180,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->server_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->server_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->server_name)); >@@ -4190,7 +4190,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->user_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->user_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->user_name)); >@@ -4200,7 +4200,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->document_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->document_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->document_name)); >@@ -4210,7 +4210,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->notify_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->notify_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->notify_name)); >@@ -4220,7 +4220,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_type) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_type)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_type)); >@@ -4230,7 +4230,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor)); >@@ -4240,7 +4240,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->parameters) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->parameters)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->parameters)); >@@ -4250,7 +4250,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -4275,7 +4275,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_JobInfo4(struct ndr_push *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->text_status) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->text_status)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->text_status)); >@@ -4333,7 +4333,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->job_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_printer_name)); > if (_ptr_printer_name) { > NDR_PULL_ALLOC(ndr, r->printer_name); >@@ -4345,7 +4345,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_server_name)); > if (_ptr_server_name) { > NDR_PULL_ALLOC(ndr, r->server_name); >@@ -4357,7 +4357,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_user_name)); > if (_ptr_user_name) { > NDR_PULL_ALLOC(ndr, r->user_name); >@@ -4369,7 +4369,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_document_name)); > if (_ptr_document_name) { > NDR_PULL_ALLOC(ndr, r->document_name); >@@ -4381,7 +4381,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_notify_name)); > if (_ptr_notify_name) { > NDR_PULL_ALLOC(ndr, r->notify_name); >@@ -4393,7 +4393,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_type)); > if (_ptr_data_type) { > NDR_PULL_ALLOC(ndr, r->data_type); >@@ -4405,7 +4405,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_print_processor)); > if (_ptr_print_processor) { > NDR_PULL_ALLOC(ndr, r->print_processor); >@@ -4417,7 +4417,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_parameters)); > if (_ptr_parameters) { > NDR_PULL_ALLOC(ndr, r->parameters); >@@ -4429,7 +4429,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -4453,7 +4453,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_text_status)); > if (_ptr_text_status) { > NDR_PULL_ALLOC(ndr, r->text_status); >@@ -4494,7 +4494,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->printer_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4509,7 +4509,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->server_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4524,7 +4524,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->user_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4539,7 +4539,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->document_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4554,7 +4554,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->notify_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4569,7 +4569,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_type) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4584,7 +4584,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4599,7 +4599,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->parameters) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4614,7 +4614,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -4649,7 +4649,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_JobInfo4(struct ndr_pull *ndr, int n > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->text_status) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -7959,7 +7959,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_StringArray(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, (ndr_size_spoolss_StringArray(r, ndr->iconv_convenience, ndr->flags) - 4) / 2)); > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->string)); > ndr->flags = _flags_save_string_array; > } >@@ -7977,7 +7977,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_StringArray(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->_ndr_size)); > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->string)); > ndr->flags = _flags_save_string_array; > } >@@ -10453,7 +10453,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo1(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } >@@ -10462,7 +10462,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo1(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -10482,7 +10482,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo1(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -10497,7 +10497,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo1(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -10539,31 +10539,31 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS, r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->architecture)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_path)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->config_file)); > ndr->flags = _flags_save_string; > } >@@ -10572,7 +10572,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -10582,7 +10582,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >@@ -10592,7 +10592,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >@@ -10602,7 +10602,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >@@ -10612,7 +10612,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo2(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >@@ -10641,7 +10641,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS, &r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -10653,7 +10653,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_architecture)); > if (_ptr_architecture) { > NDR_PULL_ALLOC(ndr, r->architecture); >@@ -10665,7 +10665,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_path)); > if (_ptr_driver_path) { > NDR_PULL_ALLOC(ndr, r->driver_path); >@@ -10677,7 +10677,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_file)); > if (_ptr_data_file) { > NDR_PULL_ALLOC(ndr, r->data_file); >@@ -10689,7 +10689,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_config_file)); > if (_ptr_config_file) { > NDR_PULL_ALLOC(ndr, r->config_file); >@@ -10704,7 +10704,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -10719,7 +10719,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -10734,7 +10734,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -10749,7 +10749,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -10764,7 +10764,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo2(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -10831,55 +10831,55 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS, r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->architecture)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_path)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->config_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->help_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dependent_files)); > ndr->flags = _flags_save_string_array; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->default_datatype)); > ndr->flags = _flags_save_string; > } >@@ -10888,7 +10888,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -10898,7 +10898,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >@@ -10908,7 +10908,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >@@ -10918,7 +10918,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >@@ -10928,7 +10928,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >@@ -10938,7 +10938,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >@@ -10948,7 +10948,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >@@ -10958,7 +10958,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >@@ -10968,7 +10968,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo3(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >@@ -11005,7 +11005,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS, &r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -11017,7 +11017,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_architecture)); > if (_ptr_architecture) { > NDR_PULL_ALLOC(ndr, r->architecture); >@@ -11029,7 +11029,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_path)); > if (_ptr_driver_path) { > NDR_PULL_ALLOC(ndr, r->driver_path); >@@ -11041,7 +11041,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_file)); > if (_ptr_data_file) { > NDR_PULL_ALLOC(ndr, r->data_file); >@@ -11053,7 +11053,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_config_file)); > if (_ptr_config_file) { > NDR_PULL_ALLOC(ndr, r->config_file); >@@ -11065,7 +11065,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_help_file)); > if (_ptr_help_file) { > NDR_PULL_ALLOC(ndr, r->help_file); >@@ -11077,7 +11077,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dependent_files)); > if (_ptr_dependent_files) { > NDR_PULL_ALLOC(ndr, r->dependent_files); >@@ -11089,7 +11089,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name)); > if (_ptr_monitor_name) { > NDR_PULL_ALLOC(ndr, r->monitor_name); >@@ -11101,7 +11101,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_default_datatype)); > if (_ptr_default_datatype) { > NDR_PULL_ALLOC(ndr, r->default_datatype); >@@ -11116,7 +11116,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11131,7 +11131,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11146,7 +11146,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11161,7 +11161,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11176,7 +11176,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11191,7 +11191,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11206,7 +11206,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11221,7 +11221,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11236,7 +11236,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo3(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11327,61 +11327,61 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS, r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->architecture)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_path)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->config_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->help_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dependent_files)); > ndr->flags = _flags_save_string_array; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->default_datatype)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->previous_names)); > ndr->flags = _flags_save_string_array; > } >@@ -11390,7 +11390,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -11400,7 +11400,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >@@ -11410,7 +11410,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >@@ -11420,7 +11420,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >@@ -11430,7 +11430,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >@@ -11440,7 +11440,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >@@ -11450,7 +11450,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >@@ -11460,7 +11460,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >@@ -11470,7 +11470,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >@@ -11480,7 +11480,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo4(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->previous_names) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous_names)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names)); >@@ -11519,7 +11519,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS, &r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -11531,7 +11531,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_architecture)); > if (_ptr_architecture) { > NDR_PULL_ALLOC(ndr, r->architecture); >@@ -11543,7 +11543,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_path)); > if (_ptr_driver_path) { > NDR_PULL_ALLOC(ndr, r->driver_path); >@@ -11555,7 +11555,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_file)); > if (_ptr_data_file) { > NDR_PULL_ALLOC(ndr, r->data_file); >@@ -11567,7 +11567,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_config_file)); > if (_ptr_config_file) { > NDR_PULL_ALLOC(ndr, r->config_file); >@@ -11579,7 +11579,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_help_file)); > if (_ptr_help_file) { > NDR_PULL_ALLOC(ndr, r->help_file); >@@ -11591,7 +11591,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dependent_files)); > if (_ptr_dependent_files) { > NDR_PULL_ALLOC(ndr, r->dependent_files); >@@ -11603,7 +11603,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name)); > if (_ptr_monitor_name) { > NDR_PULL_ALLOC(ndr, r->monitor_name); >@@ -11615,7 +11615,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_default_datatype)); > if (_ptr_default_datatype) { > NDR_PULL_ALLOC(ndr, r->default_datatype); >@@ -11627,7 +11627,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_previous_names)); > if (_ptr_previous_names) { > NDR_PULL_ALLOC(ndr, r->previous_names); >@@ -11642,7 +11642,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11657,7 +11657,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11672,7 +11672,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11687,7 +11687,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11702,7 +11702,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11717,7 +11717,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11732,7 +11732,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11747,7 +11747,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11762,7 +11762,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11777,7 +11777,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo4(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->previous_names) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -11874,31 +11874,31 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS, r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->architecture)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_path)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->config_file)); > ndr->flags = _flags_save_string; > } >@@ -11910,7 +11910,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -11920,7 +11920,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >@@ -11930,7 +11930,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >@@ -11940,7 +11940,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >@@ -11950,7 +11950,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo5(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >@@ -11979,7 +11979,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS, &r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -11991,7 +11991,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_architecture)); > if (_ptr_architecture) { > NDR_PULL_ALLOC(ndr, r->architecture); >@@ -12003,7 +12003,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_path)); > if (_ptr_driver_path) { > NDR_PULL_ALLOC(ndr, r->driver_path); >@@ -12015,7 +12015,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_file)); > if (_ptr_data_file) { > NDR_PULL_ALLOC(ndr, r->data_file); >@@ -12027,7 +12027,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_config_file)); > if (_ptr_config_file) { > NDR_PULL_ALLOC(ndr, r->config_file); >@@ -12045,7 +12045,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12060,7 +12060,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12075,7 +12075,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12090,7 +12090,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12105,7 +12105,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo5(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12175,61 +12175,61 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS, r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->architecture)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_path)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->config_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->help_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dependent_files)); > ndr->flags = _flags_save_string_array; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->default_datatype)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->previous_names)); > ndr->flags = _flags_save_string_array; > } >@@ -12237,25 +12237,25 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->driver_version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->manufacturer_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->manufacturer_url)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->hardware_id)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->provider)); > ndr->flags = _flags_save_string; > } >@@ -12264,7 +12264,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -12274,7 +12274,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >@@ -12284,7 +12284,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >@@ -12294,7 +12294,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >@@ -12304,7 +12304,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >@@ -12314,7 +12314,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >@@ -12324,7 +12324,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >@@ -12334,7 +12334,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >@@ -12344,7 +12344,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >@@ -12354,7 +12354,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->previous_names) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous_names)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names)); >@@ -12364,7 +12364,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_name)); >@@ -12374,7 +12374,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_url) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_url)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_url)); >@@ -12384,7 +12384,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->hardware_id) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->hardware_id)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->hardware_id)); >@@ -12394,7 +12394,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo6(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->provider) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->provider)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->provider)); >@@ -12441,7 +12441,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS, &r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -12453,7 +12453,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_architecture)); > if (_ptr_architecture) { > NDR_PULL_ALLOC(ndr, r->architecture); >@@ -12465,7 +12465,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_path)); > if (_ptr_driver_path) { > NDR_PULL_ALLOC(ndr, r->driver_path); >@@ -12477,7 +12477,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_file)); > if (_ptr_data_file) { > NDR_PULL_ALLOC(ndr, r->data_file); >@@ -12489,7 +12489,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_config_file)); > if (_ptr_config_file) { > NDR_PULL_ALLOC(ndr, r->config_file); >@@ -12501,7 +12501,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_help_file)); > if (_ptr_help_file) { > NDR_PULL_ALLOC(ndr, r->help_file); >@@ -12513,7 +12513,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dependent_files)); > if (_ptr_dependent_files) { > NDR_PULL_ALLOC(ndr, r->dependent_files); >@@ -12525,7 +12525,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name)); > if (_ptr_monitor_name) { > NDR_PULL_ALLOC(ndr, r->monitor_name); >@@ -12537,7 +12537,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_default_datatype)); > if (_ptr_default_datatype) { > NDR_PULL_ALLOC(ndr, r->default_datatype); >@@ -12549,7 +12549,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_previous_names)); > if (_ptr_previous_names) { > NDR_PULL_ALLOC(ndr, r->previous_names); >@@ -12563,7 +12563,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->driver_version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_manufacturer_name)); > if (_ptr_manufacturer_name) { > NDR_PULL_ALLOC(ndr, r->manufacturer_name); >@@ -12575,7 +12575,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_manufacturer_url)); > if (_ptr_manufacturer_url) { > NDR_PULL_ALLOC(ndr, r->manufacturer_url); >@@ -12587,7 +12587,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_hardware_id)); > if (_ptr_hardware_id) { > NDR_PULL_ALLOC(ndr, r->hardware_id); >@@ -12599,7 +12599,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_provider)); > if (_ptr_provider) { > NDR_PULL_ALLOC(ndr, r->provider); >@@ -12614,7 +12614,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12629,7 +12629,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12644,7 +12644,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12659,7 +12659,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12674,7 +12674,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12689,7 +12689,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12704,7 +12704,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12719,7 +12719,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12734,7 +12734,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12749,7 +12749,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->previous_names) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12764,7 +12764,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12779,7 +12779,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_url) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12794,7 +12794,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->hardware_id) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12809,7 +12809,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo6(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->provider) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -12933,19 +12933,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo7(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS, r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->inf_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->install_source_root)); > ndr->flags = _flags_save_string; > } >@@ -12954,7 +12954,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo7(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -12964,7 +12964,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo7(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->inf_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->inf_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->inf_name)); >@@ -12974,7 +12974,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo7(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->install_source_root) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->install_source_root)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->install_source_root)); >@@ -13000,7 +13000,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo7(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS, &r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -13012,7 +13012,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo7(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_inf_name)); > if (_ptr_inf_name) { > NDR_PULL_ALLOC(ndr, r->inf_name); >@@ -13024,7 +13024,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo7(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_install_source_root)); > if (_ptr_install_source_root) { > NDR_PULL_ALLOC(ndr, r->install_source_root); >@@ -13039,7 +13039,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo7(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13054,7 +13054,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo7(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->inf_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13069,7 +13069,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo7(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->install_source_root) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13125,61 +13125,61 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS, r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->architecture)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->driver_path)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->config_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->help_file)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dependent_files)); > ndr->flags = _flags_save_string_array; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->default_datatype)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->previous_names)); > ndr->flags = _flags_save_string_array; > } >@@ -13187,56 +13187,56 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_hyper(ndr, NDR_SCALARS, r->driver_version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->manufacturer_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->manufacturer_url)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->hardware_id)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->provider)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->print_processor)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->vendor_setup)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->color_profiles)); > ndr->flags = _flags_save_string_array; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->inf_path)); > ndr->flags = _flags_save_string; > } > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->printer_driver_attributes)); > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->core_driver_dependencies)); > ndr->flags = _flags_save_string_array; > } >@@ -13247,7 +13247,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_name)); >@@ -13257,7 +13257,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->architecture)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->architecture)); >@@ -13267,7 +13267,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->driver_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->driver_path)); >@@ -13277,7 +13277,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->data_file)); >@@ -13287,7 +13287,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->config_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->config_file)); >@@ -13297,7 +13297,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->help_file)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->help_file)); >@@ -13307,7 +13307,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dependent_files)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->dependent_files)); >@@ -13317,7 +13317,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >@@ -13327,7 +13327,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->default_datatype)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->default_datatype)); >@@ -13337,7 +13337,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->previous_names) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->previous_names)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->previous_names)); >@@ -13347,7 +13347,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_name)); >@@ -13357,7 +13357,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_url) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->manufacturer_url)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->manufacturer_url)); >@@ -13367,7 +13367,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->hardware_id) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->hardware_id)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->hardware_id)); >@@ -13377,7 +13377,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->provider) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->provider)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->provider)); >@@ -13387,7 +13387,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor)); >@@ -13397,7 +13397,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->vendor_setup) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->vendor_setup)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->vendor_setup)); >@@ -13407,7 +13407,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->color_profiles) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->color_profiles)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->color_profiles)); >@@ -13417,7 +13417,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->inf_path) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->inf_path)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->inf_path)); >@@ -13427,7 +13427,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverInfo8(struct ndr_push *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->core_driver_dependencies) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->core_driver_dependencies)); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->core_driver_dependencies)); >@@ -13484,7 +13484,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS, &r->version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name)); > if (_ptr_driver_name) { > NDR_PULL_ALLOC(ndr, r->driver_name); >@@ -13496,7 +13496,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_architecture)); > if (_ptr_architecture) { > NDR_PULL_ALLOC(ndr, r->architecture); >@@ -13508,7 +13508,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_path)); > if (_ptr_driver_path) { > NDR_PULL_ALLOC(ndr, r->driver_path); >@@ -13520,7 +13520,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_file)); > if (_ptr_data_file) { > NDR_PULL_ALLOC(ndr, r->data_file); >@@ -13532,7 +13532,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_config_file)); > if (_ptr_config_file) { > NDR_PULL_ALLOC(ndr, r->config_file); >@@ -13544,7 +13544,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_help_file)); > if (_ptr_help_file) { > NDR_PULL_ALLOC(ndr, r->help_file); >@@ -13556,7 +13556,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dependent_files)); > if (_ptr_dependent_files) { > NDR_PULL_ALLOC(ndr, r->dependent_files); >@@ -13568,7 +13568,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name)); > if (_ptr_monitor_name) { > NDR_PULL_ALLOC(ndr, r->monitor_name); >@@ -13580,7 +13580,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_default_datatype)); > if (_ptr_default_datatype) { > NDR_PULL_ALLOC(ndr, r->default_datatype); >@@ -13592,7 +13592,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_previous_names)); > if (_ptr_previous_names) { > NDR_PULL_ALLOC(ndr, r->previous_names); >@@ -13606,7 +13606,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_hyper(ndr, NDR_SCALARS, &r->driver_version)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_manufacturer_name)); > if (_ptr_manufacturer_name) { > NDR_PULL_ALLOC(ndr, r->manufacturer_name); >@@ -13618,7 +13618,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_manufacturer_url)); > if (_ptr_manufacturer_url) { > NDR_PULL_ALLOC(ndr, r->manufacturer_url); >@@ -13630,7 +13630,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_hardware_id)); > if (_ptr_hardware_id) { > NDR_PULL_ALLOC(ndr, r->hardware_id); >@@ -13642,7 +13642,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_provider)); > if (_ptr_provider) { > NDR_PULL_ALLOC(ndr, r->provider); >@@ -13654,7 +13654,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_print_processor)); > if (_ptr_print_processor) { > NDR_PULL_ALLOC(ndr, r->print_processor); >@@ -13666,7 +13666,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_vendor_setup)); > if (_ptr_vendor_setup) { > NDR_PULL_ALLOC(ndr, r->vendor_setup); >@@ -13678,7 +13678,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_color_profiles)); > if (_ptr_color_profiles) { > NDR_PULL_ALLOC(ndr, r->color_profiles); >@@ -13690,7 +13690,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_inf_path)); > if (_ptr_inf_path) { > NDR_PULL_ALLOC(ndr, r->inf_path); >@@ -13703,7 +13703,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->printer_driver_attributes)); > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_core_driver_dependencies)); > if (_ptr_core_driver_dependencies) { > NDR_PULL_ALLOC(ndr, r->core_driver_dependencies); >@@ -13720,7 +13720,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13735,7 +13735,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->architecture) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13750,7 +13750,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->driver_path) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13765,7 +13765,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->data_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13780,7 +13780,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->config_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13795,7 +13795,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->help_file) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13810,7 +13810,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dependent_files) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13825,7 +13825,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13840,7 +13840,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->default_datatype) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13855,7 +13855,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->previous_names) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13870,7 +13870,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13885,7 +13885,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->manufacturer_url) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13900,7 +13900,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->hardware_id) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13915,7 +13915,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->provider) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13930,7 +13930,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13945,7 +13945,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->vendor_setup) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13960,7 +13960,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->color_profiles) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13975,7 +13975,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->inf_path) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -13990,7 +13990,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverInfo8(struct ndr_pull *ndr, in > } > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->core_driver_dependencies) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -14173,7 +14173,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverFileInfo(struct ndr_push *ndr, > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->file_name)); > ndr->flags = _flags_save_string; > } >@@ -14184,7 +14184,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverFileInfo(struct ndr_push *ndr, > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->file_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->file_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->file_name)); >@@ -14204,7 +14204,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverFileInfo(struct ndr_pull *ndr, > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_file_name)); > if (_ptr_file_name) { > NDR_PULL_ALLOC(ndr, r->file_name); >@@ -14221,7 +14221,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverFileInfo(struct ndr_pull *ndr, > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->file_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -14644,7 +14644,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_DriverDirectoryInfo1(struct ndr_push > NDR_CHECK(ndr_push_align(ndr, 4)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->directory_name)); > ndr->flags = _flags_save_string; > } >@@ -14661,7 +14661,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_DriverDirectoryInfo1(struct ndr_pull > NDR_CHECK(ndr_pull_align(ndr, 4)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->directory_name)); > ndr->flags = _flags_save_string; > } >@@ -14803,7 +14803,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorInfo1(struct ndr_push > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->print_processor_name)); > ndr->flags = _flags_save_string; > } >@@ -14812,7 +14812,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorInfo1(struct ndr_push > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->print_processor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->print_processor_name)); >@@ -14832,7 +14832,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorInfo1(struct ndr_pull > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_print_processor_name)); > if (_ptr_print_processor_name) { > NDR_PULL_ALLOC(ndr, r->print_processor_name); >@@ -14847,7 +14847,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorInfo1(struct ndr_pull > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->print_processor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -14989,7 +14989,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcessorDirectoryInfo1(struct > NDR_CHECK(ndr_push_align(ndr, 4)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->directory_name)); > ndr->flags = _flags_save_string; > } >@@ -15006,7 +15006,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcessorDirectoryInfo1(struct > NDR_CHECK(ndr_pull_align(ndr, 4)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->directory_name)); > ndr->flags = _flags_save_string; > } >@@ -15412,7 +15412,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_OSVersion(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > { > struct ndr_push *_ndr_extra_string; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_extra_string, 0, 256)); >@@ -15439,7 +15439,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_OSVersion(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->platform_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > { > struct ndr_pull *_ndr_extra_string; > NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_extra_string, 0, 256)); >@@ -15484,7 +15484,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_OSVersionEx(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > { > struct ndr_push *_ndr_extra_string; > NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_extra_string, 0, 256)); >@@ -15516,7 +15516,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_OSVersionEx(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->platform_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > { > struct ndr_pull *_ndr_extra_string; > NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_extra_string, 0, 256)); >@@ -15572,7 +15572,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterData(struct ndr_push *ndr, in > case REG_SZ: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->string)); > ndr->flags = _flags_save_string; > } >@@ -15594,7 +15594,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterData(struct ndr_push *ndr, in > case REG_MULTI_SZ: { > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->string_array)); > ndr->flags = _flags_save_string_array; > } >@@ -15650,7 +15650,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterData(struct ndr_pull *ndr, in > case REG_SZ: { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->string)); > ndr->flags = _flags_save_string; > } >@@ -15672,7 +15672,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterData(struct ndr_pull *ndr, in > case REG_MULTI_SZ: { > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->string_array)); > ndr->flags = _flags_save_string_array; > } >@@ -15855,7 +15855,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo1(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_spoolss_FormFlags(ndr, NDR_SCALARS, r->flags)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->form_name)); > ndr->flags = _flags_save_string; > } >@@ -15866,7 +15866,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo1(struct ndr_push *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->form_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->form_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->form_name)); >@@ -15887,7 +15887,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo1(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_spoolss_FormFlags(ndr, NDR_SCALARS, &r->flags)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_form_name)); > if (_ptr_form_name) { > NDR_PULL_ALLOC(ndr, r->form_name); >@@ -15904,7 +15904,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo1(struct ndr_pull *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->form_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -15973,7 +15973,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_spoolss_FormFlags(ndr, NDR_SCALARS, r->flags)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->form_name)); > ndr->flags = _flags_save_string; > } >@@ -15988,14 +15988,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_spoolss_FormStringType(ndr, NDR_SCALARS, r->string_type)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->mui_dll)); > ndr->flags = _flags_save_string; > } > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->ressource_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->display_name)); > ndr->flags = _flags_save_string; > } >@@ -16006,7 +16006,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->form_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->form_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->form_name)); >@@ -16026,7 +16026,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->mui_dll) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->mui_dll)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->mui_dll)); >@@ -16036,7 +16036,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_FormInfo2(struct ndr_push *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->display_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->display_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->display_name)); >@@ -16063,7 +16063,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_spoolss_FormFlags(ndr, NDR_SCALARS, &r->flags)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_form_name)); > if (_ptr_form_name) { > NDR_PULL_ALLOC(ndr, r->form_name); >@@ -16090,7 +16090,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_spoolss_FormStringType(ndr, NDR_SCALARS, &r->string_type)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_mui_dll)); > if (_ptr_mui_dll) { > NDR_PULL_ALLOC(ndr, r->mui_dll); >@@ -16103,7 +16103,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->ressource_id)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_display_name)); > if (_ptr_display_name) { > NDR_PULL_ALLOC(ndr, r->display_name); >@@ -16120,7 +16120,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->form_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -16150,7 +16150,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->mui_dll) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -16165,7 +16165,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_FormInfo2(struct ndr_pull *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->display_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -16747,7 +16747,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo1(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->port_name)); > ndr->flags = _flags_save_string; > } >@@ -16756,7 +16756,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo1(struct ndr_push *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->port_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->port_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->port_name)); >@@ -16776,7 +16776,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo1(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_port_name)); > if (_ptr_port_name) { > NDR_PULL_ALLOC(ndr, r->port_name); >@@ -16791,7 +16791,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo1(struct ndr_pull *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->port_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -16857,19 +16857,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo2(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->port_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->description)); > ndr->flags = _flags_save_string; > } >@@ -16880,7 +16880,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo2(struct ndr_push *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->port_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->port_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->port_name)); >@@ -16890,7 +16890,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo2(struct ndr_push *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >@@ -16900,7 +16900,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo2(struct ndr_push *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->description) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->description)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description)); >@@ -16924,7 +16924,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo2(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_port_name)); > if (_ptr_port_name) { > NDR_PULL_ALLOC(ndr, r->port_name); >@@ -16936,7 +16936,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo2(struct ndr_pull *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name)); > if (_ptr_monitor_name) { > NDR_PULL_ALLOC(ndr, r->monitor_name); >@@ -16948,7 +16948,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo2(struct ndr_pull *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_description)); > if (_ptr_description) { > NDR_PULL_ALLOC(ndr, r->description); >@@ -16965,7 +16965,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo2(struct ndr_pull *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->port_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -16980,7 +16980,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo2(struct ndr_pull *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -16995,7 +16995,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo2(struct ndr_pull *ndr, int > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->description) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -17113,7 +17113,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo3(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_spoolss_PortStatus(ndr, NDR_SCALARS, r->status)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->status_string)); > ndr->flags = _flags_save_string; > } >@@ -17123,7 +17123,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfo3(struct ndr_push *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->status_string) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->status_string)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->status_string)); >@@ -17144,7 +17144,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo3(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_spoolss_PortStatus(ndr, NDR_SCALARS, &r->status)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_status_string)); > if (_ptr_status_string) { > NDR_PULL_ALLOC(ndr, r->status_string); >@@ -17160,7 +17160,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfo3(struct ndr_pull *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->status_string) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -17203,7 +17203,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfoFF(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->port_name)); > ndr->flags = _flags_save_string; > } >@@ -17213,7 +17213,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PortInfoFF(struct ndr_push *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->port_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->port_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->port_name)); >@@ -17233,7 +17233,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfoFF(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_port_name)); > if (_ptr_port_name) { > NDR_PULL_ALLOC(ndr, r->port_name); >@@ -17249,7 +17249,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PortInfoFF(struct ndr_pull *ndr, int > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->port_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -17464,7 +17464,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo1(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name)); > ndr->flags = _flags_save_string; > } >@@ -17473,7 +17473,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo1(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >@@ -17493,7 +17493,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo1(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name)); > if (_ptr_monitor_name) { > NDR_PULL_ALLOC(ndr, r->monitor_name); >@@ -17508,7 +17508,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo1(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -17549,19 +17549,19 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo2(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->monitor_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->environment)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->dll_name)); > ndr->flags = _flags_save_string; > } >@@ -17570,7 +17570,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo2(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->monitor_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->monitor_name)); >@@ -17580,7 +17580,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo2(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->environment) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->environment)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->environment)); >@@ -17590,7 +17590,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorInfo2(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dll_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->dll_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dll_name)); >@@ -17614,7 +17614,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo2(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_monitor_name)); > if (_ptr_monitor_name) { > NDR_PULL_ALLOC(ndr, r->monitor_name); >@@ -17626,7 +17626,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_environment)); > if (_ptr_environment) { > NDR_PULL_ALLOC(ndr, r->environment); >@@ -17638,7 +17638,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_dll_name)); > if (_ptr_dll_name) { > NDR_PULL_ALLOC(ndr, r->dll_name); >@@ -17653,7 +17653,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo2(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->monitor_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -17668,7 +17668,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->environment) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -17683,7 +17683,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorInfo2(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->dll_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -17861,7 +17861,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcDataTypesInfo1(struct ndr_p > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->name_array)); > ndr->flags = _flags_save_string; > } >@@ -17870,7 +17870,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrintProcDataTypesInfo1(struct ndr_p > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->name_array) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->name_array)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->name_array)); >@@ -17890,7 +17890,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcDataTypesInfo1(struct ndr_p > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_name_array)); > if (_ptr_name_array) { > NDR_PULL_ALLOC(ndr, r->name_array); >@@ -17905,7 +17905,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrintProcDataTypesInfo1(struct ndr_p > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->name_array) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -19511,7 +19511,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n > NDR_CHECK(ndr_push_setup_relative_base_offset1(ndr, r, ndr->offset)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->value_name)); > ndr->flags = _flags_save_string; > } >@@ -19519,18 +19519,18 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n > NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->type)); > { > uint32_t _flags_save_DATA_BLOB = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type)); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data)); > ndr->flags = _flags_save_DATA_BLOB; > } >- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->data->length)); >+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->data?r->data->length:0)); > NDR_CHECK(ndr_push_trailer_align(ndr, 5)); > } > if (ndr_flags & NDR_BUFFERS) { > NDR_CHECK(ndr_push_setup_relative_base_offset2(ndr, r)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->value_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->value_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->value_name)); >@@ -19540,14 +19540,14 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_PrinterEnumValues(struct ndr_push *n > } > { > uint32_t _flags_save_DATA_BLOB = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type)); > if (r->data) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->data)); > { > struct ndr_push *_ndr_data; >- NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_data, 0, r->data->length)); >+ NDR_CHECK(ndr_push_subcontext_start(ndr, &_ndr_data, 0, r->data?r->data->length:0)); > NDR_CHECK(ndr_push_DATA_BLOB(_ndr_data, NDR_SCALARS, *r->data)); >- NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, r->data->length)); >+ NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, r->data?r->data->length:0)); > } > NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data)); > } >@@ -19570,7 +19570,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull *n > NDR_CHECK(ndr_pull_setup_relative_base_offset1(ndr, r, ndr->offset)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_value_name)); > if (_ptr_value_name) { > NDR_PULL_ALLOC(ndr, r->value_name); >@@ -19584,7 +19584,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull *n > NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->type)); > { > uint32_t _flags_save_DATA_BLOB = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type)); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data)); > if (_ptr_data) { > NDR_PULL_ALLOC(ndr, r->data); >@@ -19601,7 +19601,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull *n > NDR_CHECK(ndr_pull_setup_relative_base_offset2(ndr, r)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->value_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -19616,7 +19616,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_PrinterEnumValues(struct ndr_pull *n > } > { > uint32_t _flags_save_DATA_BLOB = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type)); > if (r->data) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -19657,7 +19657,7 @@ _PUBLIC_ void ndr_print_spoolss_PrinterEnumValues(struct ndr_print *ndr, const c > ndr_print_DATA_BLOB(ndr, "data", *r->data); > } > ndr->depth--; >- ndr_print_uint32(ndr, "data_length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->data->length:r->data_length); >+ ndr_print_uint32(ndr, "data_length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?r->data?r->data->length:0:r->data_length); > ndr->depth--; > } > >@@ -19681,7 +19681,7 @@ static enum ndr_err_code ndr_push_spoolss_KeyNames(struct ndr_push *ndr, int ndr > default: { > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string_array(ndr, NDR_SCALARS, r->string_array)); > ndr->flags = _flags_save_string_array; > } >@@ -19722,7 +19722,7 @@ static enum ndr_err_code ndr_pull_spoolss_KeyNames(struct ndr_pull *ndr, int ndr > default: { > { > uint32_t _flags_save_string_array = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS, &r->string_array)); > ndr->flags = _flags_save_string_array; > } >@@ -19965,7 +19965,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_spoolss_MonitorUi(struct ndr_push *ndr, int > NDR_CHECK(ndr_push_align(ndr, 4)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->dll_name)); > ndr->flags = _flags_save_string; > } >@@ -19982,7 +19982,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_spoolss_MonitorUi(struct ndr_pull *ndr, int > NDR_CHECK(ndr_pull_align(ndr, 4)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_string(ndr, NDR_SCALARS, &r->dll_name)); > ndr->flags = _flags_save_string; > } >diff --git a/librpc/gen_ndr/ndr_svcctl.c b/librpc/gen_ndr/ndr_svcctl.c >index a1cb7c7..e67d793 100644 >--- a/librpc/gen_ndr/ndr_svcctl.c >+++ b/librpc/gen_ndr/ndr_svcctl.c >@@ -226,13 +226,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSW(struct ndr_push *ndr, i > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->service_name)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->display_name)); > ndr->flags = _flags_save_string; > } >@@ -242,7 +242,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSW(struct ndr_push *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->service_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->service_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->service_name)); >@@ -252,7 +252,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_ENUM_SERVICE_STATUSW(struct ndr_push *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->display_name) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->display_name)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->display_name)); >@@ -274,7 +274,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ENUM_SERVICE_STATUSW(struct ndr_pull *ndr, i > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_service_name)); > if (_ptr_service_name) { > NDR_PULL_ALLOC(ndr, r->service_name); >@@ -286,7 +286,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ENUM_SERVICE_STATUSW(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_display_name)); > if (_ptr_display_name) { > NDR_PULL_ALLOC(ndr, r->display_name); >@@ -302,7 +302,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ENUM_SERVICE_STATUSW(struct ndr_pull *ndr, i > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->service_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -317,7 +317,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_ENUM_SERVICE_STATUSW(struct ndr_pull *ndr, i > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->display_name) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1016,7 +1016,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_DESCRIPTION(struct ndr_push *ndr, in > NDR_CHECK(ndr_push_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->description)); > ndr->flags = _flags_save_string; > } >@@ -1025,7 +1025,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_DESCRIPTION(struct ndr_push *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->description) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->description)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->description)); >@@ -1045,7 +1045,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_SERVICE_DESCRIPTION(struct ndr_pull *ndr, in > NDR_CHECK(ndr_pull_align(ndr, 5)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_description)); > if (_ptr_description) { > NDR_PULL_ALLOC(ndr, r->description); >@@ -1060,7 +1060,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_SERVICE_DESCRIPTION(struct ndr_pull *ndr, in > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->description) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1165,13 +1165,13 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_FAILURE_ACTIONS(struct ndr_push *ndr > NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->reset_period)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->rebootmsg)); > ndr->flags = _flags_save_string; > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_push_relative_ptr1(ndr, r->command)); > ndr->flags = _flags_save_string; > } >@@ -1182,7 +1182,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_FAILURE_ACTIONS(struct ndr_push *ndr > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->rebootmsg) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->rebootmsg)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->rebootmsg)); >@@ -1192,7 +1192,7 @@ _PUBLIC_ enum ndr_err_code ndr_push_SERVICE_FAILURE_ACTIONS(struct ndr_push *ndr > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->command) { > NDR_CHECK(ndr_push_relative_ptr2_start(ndr, r->command)); > NDR_CHECK(ndr_push_string(ndr, NDR_SCALARS, r->command)); >@@ -1227,7 +1227,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_SERVICE_FAILURE_ACTIONS(struct ndr_pull *ndr > NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->reset_period)); > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_rebootmsg)); > if (_ptr_rebootmsg) { > NDR_PULL_ALLOC(ndr, r->rebootmsg); >@@ -1239,7 +1239,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_SERVICE_FAILURE_ACTIONS(struct ndr_pull *ndr > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_command)); > if (_ptr_command) { > NDR_PULL_ALLOC(ndr, r->command); >@@ -1265,7 +1265,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_SERVICE_FAILURE_ACTIONS(struct ndr_pull *ndr > if (ndr_flags & NDR_BUFFERS) { > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->rebootmsg) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >@@ -1280,7 +1280,7 @@ _PUBLIC_ enum ndr_err_code ndr_pull_SERVICE_FAILURE_ACTIONS(struct ndr_pull *ndr > } > { > uint32_t _flags_save_string = ndr->flags; >- ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM); >+ ndr_set_flags(&ndr->flags, LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2); > if (r->command) { > uint32_t _relative_save_offset; > _relative_save_offset = ndr->offset; >diff --git a/librpc/gen_ndr/netlogon.h b/librpc/gen_ndr/netlogon.h >index 268790e..207bc2c 100644 >--- a/librpc/gen_ndr/netlogon.h >+++ b/librpc/gen_ndr/netlogon.h >@@ -800,7 +800,7 @@ enum SyncStateEnum > > union netr_ChangeLogObject { > struct dom_sid object_sid;/* [case(NETR_CHANGELOG_SID_INCLUDED)] */ >- const char * object_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(NETR_CHANGELOG_NAME_INCLUDED)] */ >+ const char * object_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2),case(NETR_CHANGELOG_NAME_INCLUDED)] */ > }/* [nodiscriminant] */; > > struct netr_ChangeLogEntry { >@@ -931,7 +931,7 @@ struct netr_OsVersionInfoEx { > uint32_t MinorVersion; > uint32_t BuildNumber; > uint32_t PlatformId; >- const char * CSDVersion;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * CSDVersion;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint16_t ServicePackMajor; > uint16_t ServicePackMinor; > uint16_t SuiteMask; >diff --git a/librpc/gen_ndr/spoolss.h b/librpc/gen_ndr/spoolss.h >index 15ad886..855e701 100644 >--- a/librpc/gen_ndr/spoolss.h >+++ b/librpc/gen_ndr/spoolss.h >@@ -244,8 +244,8 @@ enum spoolss_MinorVersion > #define JOB_STATUS_COMPLETE ( 0x00001000 ) > > struct spoolss_PrinterInfo0 { >- const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t cjobs; > uint32_t total_jobs; > uint32_t total_bytes; >@@ -804,24 +804,24 @@ struct spoolss_DeviceMode { > > struct spoolss_PrinterInfo1 { > uint32_t flags; >- const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_PrinterInfo2 { >- const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * sharename;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * drivername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * location;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * sharename;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * drivername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * comment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * location;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >- const char * sepfile;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * sepfile;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * printprocessor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t attributes; > uint32_t priority;/* [range(0,99)] */ >@@ -838,14 +838,14 @@ struct spoolss_PrinterInfo3 { > }/* [gensize,public] */; > > struct spoolss_PrinterInfo4 { >- const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t attributes; > }/* [gensize,public] */; > > struct spoolss_PrinterInfo5 { >- const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * portname;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t attributes; > uint32_t device_not_selected_timeout; > uint32_t transmission_retry_timeout; >@@ -863,7 +863,7 @@ struct spoolss_PrinterInfo6 { > #define DSPRINT_PENDING ( 0x80000000 ) > > struct spoolss_PrinterInfo7 { >- const char * guid;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * guid;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t action; > }/* [gensize,public] */; > >@@ -891,12 +891,12 @@ struct spoolss_DevmodeContainer { > > struct spoolss_JobInfo1 { > uint32_t job_id; >- const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t status; > uint32_t priority;/* [range(0,99)] */ > uint32_t position; >@@ -907,17 +907,17 @@ struct spoolss_JobInfo1 { > > struct spoolss_JobInfo2 { > uint32_t job_id; >- const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >- const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t status; > uint32_t priority;/* [range(0,99)] */ >@@ -939,17 +939,17 @@ struct spoolss_JobInfo3 { > > struct spoolss_JobInfo4 { > uint32_t job_id; >- const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_DeviceMode *devmode;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ >- const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_security_descriptor *secdesc;/* [relative,subcontext(0),flag(LIBNDR_FLAG_ALIGN4)] */ > uint32_t status; > uint32_t priority;/* [range(0,99)] */ >@@ -1216,7 +1216,7 @@ struct spoolss_SetPrinterInfoCtr { > > struct spoolss_StringArray { > uint32_t _ndr_size;/* [value((ndr_size_spoolss_StringArray(r,ndr->iconv_convenience,ndr->flags)-4)/2)] */ >- const char ** string;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char ** string;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [public] */; > > struct spoolss_AddDriverInfo1 { >@@ -1363,52 +1363,52 @@ struct spoolss_AddDriverInfoCtr { > }; > > struct spoolss_DriverInfo1 { >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_DriverInfo2 { > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_DriverInfo3 { > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_DriverInfo4 { > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_DriverInfo5 { > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t driver_attributes; > uint32_t config_version; > uint32_t driver_version; >@@ -1416,56 +1416,56 @@ struct spoolss_DriverInfo5 { > > struct spoolss_DriverInfo6 { > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > NTTIME driver_date; > uint64_t driver_version; >- const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_DriverInfo7 { > uint32_t size; > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * inf_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * install_source_root;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * inf_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * install_source_root;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_DriverInfo8 { > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * help_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > NTTIME driver_date; > uint64_t driver_version; >- const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * vendor_setup;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** color_profiles;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * inf_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * vendor_setup;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** color_profiles;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * inf_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t printer_driver_attributes; >- const char ** core_driver_dependencies;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char ** core_driver_dependencies;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > NTTIME min_inbox_driver_ver_date; > uint64_t min_inbox_driver_ver_version; > }/* [gensize,public] */; >@@ -1490,26 +1490,26 @@ enum spoolss_DriverFileType > ; > > struct spoolss_DriverFileInfo { >- const char * file_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * file_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > enum spoolss_DriverFileType file_type; > uint32_t file_version; > }/* [public] */; > > struct spoolss_DriverInfo101 { > enum spoolss_DriverOSVersion version; >- const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- struct spoolss_DriverFileInfo *file_info;/* [relative,size_is(file_count)] */ >+ const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ struct spoolss_DriverFileInfo *file_info;/* [relative,flag(LIBNDR_FLAG_ALIGN4),size_is(file_count)] */ > uint32_t file_count; >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > NTTIME driver_date; > uint64_t driver_version; >- const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,nopush,public,nopull] */; > > union spoolss_DriverInfo { >@@ -1525,7 +1525,7 @@ union spoolss_DriverInfo { > }/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_DriverDirectoryInfo1 { >- const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > union spoolss_DriverDirectoryInfo { >@@ -1533,7 +1533,7 @@ union spoolss_DriverDirectoryInfo { > }/* [gensize,relative_base,nodiscriminant,public,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_PrintProcessorInfo1 { >- const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > union spoolss_PrintProcessorInfo { >@@ -1541,7 +1541,7 @@ union spoolss_PrintProcessorInfo { > }/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_PrintProcessorDirectoryInfo1 { >- const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > union spoolss_PrintProcessorDirectoryInfo { >@@ -1564,7 +1564,7 @@ struct spoolss_OSVersion { > uint32_t minor; > uint32_t build; > uint32_t platform_id;/* [value(2)] */ >- const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_OSVersionEx { >@@ -1573,7 +1573,7 @@ struct spoolss_OSVersionEx { > uint32_t minor; > uint32_t build; > uint32_t platform_id;/* [value(2)] */ >- const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * extra_string;/* [subcontext_size(256),subcontext(0),flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint16_t service_pack_major; > uint16_t service_pack_minor; > uint16_t suite_mask; >@@ -1582,10 +1582,10 @@ struct spoolss_OSVersionEx { > }/* [gensize,public] */; > > union spoolss_PrinterData { >- const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_SZ)] */ >+ const char * string;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2),case(REG_SZ)] */ > DATA_BLOB binary;/* [flag(LIBNDR_FLAG_REMAINING),case(REG_BINARY)] */ > uint32_t value;/* [case(REG_DWORD)] */ >- const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM),case(REG_MULTI_SZ)] */ >+ const char ** string_array;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2),case(REG_MULTI_SZ)] */ > DATA_BLOB data;/* [flag(LIBNDR_FLAG_REMAINING),default] */ > }/* [nodiscriminant,public] */; > >@@ -1618,7 +1618,7 @@ struct spoolss_FormArea { > > struct spoolss_FormInfo1 { > enum spoolss_FormFlags flags; >- const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_FormSize size; > struct spoolss_FormArea area; > }/* [gensize,public] */; >@@ -1630,14 +1630,14 @@ struct spoolss_FormInfo1 { > > struct spoolss_FormInfo2 { > enum spoolss_FormFlags flags; >- const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct spoolss_FormSize size; > struct spoolss_FormArea area; > const char * keyword;/* [relative,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */ > uint32_t string_type; >- const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t ressource_id; >- const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint16_t lang_id; > uint16_t unused; > }/* [gensize,public] */; >@@ -1673,7 +1673,7 @@ union spoolss_AddFormInfo { > }/* [switch_type(uint32)] */; > > struct spoolss_PortInfo1 { >- const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > /* bitmap spoolss_PortType */ >@@ -1683,9 +1683,9 @@ struct spoolss_PortInfo1 { > #define SPOOLSS_PORT_TYPE_NET_ATTACHED ( 0x00000008 ) > > struct spoolss_PortInfo2 { >- const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t port_type; > uint32_t reserved; > }/* [gensize,public] */; >@@ -1742,12 +1742,12 @@ enum spoolss_PortSeverity > > struct spoolss_PortInfo3 { > enum spoolss_PortStatus status; >- const char * status_string;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * status_string;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > enum spoolss_PortSeverity severity; > }/* [gensize,public] */; > > struct spoolss_PortInfoFF { >- const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > DATA_BLOB monitor_data; > }/* [gensize,public] */; > >@@ -1759,13 +1759,13 @@ union spoolss_PortInfo { > }/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_MonitorInfo1 { >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > struct spoolss_MonitorInfo2 { >- const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * environment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * dll_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * environment;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * dll_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > union spoolss_MonitorInfo { >@@ -1774,7 +1774,7 @@ union spoolss_MonitorInfo { > }/* [relative_base,public,nodiscriminant,flag(LIBNDR_FLAG_RELATIVE_REVERSE)] */; > > struct spoolss_PrintProcDataTypesInfo1 { >- const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > union spoolss_PrintProcDataTypesInfo { >@@ -2065,15 +2065,15 @@ struct spoolss_UserLevelCtr { > #define JOB_ACCESS_READ ( 0x00000020 ) > > struct spoolss_PrinterEnumValues { >- const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * value_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t value_name_len;/* [value(2*strlen_m_term(value_name))] */ > enum winreg_Type type; >- DATA_BLOB *data;/* [relative,subcontext_size(data_length),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */ >- uint32_t data_length;/* [value(data->length)] */ >+ DATA_BLOB *data;/* [relative,subcontext_size(data_length),subcontext(0),flag(LIBNDR_FLAG_REMAINING|ndr_spoolss_PrinterEnumValues_align(r->type))] */ >+ uint32_t data_length;/* [value(data?data->length:0)] */ > }/* [relative_base,gensize,public] */; > > union spoolss_KeyNames { >- const char ** string_array;/* [default,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char ** string_array;/* [default,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [nodiscriminant] */; > > /* bitmap spoolss_DeleteDriverFlags */ >@@ -2130,7 +2130,7 @@ struct spoolss_PortData2 { > }/* [public] */; > > struct spoolss_MonitorUi { >- const char * dll_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * dll_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [public] */; > > /* bitmap spoolss_AddPrinterDriverExFlags */ >diff --git a/librpc/gen_ndr/svcctl.h b/librpc/gen_ndr/svcctl.h >index f047701..466a4d3 100644 >--- a/librpc/gen_ndr/svcctl.h >+++ b/librpc/gen_ndr/svcctl.h >@@ -87,8 +87,8 @@ struct SERVICE_STATUS_PROCESS { > }/* [public] */; > > struct ENUM_SERVICE_STATUSW { >- const char * service_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * service_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > struct SERVICE_STATUS status; > }/* [gensize,public] */; > >@@ -246,7 +246,7 @@ enum svcctl_ConfigLevel > ; > > struct SERVICE_DESCRIPTION { >- const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * description;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > }/* [gensize,public] */; > > enum SC_ACTION_TYPE >@@ -273,8 +273,8 @@ struct SC_ACTION { > > struct SERVICE_FAILURE_ACTIONS { > uint32_t reset_period; >- const char * rebootmsg;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >- const char * command;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */ >+ const char * rebootmsg;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ >+ const char * command;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM|LIBNDR_FLAG_ALIGN2)] */ > uint32_t num_actions;/* [range(0,1024)] */ > struct SC_ACTION *actions;/* [relative,size_is(num_actions)] */ > }/* [gensize,public] */; >-- >1.7.0.4 >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=6274">View the attachment on a separate page</a>.</b>
View Attachment As Raw
Flags:
gd
:
review+
Actions:
View
Attachments on
bug 7567
:
6229
|
6230
|
6231
|
6250
|
6251
|
6258
|
6259
|
6263
|
6267
|
6271
| 6274