The branch, master has been updated
via e798d2c3958af3232a2f3637cb4078c3c845966f (commit)
via 4fb1ccef4bf7e385e92d3724c1c8d7969ffcaa7c (commit)
via 7b2aae56462a0825167bbbd11a3f46547897819d (commit)
from 0b6f21841e0e90cc269a93c3507a31a5431d44f4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e798d2c3958af3232a2f3637cb4078c3c845966f
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 10:20:34 2009 +0100
s3: re-run make samba3-idl.
Guenther
commit 4fb1ccef4bf7e385e92d3724c1c8d7969ffcaa7c
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 10:15:56 2009 +0100
spoolss: fill in spoolss_AddPrinterDriverEx. This is metze's work from 2005
(!).
Guenther
commit 7b2aae56462a0825167bbbd11a3f46547897819d
Author: Günther Deschner <[email protected]>
Date: Wed Feb 11 10:13:48 2009 +0100
spoolss: fill in spoolss_AddPrinterDriver. This is metze's work from 2005
(!).
Guenther
-----------------------------------------------------------------------
Summary of changes:
librpc/gen_ndr/cli_spoolss.c | 14 +
librpc/gen_ndr/cli_spoolss.h | 7 +
librpc/gen_ndr/ndr_spoolss.c | 1819 +++++++++++++++++++++++++++++++++++++++++-
librpc/gen_ndr/ndr_spoolss.h | 12 +-
librpc/gen_ndr/spoolss.h | 107 +++-
librpc/idl/spoolss.idl | 108 +++-
6 files changed, 2032 insertions(+), 35 deletions(-)
Changeset truncated at 500 lines:
diff --git a/librpc/gen_ndr/cli_spoolss.c b/librpc/gen_ndr/cli_spoolss.c
index 4906d23..492f2c2 100644
--- a/librpc/gen_ndr/cli_spoolss.c
+++ b/librpc/gen_ndr/cli_spoolss.c
@@ -477,12 +477,18 @@ NTSTATUS rpccli_spoolss_GetPrinter(struct rpc_pipe_client
*cli,
NTSTATUS rpccli_spoolss_AddPrinterDriver(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *servername /* [in]
[ref,charset(UTF16)] */,
+ uint32_t level /* [in] */,
+ union spoolss_AddDriverInfo info /*
[in] [switch_is(level)] */,
WERROR *werror)
{
struct spoolss_AddPrinterDriver r;
NTSTATUS status;
/* In parameters */
+ r.in.servername = servername;
+ r.in.level = level;
+ r.in.info = info;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(spoolss_AddPrinterDriver, &r);
@@ -4189,12 +4195,20 @@ NTSTATUS rpccli_spoolss_XcvData(struct rpc_pipe_client
*cli,
NTSTATUS rpccli_spoolss_AddPrinterDriverEx(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *servername /* [in]
[ref,charset(UTF16)] */,
+ uint32_t level /* [in] */,
+ union spoolss_AddDriverInfo info /*
[in] [switch_is(level)] */,
+ uint32_t flags /* [in] */,
WERROR *werror)
{
struct spoolss_AddPrinterDriverEx r;
NTSTATUS status;
/* In parameters */
+ r.in.servername = servername;
+ r.in.level = level;
+ r.in.info = info;
+ r.in.flags = flags;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(spoolss_AddPrinterDriverEx, &r);
diff --git a/librpc/gen_ndr/cli_spoolss.h b/librpc/gen_ndr/cli_spoolss.h
index 9eb43d6..25000a4 100644
--- a/librpc/gen_ndr/cli_spoolss.h
+++ b/librpc/gen_ndr/cli_spoolss.h
@@ -76,6 +76,9 @@ NTSTATUS rpccli_spoolss_GetPrinter(struct rpc_pipe_client
*cli,
WERROR *werror);
NTSTATUS rpccli_spoolss_AddPrinterDriver(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *servername /* [in]
[ref,charset(UTF16)] */,
+ uint32_t level /* [in] */,
+ union spoolss_AddDriverInfo info /*
[in] [switch_is(level)] */,
WERROR *werror);
NTSTATUS rpccli_spoolss_EnumPrinterDrivers(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
@@ -521,6 +524,10 @@ NTSTATUS rpccli_spoolss_XcvData(struct rpc_pipe_client
*cli,
WERROR *werror);
NTSTATUS rpccli_spoolss_AddPrinterDriverEx(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
+ const char *servername /* [in]
[ref,charset(UTF16)] */,
+ uint32_t level /* [in] */,
+ union spoolss_AddDriverInfo info /*
[in] [switch_is(level)] */,
+ uint32_t flags /* [in] */,
WERROR *werror);
NTSTATUS rpccli_spoolss_5a(struct rpc_pipe_client *cli,
TALLOC_CTX *mem_ctx,
diff --git a/librpc/gen_ndr/ndr_spoolss.c b/librpc/gen_ndr/ndr_spoolss.c
index f9d4216..9ef5d37 100644
--- a/librpc/gen_ndr/ndr_spoolss.c
+++ b/librpc/gen_ndr/ndr_spoolss.c
@@ -3361,6 +3361,1741 @@ _PUBLIC_ void ndr_print_spoolss_SetPrinterInfo(struct
ndr_print *ndr, const char
}
}
+_PUBLIC_ enum ndr_err_code ndr_push_spoolss_StringArray(struct ndr_push *ndr,
int ndr_flags, const struct spoolss_StringArray *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ 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_CHECK(ndr_push_string_array(ndr, NDR_SCALARS,
r->string));
+ ndr->flags = _flags_save_string_array;
+ }
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ enum ndr_err_code ndr_pull_spoolss_StringArray(struct ndr_pull *ndr,
int ndr_flags, struct spoolss_StringArray *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ 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_CHECK(ndr_pull_string_array(ndr, NDR_SCALARS,
&r->string));
+ ndr->flags = _flags_save_string_array;
+ }
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_StringArray(struct ndr_print *ndr, const char
*name, const struct spoolss_StringArray *r)
+{
+ ndr_print_struct(ndr, name, "spoolss_StringArray");
+ ndr->depth++;
+ ndr_print_uint32(ndr, "_ndr_size", (ndr->flags &
LIBNDR_PRINT_SET_VALUES)?(ndr_size_spoolss_StringArray(r,
ndr->iconv_convenience, ndr->flags) - 4) / 2:r->_ndr_size);
+ ndr_print_string_array(ndr, "string", r->string);
+ ndr->depth--;
+}
+
+_PUBLIC_ size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray
*r, struct smb_iconv_convenience *ic, int flags)
+{
+ return ndr_size_struct(r, flags,
(ndr_push_flags_fn_t)ndr_push_spoolss_StringArray, ic);
+}
+
+static enum ndr_err_code ndr_push_spoolss_AddDriverInfo1(struct ndr_push *ndr,
int ndr_flags, const struct spoolss_AddDriverInfo1 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->driver_name));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ if (r->driver_name) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->driver_name, ndr_charset_length(r->driver_name, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolss_AddDriverInfo1(struct ndr_pull *ndr,
int ndr_flags, struct spoolss_AddDriverInfo1 *r)
+{
+ uint32_t _ptr_driver_name;
+ TALLOC_CTX *_mem_save_driver_name_0;
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name));
+ if (_ptr_driver_name) {
+ NDR_PULL_ALLOC(ndr, r->driver_name);
+ } else {
+ r->driver_name = NULL;
+ }
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ if (r->driver_name) {
+ _mem_save_driver_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->driver_name, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->driver_name));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->driver_name));
+ if (ndr_get_array_length(ndr, &r->driver_name) >
ndr_get_array_size(ndr, &r->driver_name)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
"Bad array size %u should exceed array length %u", ndr_get_array_size(ndr,
&r->driver_name), ndr_get_array_length(ndr, &r->driver_name));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->driver_name), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS,
&r->driver_name, ndr_get_array_length(ndr, &r->driver_name), sizeof(uint16_t),
CH_UTF16));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_driver_name_0, 0);
+ }
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_AddDriverInfo1(struct ndr_print *ndr, const
char *name, const struct spoolss_AddDriverInfo1 *r)
+{
+ ndr_print_struct(ndr, name, "spoolss_AddDriverInfo1");
+ ndr->depth++;
+ ndr_print_ptr(ndr, "driver_name", r->driver_name);
+ ndr->depth++;
+ if (r->driver_name) {
+ ndr_print_string(ndr, "driver_name", r->driver_name);
+ }
+ ndr->depth--;
+ ndr->depth--;
+}
+
+static enum ndr_err_code ndr_push_spoolss_DriverOSVersion(struct ndr_push
*ndr, int ndr_flags, enum spoolss_DriverOSVersion r)
+{
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r));
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolss_DriverOSVersion(struct ndr_pull
*ndr, int ndr_flags, enum spoolss_DriverOSVersion *r)
+{
+ uint32_t v;
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &v));
+ *r = v;
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_DriverOSVersion(struct ndr_print *ndr, const
char *name, enum spoolss_DriverOSVersion r)
+{
+ const char *val = NULL;
+
+ switch (r) {
+ case SPOOLSS_DRIVER_VERSION_9X: val =
"SPOOLSS_DRIVER_VERSION_9X"; break;
+ case SPOOLSS_DRIVER_VERSION_NT35: val =
"SPOOLSS_DRIVER_VERSION_NT35"; break;
+ case SPOOLSS_DRIVER_VERSION_NT4: val =
"SPOOLSS_DRIVER_VERSION_NT4"; break;
+ case SPOOLSS_DRIVER_VERSION_200X: val =
"SPOOLSS_DRIVER_VERSION_200X"; break;
+ }
+ ndr_print_enum(ndr, name, "ENUM", val, r);
+}
+
+static enum ndr_err_code ndr_push_spoolss_AddDriverInfo2(struct ndr_push *ndr,
int ndr_flags, const struct spoolss_AddDriverInfo2 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS,
r->version));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->driver_name));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->architecture));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->driver_path));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->data_file));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->config_file));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ if (r->driver_name) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->driver_name, ndr_charset_length(r->driver_name, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->architecture) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->architecture, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->architecture, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->architecture, ndr_charset_length(r->architecture, CH_UTF16),
sizeof(uint16_t), CH_UTF16));
+ }
+ if (r->driver_path) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_path, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_path, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->driver_path, ndr_charset_length(r->driver_path, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->data_file) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->data_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->data_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->data_file, ndr_charset_length(r->data_file, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->config_file) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->config_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->config_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->config_file, ndr_charset_length(r->config_file, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolss_AddDriverInfo2(struct ndr_pull *ndr,
int ndr_flags, struct spoolss_AddDriverInfo2 *r)
+{
+ uint32_t _ptr_driver_name;
+ TALLOC_CTX *_mem_save_driver_name_0;
+ uint32_t _ptr_architecture;
+ TALLOC_CTX *_mem_save_architecture_0;
+ uint32_t _ptr_driver_path;
+ TALLOC_CTX *_mem_save_driver_path_0;
+ uint32_t _ptr_data_file;
+ TALLOC_CTX *_mem_save_data_file_0;
+ uint32_t _ptr_config_file;
+ TALLOC_CTX *_mem_save_config_file_0;
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_pull_align(ndr, 4));
+ NDR_CHECK(ndr_pull_spoolss_DriverOSVersion(ndr, NDR_SCALARS,
&r->version));
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_name));
+ if (_ptr_driver_name) {
+ NDR_PULL_ALLOC(ndr, r->driver_name);
+ } else {
+ r->driver_name = NULL;
+ }
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_architecture));
+ if (_ptr_architecture) {
+ NDR_PULL_ALLOC(ndr, r->architecture);
+ } else {
+ r->architecture = NULL;
+ }
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_driver_path));
+ if (_ptr_driver_path) {
+ NDR_PULL_ALLOC(ndr, r->driver_path);
+ } else {
+ r->driver_path = NULL;
+ }
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data_file));
+ if (_ptr_data_file) {
+ NDR_PULL_ALLOC(ndr, r->data_file);
+ } else {
+ r->data_file = NULL;
+ }
+ NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_config_file));
+ if (_ptr_config_file) {
+ NDR_PULL_ALLOC(ndr, r->config_file);
+ } else {
+ r->config_file = NULL;
+ }
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ if (r->driver_name) {
+ _mem_save_driver_name_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->driver_name, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->driver_name));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->driver_name));
+ if (ndr_get_array_length(ndr, &r->driver_name) >
ndr_get_array_size(ndr, &r->driver_name)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
"Bad array size %u should exceed array length %u", ndr_get_array_size(ndr,
&r->driver_name), ndr_get_array_length(ndr, &r->driver_name));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->driver_name), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS,
&r->driver_name, ndr_get_array_length(ndr, &r->driver_name), sizeof(uint16_t),
CH_UTF16));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_driver_name_0, 0);
+ }
+ if (r->architecture) {
+ _mem_save_architecture_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->architecture, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->architecture));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->architecture));
+ if (ndr_get_array_length(ndr, &r->architecture) >
ndr_get_array_size(ndr, &r->architecture)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
"Bad array size %u should exceed array length %u", ndr_get_array_size(ndr,
&r->architecture), ndr_get_array_length(ndr, &r->architecture));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->architecture), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS,
&r->architecture, ndr_get_array_length(ndr, &r->architecture),
sizeof(uint16_t), CH_UTF16));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_architecture_0, 0);
+ }
+ if (r->driver_path) {
+ _mem_save_driver_path_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->driver_path, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->driver_path));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->driver_path));
+ if (ndr_get_array_length(ndr, &r->driver_path) >
ndr_get_array_size(ndr, &r->driver_path)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
"Bad array size %u should exceed array length %u", ndr_get_array_size(ndr,
&r->driver_path), ndr_get_array_length(ndr, &r->driver_path));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->driver_path), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS,
&r->driver_path, ndr_get_array_length(ndr, &r->driver_path), sizeof(uint16_t),
CH_UTF16));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_driver_path_0, 0);
+ }
+ if (r->data_file) {
+ _mem_save_data_file_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->data_file, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->data_file));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->data_file));
+ if (ndr_get_array_length(ndr, &r->data_file) >
ndr_get_array_size(ndr, &r->data_file)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
"Bad array size %u should exceed array length %u", ndr_get_array_size(ndr,
&r->data_file), ndr_get_array_length(ndr, &r->data_file));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->data_file), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS,
&r->data_file, ndr_get_array_length(ndr, &r->data_file), sizeof(uint16_t),
CH_UTF16));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_file_0, 0);
+ }
+ if (r->config_file) {
+ _mem_save_config_file_0 = NDR_PULL_GET_MEM_CTX(ndr);
+ NDR_PULL_SET_MEM_CTX(ndr, r->config_file, 0);
+ NDR_CHECK(ndr_pull_array_size(ndr, &r->config_file));
+ NDR_CHECK(ndr_pull_array_length(ndr, &r->config_file));
+ if (ndr_get_array_length(ndr, &r->config_file) >
ndr_get_array_size(ndr, &r->config_file)) {
+ return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE,
"Bad array size %u should exceed array length %u", ndr_get_array_size(ndr,
&r->config_file), ndr_get_array_length(ndr, &r->config_file));
+ }
+ NDR_CHECK(ndr_check_string_terminator(ndr,
ndr_get_array_length(ndr, &r->config_file), sizeof(uint16_t)));
+ NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS,
&r->config_file, ndr_get_array_length(ndr, &r->config_file), sizeof(uint16_t),
CH_UTF16));
+ NDR_PULL_SET_MEM_CTX(ndr, _mem_save_config_file_0, 0);
+ }
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_spoolss_AddDriverInfo2(struct ndr_print *ndr, const
char *name, const struct spoolss_AddDriverInfo2 *r)
+{
+ ndr_print_struct(ndr, name, "spoolss_AddDriverInfo2");
+ ndr->depth++;
+ ndr_print_spoolss_DriverOSVersion(ndr, "version", r->version);
+ ndr_print_ptr(ndr, "driver_name", r->driver_name);
+ ndr->depth++;
+ if (r->driver_name) {
+ ndr_print_string(ndr, "driver_name", r->driver_name);
+ }
+ ndr->depth--;
+ ndr_print_ptr(ndr, "architecture", r->architecture);
+ ndr->depth++;
+ if (r->architecture) {
+ ndr_print_string(ndr, "architecture", r->architecture);
+ }
+ ndr->depth--;
+ ndr_print_ptr(ndr, "driver_path", r->driver_path);
+ ndr->depth++;
+ if (r->driver_path) {
+ ndr_print_string(ndr, "driver_path", r->driver_path);
+ }
+ ndr->depth--;
+ ndr_print_ptr(ndr, "data_file", r->data_file);
+ ndr->depth++;
+ if (r->data_file) {
+ ndr_print_string(ndr, "data_file", r->data_file);
+ }
+ ndr->depth--;
+ ndr_print_ptr(ndr, "config_file", r->config_file);
+ ndr->depth++;
+ if (r->config_file) {
+ ndr_print_string(ndr, "config_file", r->config_file);
+ }
+ ndr->depth--;
+ ndr->depth--;
+}
+
+static enum ndr_err_code ndr_push_spoolss_AddDriverInfo3(struct ndr_push *ndr,
int ndr_flags, const struct spoolss_AddDriverInfo3 *r)
+{
+ if (ndr_flags & NDR_SCALARS) {
+ NDR_CHECK(ndr_push_align(ndr, 4));
+ NDR_CHECK(ndr_push_spoolss_DriverOSVersion(ndr, NDR_SCALARS,
r->version));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->driver_name));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->architecture));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->driver_path));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->data_file));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->config_file));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->help_file));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->monitor_name));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->default_datatype));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
((ndr_size_spoolss_StringArray(r->dependent_files, ndr->iconv_convenience,
ndr->flags) - 4) / 2)));
+ NDR_CHECK(ndr_push_unique_ptr(ndr, r->dependent_files));
+ }
+ if (ndr_flags & NDR_BUFFERS) {
+ if (r->driver_name) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->driver_name, ndr_charset_length(r->driver_name, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->architecture) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->architecture, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->architecture, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->architecture, ndr_charset_length(r->architecture, CH_UTF16),
sizeof(uint16_t), CH_UTF16));
+ }
+ if (r->driver_path) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_path, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->driver_path, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->driver_path, ndr_charset_length(r->driver_path, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->data_file) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->data_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->data_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->data_file, ndr_charset_length(r->data_file, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->config_file) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->config_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->config_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->config_file, ndr_charset_length(r->config_file, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->help_file) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->help_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->help_file, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->help_file, ndr_charset_length(r->help_file, CH_UTF16), sizeof(uint16_t),
CH_UTF16));
+ }
+ if (r->monitor_name) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->monitor_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->monitor_name, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->monitor_name, ndr_charset_length(r->monitor_name, CH_UTF16),
sizeof(uint16_t), CH_UTF16));
+ }
+ if (r->default_datatype) {
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->default_datatype, CH_UTF16)));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
ndr_charset_length(r->default_datatype, CH_UTF16)));
+ NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS,
r->default_datatype, ndr_charset_length(r->default_datatype, CH_UTF16),
sizeof(uint16_t), CH_UTF16));
+ }
+ if (r->dependent_files) {
+ NDR_CHECK(ndr_push_spoolss_StringArray(ndr,
NDR_SCALARS, r->dependent_files));
+ }
+ }
+ return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_spoolss_AddDriverInfo3(struct ndr_pull *ndr,
int ndr_flags, struct spoolss_AddDriverInfo3 *r)
+{
+ uint32_t _ptr_driver_name;
+ TALLOC_CTX *_mem_save_driver_name_0;
+ uint32_t _ptr_architecture;
+ TALLOC_CTX *_mem_save_architecture_0;
+ uint32_t _ptr_driver_path;
+ TALLOC_CTX *_mem_save_driver_path_0;
+ uint32_t _ptr_data_file;
+ TALLOC_CTX *_mem_save_data_file_0;
+ uint32_t _ptr_config_file;
+ TALLOC_CTX *_mem_save_config_file_0;
+ uint32_t _ptr_help_file;
+ TALLOC_CTX *_mem_save_help_file_0;
+ uint32_t _ptr_monitor_name;
+ TALLOC_CTX *_mem_save_monitor_name_0;
+ uint32_t _ptr_default_datatype;
+ TALLOC_CTX *_mem_save_default_datatype_0;
+ uint32_t _ptr_dependent_files;
+ TALLOC_CTX *_mem_save_dependent_files_0;
+ if (ndr_flags & NDR_SCALARS) {
--
Samba Shared Repository
