Changeset 427 for vendor/current/librpc

Timestamp:

Apr 9, 2010, 3:20:58 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba 3.5.x: update to 3.5.2

Location:

vendor/current/librpc

Files:

• gen_ndr/cli_spoolss.c (modified) (16 diffs)
• gen_ndr/cli_spoolss.h (modified) (8 diffs)
• gen_ndr/cli_winreg.c (modified) (4 diffs)
• gen_ndr/cli_winreg.h (modified) (2 diffs)
• gen_ndr/ndr_spoolss.c (modified) (27 diffs)
• gen_ndr/ndr_spoolss.h (modified) (2 diffs)
• gen_ndr/ndr_winreg.c (modified) (6 diffs)
• gen_ndr/spoolss.h (modified) (7 diffs)
• gen_ndr/srv_spoolss.c (modified) (4 diffs)
• gen_ndr/winreg.h (modified) (2 diffs)
• idl/spoolss.idl (modified) (3 diffs)
• idl/winreg.idl (modified) (1 diff)
• ndr/ndr_spoolss_buf.c (modified) (1 diff)
• ndr/ndr_spoolss_buf.h (modified) (1 diff)

vendor/current/librpc/gen_ndr/cli_spoolss.c

@@ -4153 +4153 @@
                                                       struct policy_handle *_handle /* [in] [ref] */,
                                                       const char *_value_name /* [in] [charset(UTF16)] */,
+                                                      enum winreg_Type *_type /* [out] [ref] */,
+                                                      uint8_t *_data /* [out] [ref,size_is(offered)] */,
                                                       uint32_t _offered /* [in]  */,
-                                                      enum winreg_Type *_type /* [out] [ref] */,
-                                                      union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                                       uint32_t *_needed /* [out] [ref] */)
 {
@@ -4227 +4227 @@
         /* Copy out parameters */
         *state->orig.out.type = *state->tmp.out.type;
-        *state->orig.out.data = *state->tmp.out.data;
+        memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.offered) * sizeof(*state->orig.out.data));
         *state->orig.out.needed = *state->tmp.out.needed;
 
@@ -4266 +4266 @@
                                        struct policy_handle *handle /* [in] [ref] */,
                                        const char *value_name /* [in] [charset(UTF16)] */,
+                                       enum winreg_Type *type /* [out] [ref] */,
+                                       uint8_t *data /* [out] [ref,size_is(offered)] */,
                                        uint32_t offered /* [in]  */,
-                                       enum winreg_Type *type /* [out] [ref] */,
-                                       union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                        uint32_t *needed /* [out] [ref] */,
                                        WERROR *werror)
@@ -4296 +4296 @@
         /* Return variables */
         *type = *r.out.type;
-        *data = *r.out.data;
+        memcpy(data, r.out.data, (r.in.offered) * sizeof(*data));
         *needed = *r.out.needed;
 
@@ -4322 +4322 @@
                                                       const char *_value_name /* [in] [charset(UTF16)] */,
                                                       enum winreg_Type _type /* [in]  */,
-                                                      union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
-                                                      uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */)
+                                                      uint8_t *_data /* [in] [ref,size_is(offered)] */,
+                                                      uint32_t _offered /* [in]  */)
 {
         struct tevent_req *req;
@@ -4342 +4342 @@
         state->orig.in.type = _type;
         state->orig.in.data = _data;
-        state->orig.in._offered = __offered;
+        state->orig.in.offered = _offered;
 
         /* Out parameters */
@@ -4424 +4424 @@
                                        const char *value_name /* [in] [charset(UTF16)] */,
                                        enum winreg_Type type /* [in]  */,
-                                       union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
-                                       uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+                                       uint8_t *data /* [in] [ref,size_is(offered)] */,
+                                       uint32_t offered /* [in]  */,
                                        WERROR *werror)
 {
@@ -4436 +4436 @@
         r.in.type = type;
         r.in.data = data;
-        r.in._offered = _offered;
+        r.in.offered = offered;
 
         status = cli->dispatch(cli,
@@ -11711 +11711 @@
                                                         const char *_value_name /* [in] [charset(UTF16)] */,
                                                         enum winreg_Type _type /* [in]  */,
-                                                        union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
-                                                        uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */)
+                                                        uint8_t *_data /* [in] [ref,size_is(offered)] */,
+                                                        uint32_t _offered /* [in]  */)
 {
         struct tevent_req *req;
@@ -11732 +11732 @@
         state->orig.in.type = _type;
         state->orig.in.data = _data;
-        state->orig.in._offered = __offered;
+        state->orig.in.offered = _offered;
 
         /* Out parameters */
@@ -11815 +11815 @@
                                          const char *value_name /* [in] [charset(UTF16)] */,
                                          enum winreg_Type type /* [in]  */,
-                                         union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
-                                         uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+                                         uint8_t *data /* [in] [ref,size_is(offered)] */,
+                                         uint32_t offered /* [in]  */,
                                          WERROR *werror)
 {
@@ -11828 +11828 @@
         r.in.type = type;
         r.in.data = data;
-        r.in._offered = _offered;
+        r.in.offered = offered;
 
         status = cli->dispatch(cli,
@@ -11869 +11869 @@
                                                         const char *_key_name /* [in] [charset(UTF16)] */,
                                                         const char *_value_name /* [in] [charset(UTF16)] */,
+                                                        enum winreg_Type *_type /* [out] [ref] */,
+                                                        uint8_t *_data /* [out] [ref,size_is(offered)] */,
                                                         uint32_t _offered /* [in]  */,
-                                                        enum winreg_Type *_type /* [out] [ref] */,
-                                                        union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                                         uint32_t *_needed /* [out] [ref] */)
 {
@@ -11944 +11944 @@
         /* Copy out parameters */
         *state->orig.out.type = *state->tmp.out.type;
-        *state->orig.out.data = *state->tmp.out.data;
+        memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.offered) * sizeof(*state->orig.out.data));
         *state->orig.out.needed = *state->tmp.out.needed;
 
@@ -11984 +11984 @@
                                          const char *key_name /* [in] [charset(UTF16)] */,
                                          const char *value_name /* [in] [charset(UTF16)] */,
+                                         enum winreg_Type *type /* [out] [ref] */,
+                                         uint8_t *data /* [out] [ref,size_is(offered)] */,
                                          uint32_t offered /* [in]  */,
-                                         enum winreg_Type *type /* [out] [ref] */,
-                                         union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                          uint32_t *needed /* [out] [ref] */,
                                          WERROR *werror)
@@ -12015 +12015 @@
         /* Return variables */
         *type = *r.out.type;
-        *data = *r.out.data;
+        memcpy(data, r.out.data, (r.in.offered) * sizeof(*data));
         *needed = *r.out.needed;
 

vendor/current/librpc/gen_ndr/cli_spoolss.h

@@ -479 +479 @@
                                                       struct policy_handle *_handle /* [in] [ref] */,
                                                       const char *_value_name /* [in] [charset(UTF16)] */,
+                                                      enum winreg_Type *_type /* [out] [ref] */,
+                                                      uint8_t *_data /* [out] [ref,size_is(offered)] */,
                                                       uint32_t _offered /* [in]  */,
-                                                      enum winreg_Type *_type /* [out] [ref] */,
-                                                      union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                                       uint32_t *_needed /* [out] [ref] */);
 NTSTATUS rpccli_spoolss_GetPrinterData_recv(struct tevent_req *req,
@@ -490 +490 @@
                                        struct policy_handle *handle /* [in] [ref] */,
                                        const char *value_name /* [in] [charset(UTF16)] */,
+                                       enum winreg_Type *type /* [out] [ref] */,
+                                       uint8_t *data /* [out] [ref,size_is(offered)] */,
                                        uint32_t offered /* [in]  */,
-                                       enum winreg_Type *type /* [out] [ref] */,
-                                       union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                        uint32_t *needed /* [out] [ref] */,
                                        WERROR *werror);
@@ -501 +501 @@
                                                       const char *_value_name /* [in] [charset(UTF16)] */,
                                                       enum winreg_Type _type /* [in]  */,
-                                                      union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
-                                                      uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */);
+                                                      uint8_t *_data /* [in] [ref,size_is(offered)] */,
+                                                      uint32_t _offered /* [in]  */);
 NTSTATUS rpccli_spoolss_SetPrinterData_recv(struct tevent_req *req,
                                             TALLOC_CTX *mem_ctx,
@@ -511 +511 @@
                                        const char *value_name /* [in] [charset(UTF16)] */,
                                        enum winreg_Type type /* [in]  */,
-                                       union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
-                                       uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+                                       uint8_t *data /* [in] [ref,size_is(offered)] */,
+                                       uint32_t offered /* [in]  */,
                                        WERROR *werror);
 struct tevent_req *rpccli_spoolss_WaitForPrinterChange_send(TALLOC_CTX *mem_ctx,
@@ -1200 +1200 @@
                                                         const char *_value_name /* [in] [charset(UTF16)] */,
                                                         enum winreg_Type _type /* [in]  */,
-                                                        union spoolss_PrinterData _data /* [in] [subcontext(4),switch_is(type)] */,
-                                                        uint32_t __offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */);
+                                                        uint8_t *_data /* [in] [ref,size_is(offered)] */,
+                                                        uint32_t _offered /* [in]  */);
 NTSTATUS rpccli_spoolss_SetPrinterDataEx_recv(struct tevent_req *req,
                                               TALLOC_CTX *mem_ctx,
@@ -1211 +1211 @@
                                          const char *value_name /* [in] [charset(UTF16)] */,
                                          enum winreg_Type type /* [in]  */,
-                                         union spoolss_PrinterData data /* [in] [subcontext(4),switch_is(type)] */,
-                                         uint32_t _offered /* [in] [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */,
+                                         uint8_t *data /* [in] [ref,size_is(offered)] */,
+                                         uint32_t offered /* [in]  */,
                                          WERROR *werror);
 struct tevent_req *rpccli_spoolss_GetPrinterDataEx_send(TALLOC_CTX *mem_ctx,
@@ -1220 +1220 @@
                                                         const char *_key_name /* [in] [charset(UTF16)] */,
                                                         const char *_value_name /* [in] [charset(UTF16)] */,
+                                                        enum winreg_Type *_type /* [out] [ref] */,
+                                                        uint8_t *_data /* [out] [ref,size_is(offered)] */,
                                                         uint32_t _offered /* [in]  */,
-                                                        enum winreg_Type *_type /* [out] [ref] */,
-                                                        union spoolss_PrinterData *_data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                                         uint32_t *_needed /* [out] [ref] */);
 NTSTATUS rpccli_spoolss_GetPrinterDataEx_recv(struct tevent_req *req,
@@ -1232 +1232 @@
                                          const char *key_name /* [in] [charset(UTF16)] */,
                                          const char *value_name /* [in] [charset(UTF16)] */,
+                                         enum winreg_Type *type /* [out] [ref] */,
+                                         uint8_t *data /* [out] [ref,size_is(offered)] */,
                                          uint32_t offered /* [in]  */,
-                                         enum winreg_Type *type /* [out] [ref] */,
-                                         union spoolss_PrinterData *data /* [out] [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */,
                                          uint32_t *needed /* [out] [ref] */,
                                          WERROR *werror);

vendor/current/librpc/gen_ndr/cli_winreg.c

@@ -2744 +2744 @@
                                                  struct winreg_String *_value_name /* [in] [ref] */,
                                                  enum winreg_Type *_type /* [in,out] [unique] */,
-                                                 uint8_t *_data /* [in,out] [unique,length_is(*data_length),size_is(*data_size)] */,
+                                                 uint8_t *_data /* [in,out] [unique,range(0,0x4000000),length_is(data_length?*data_length:0),size_is(data_size?*data_size:0)] */,
                                                  uint32_t *_data_size /* [in,out] [unique] */,
                                                  uint32_t *_data_length /* [in,out] [unique] */)
@@ -2824 +2824 @@
         }
         if (state->orig.out.data && state->tmp.out.data) {
-                memcpy(state->orig.out.data, state->tmp.out.data, (*state->tmp.in.data_size) * sizeof(*state->orig.out.data));
+                memcpy(state->orig.out.data, state->tmp.out.data, (state->tmp.in.data_size?*state->tmp.in.data_size:0) * sizeof(*state->orig.out.data));
         }
         if (state->orig.out.data_size && state->tmp.out.data_size) {
@@ -2870 +2870 @@
                                   struct winreg_String *value_name /* [in] [ref] */,
                                   enum winreg_Type *type /* [in,out] [unique] */,
-                                  uint8_t *data /* [in,out] [unique,length_is(*data_length),size_is(*data_size)] */,
+                                  uint8_t *data /* [in,out] [unique,range(0,0x4000000),length_is(data_length?*data_length:0),size_is(data_size?*data_size:0)] */,
                                   uint32_t *data_size /* [in,out] [unique] */,
                                   uint32_t *data_length /* [in,out] [unique] */,
@@ -2905 +2905 @@
         }
         if (data && r.out.data) {
-                memcpy(data, r.out.data, (*r.in.data_size) * sizeof(*data));
+                memcpy(data, r.out.data, (r.in.data_size?*r.in.data_size:0) * sizeof(*data));
         }
         if (data_size && r.out.data_size) {

vendor/current/librpc/gen_ndr/cli_winreg.h

@@ -299 +299 @@
                                                  struct winreg_String *_value_name /* [in] [ref] */,
                                                  enum winreg_Type *_type /* [in,out] [unique] */,
-                                                 uint8_t *_data /* [in,out] [unique,length_is(*data_length),size_is(*data_size)] */,
+                                                 uint8_t *_data /* [in,out] [unique,range(0,0x4000000),length_is(data_length?*data_length:0),size_is(data_size?*data_size:0)] */,
                                                  uint32_t *_data_size /* [in,out] [unique] */,
                                                  uint32_t *_data_length /* [in,out] [unique] */);
@@ -310 +310 @@
                                   struct winreg_String *value_name /* [in] [ref] */,
                                   enum winreg_Type *type /* [in,out] [unique] */,
-                                  uint8_t *data /* [in,out] [unique,length_is(*data_length),size_is(*data_size)] */,
+                                  uint8_t *data /* [in,out] [unique,range(0,0x4000000),length_is(data_length?*data_length:0),size_is(data_size?*data_size:0)] */,
                                   uint32_t *data_size /* [in,out] [unique] */,
                                   uint32_t *data_length /* [in,out] [unique] */,

vendor/current/librpc/gen_ndr/ndr_spoolss.c

@@ -19533 +19533 @@
                 NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 2 * strlen_m_term(r->value_name)));
                 NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->type));
-                NDR_CHECK(ndr_push_relative_ptr1(ndr, r->data));
-                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_size_spoolss_PrinterData(r->data, r->type, ndr->iconv_convenience, ndr->flags)));
+                {
+                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
+                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+                        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_trailer_align(ndr, 5));
         }
@@ -19549 +19554 @@
                         ndr->flags = _flags_save_string;
                 }
-                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_set_switch_value(_ndr_data, r->data, r->type));
-                                NDR_CHECK(ndr_push_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, r->data));
-                                NDR_CHECK(ndr_push_subcontext_end(ndr, _ndr_data, 0, r->data_length));
-                        }
-                        NDR_CHECK(ndr_push_relative_ptr2_end(ndr, r->data));
+                {
+                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
+                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+                        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_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_relative_ptr2_end(ndr, r->data));
+                        }
+                        ndr->flags = _flags_save_DATA_BLOB;
                 }
         }
@@ -19589 +19598 @@
                 NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->value_name_len));
                 NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->type));
-                NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
-                if (_ptr_data) {
-                        NDR_PULL_ALLOC(ndr, r->data);
-                        NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->data, _ptr_data));
-                } else {
-                        r->data = NULL;
+                {
+                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
+                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+                        NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_data));
+                        if (_ptr_data) {
+                                NDR_PULL_ALLOC(ndr, r->data);
+                                NDR_CHECK(ndr_pull_relative_ptr1(ndr, r->data, _ptr_data));
+                        } else {
+                                r->data = NULL;
+                        }
+                        ndr->flags = _flags_save_DATA_BLOB;
                 }
                 NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->data_length));
@@ -19616 +19630 @@
                         ndr->flags = _flags_save_string;
                 }
-                if (r->data) {
-                        uint32_t _relative_save_offset;
-                        _relative_save_offset = ndr->offset;
-                        NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->data));
-                        _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                        NDR_PULL_SET_MEM_CTX(ndr, r->data, 0);
-                        {
-                                struct ndr_pull *_ndr_data;
-                                NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_data, 0, r->data_length));
-                                NDR_CHECK(ndr_pull_set_switch_value(_ndr_data, r->data, r->type));
-                                NDR_CHECK(ndr_pull_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, r->data));
-                                NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_data, 0, r->data_length));
-                        }
-                        NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
-                        ndr->offset = _relative_save_offset;
+                {
+                        uint32_t _flags_save_DATA_BLOB = ndr->flags;
+                        ndr_set_flags(&ndr->flags, LIBNDR_FLAG_REMAINING);
+                        if (r->data) {
+                                uint32_t _relative_save_offset;
+                                _relative_save_offset = ndr->offset;
+                                NDR_CHECK(ndr_pull_relative_ptr2(ndr, r->data));
+                                _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                                NDR_PULL_SET_MEM_CTX(ndr, r->data, 0);
+                                {
+                                        struct ndr_pull *_ndr_data;
+                                        NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_data, 0, r->data_length));
+                                        NDR_CHECK(ndr_pull_DATA_BLOB(_ndr_data, NDR_SCALARS, r->data));
+                                        NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_data, 0, r->data_length));
+                                }
+                                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, 0);
+                                ndr->offset = _relative_save_offset;
+                        }
+                        ndr->flags = _flags_save_DATA_BLOB;
                 }
         }
@@ -19652 +19670 @@
         ndr->depth++;
         if (r->data) {
-                ndr_print_set_switch_value(ndr, r->data, r->type);
-                ndr_print_spoolss_PrinterData(ndr, "data", r->data);
-        }
-        ndr->depth--;
-        ndr_print_uint32(ndr, "data_length", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?ndr_size_spoolss_PrinterData(r->data, r->type, ndr->iconv_convenience, ndr->flags):r->data_length);
+                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->depth--;
 }
@@ -23406 +23423 @@
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push__spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct _spoolss_GetPrinterData *r)
+static enum ndr_err_code ndr_push_spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterData *r)
 {
         if (flags & NDR_IN) {
@@ -23427 +23444 @@
                         return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                 }
-                NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, *r->out.data));
+                NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->in.offered));
+                NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, r->in.offered));
                 if (r->out.needed == NULL) {
                         return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
@@ -23437 +23455 @@
 }
 
-_PUBLIC_ enum ndr_err_code ndr_pull__spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct _spoolss_GetPrinterData *r)
+static enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterData *r)
 {
         TALLOC_CTX *_mem_save_handle_0;
         TALLOC_CTX *_mem_save_type_0;
-        TALLOC_CTX *_mem_save_data_0;
         TALLOC_CTX *_mem_save_needed_0;
         if (flags & NDR_IN) {
@@ -23463 +23480 @@
                 NDR_PULL_ALLOC(ndr, r->out.type);
                 ZERO_STRUCTP(r->out.type);
-                NDR_PULL_ALLOC(ndr, r->out.data);
-                ZERO_STRUCTP(r->out.data);
+                NDR_PULL_ALLOC_N(ndr, r->out.data, r->in.offered);
+                memset(r->out.data, 0, (r->in.offered) * sizeof(*r->out.data));
                 NDR_PULL_ALLOC(ndr, r->out.needed);
                 ZERO_STRUCTP(r->out.needed);
@@ -23476 +23493 @@
                 NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, r->out.type));
                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_type_0, LIBNDR_FLAG_REF_ALLOC);
+                NDR_CHECK(ndr_pull_array_size(ndr, &r->out.data));
                 if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                        NDR_PULL_ALLOC(ndr, r->out.data);
-                }
-                _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                NDR_PULL_SET_MEM_CTX(ndr, r->out.data, LIBNDR_FLAG_REF_ALLOC);
-                NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, r->out.data));
-                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, LIBNDR_FLAG_REF_ALLOC);
+                        NDR_PULL_ALLOC_N(ndr, r->out.data, ndr_get_array_size(ndr, &r->out.data));
+                }
+                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->out.data, ndr_get_array_size(ndr, &r->out.data)));
                 if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                         NDR_PULL_ALLOC(ndr, r->out.needed);
@@ -23491 +23506 @@
                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_needed_0, LIBNDR_FLAG_REF_ALLOC);
                 NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_push___spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct __spoolss_GetPrinterData *r)
-{
-        if (flags & NDR_IN) {
-                NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
-        }
-        if (flags & NDR_OUT) {
-                if (r->out.data == NULL) {
-                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-                }
-                NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.data, r->in.type));
-                NDR_CHECK(ndr_push_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull___spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct __spoolss_GetPrinterData *r)
-{
-        TALLOC_CTX *_mem_save_data_0;
-        if (flags & NDR_IN) {
-                ZERO_STRUCT(r->out);
-
-                NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->in.type));
-                NDR_PULL_ALLOC(ndr, r->out.data);
-                ZERO_STRUCTP(r->out.data);
-        }
-        if (flags & NDR_OUT) {
-                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                        NDR_PULL_ALLOC(ndr, r->out.data);
-                }
-                _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                NDR_PULL_SET_MEM_CTX(ndr, r->out.data, LIBNDR_FLAG_REF_ALLOC);
-                NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.data, r->in.type));
-                NDR_CHECK(ndr_pull_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
-                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, LIBNDR_FLAG_REF_ALLOC);
+                if (r->out.data) {
+                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.data, r->in.offered));
+                }
         }
         return NDR_ERR_SUCCESS;
@@ -23560 +23540 @@
                 ndr_print_ptr(ndr, "data", r->out.data);
                 ndr->depth++;
-                ndr_print_set_switch_value(ndr, r->out.data, *r->out.type);
-                ndr_print_spoolss_PrinterData(ndr, "data", r->out.data);
+                ndr_print_array_uint8(ndr, "data", r->out.data, r->in.offered);
                 ndr->depth--;
                 ndr_print_ptr(ndr, "needed", r->out.needed);
@@ -23573 +23552 @@
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push__spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct _spoolss_SetPrinterData *r)
+static enum ndr_err_code ndr_push_spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterData *r)
 {
         if (flags & NDR_IN) {
@@ -23585 +23564 @@
                 NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.value_name, ndr_charset_length(r->in.value_name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                 NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
-                NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->in.data));
-                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in._offered));
+                if (r->in.data == NULL) {
+                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+                }
+                NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->in.offered));
+                NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, r->in.offered));
+                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offered));
         }
         if (flags & NDR_OUT) {
                 NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_push___spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct __spoolss_SetPrinterData *r)
-{
-        if (flags & NDR_IN) {
-                NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
-        }
-        if (flags & NDR_OUT) {
-                if (r->out.data == NULL) {
-                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-                }
-                NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.data, r->in.type));
-                NDR_CHECK(ndr_push_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
         }
         return NDR_ERR_SUCCESS;
@@ -23628 +23596 @@
                 NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.value_name, ndr_get_array_length(ndr, &r->in.value_name), sizeof(uint16_t), CH_UTF16));
                 NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->in.type));
-                {
-                        struct ndr_pull *_ndr_data;
-                        NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_data, 4, -1));
-                        NDR_CHECK(ndr_pull_set_switch_value(_ndr_data, &r->in.data, r->in.type));
-                        NDR_CHECK(ndr_pull_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, &r->in.data));
-                        NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_data, 4, -1));
-                }
-                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in._offered));
+                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.data));
+                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                        NDR_PULL_ALLOC_N(ndr, r->in.data, ndr_get_array_size(ndr, &r->in.data));
+                }
+                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->in.data, ndr_get_array_size(ndr, &r->in.data)));
+                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offered));
+                if (r->in.data) {
+                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data, r->in.offered));
+                }
         }
         if (flags & NDR_OUT) {
@@ -23659 +23628 @@
                 ndr_print_string(ndr, "value_name", r->in.value_name);
                 ndr_print_winreg_Type(ndr, "type", r->in.type);
-                ndr_print_set_switch_value(ndr, &r->in.data, r->in.type);
-                ndr_print_spoolss_PrinterData(ndr, "data", &r->in.data);
-                ndr_print_uint32(ndr, "_offered", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?ndr_size_spoolss_PrinterData(&r->in.data, r->in.type, ndr->iconv_convenience, flags):r->in._offered);
+                ndr_print_ptr(ndr, "data", r->in.data);
+                ndr->depth++;
+                ndr_print_array_uint8(ndr, "data", r->in.data, r->in.offered);
+                ndr->depth--;
+                ndr_print_uint32(ndr, "offered", r->in.offered);
                 ndr->depth--;
         }
@@ -27813 +27784 @@
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push__spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct _spoolss_SetPrinterDataEx *r)
+static enum ndr_err_code ndr_push_spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterDataEx *r)
 {
         if (flags & NDR_IN) {
@@ -27829 +27800 @@
                 NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.value_name, ndr_charset_length(r->in.value_name, CH_UTF16), sizeof(uint16_t), CH_UTF16));
                 NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
-                NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, r->in.data));
-                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in._offered));
+                if (r->in.data == NULL) {
+                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+                }
+                NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->in.offered));
+                NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, r->in.offered));
+                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.offered));
         }
         if (flags & NDR_OUT) {
                 NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_push___spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct __spoolss_SetPrinterDataEx *r)
-{
-        if (flags & NDR_IN) {
-                NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
-        }
-        if (flags & NDR_OUT) {
-                if (r->out.data == NULL) {
-                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-                }
-                NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.data, r->in.type));
-                NDR_CHECK(ndr_push_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
         }
         return NDR_ERR_SUCCESS;
@@ -27879 +27839 @@
                 NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.value_name, ndr_get_array_length(ndr, &r->in.value_name), sizeof(uint16_t), CH_UTF16));
                 NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->in.type));
-                {
-                        struct ndr_pull *_ndr_data;
-                        NDR_CHECK(ndr_pull_subcontext_start(ndr, &_ndr_data, 4, -1));
-                        NDR_CHECK(ndr_pull_set_switch_value(_ndr_data, &r->in.data, r->in.type));
-                        NDR_CHECK(ndr_pull_spoolss_PrinterData(_ndr_data, NDR_SCALARS|NDR_BUFFERS, &r->in.data));
-                        NDR_CHECK(ndr_pull_subcontext_end(ndr, _ndr_data, 4, -1));
-                }
-                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in._offered));
+                NDR_CHECK(ndr_pull_array_size(ndr, &r->in.data));
+                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                        NDR_PULL_ALLOC_N(ndr, r->in.data, ndr_get_array_size(ndr, &r->in.data));
+                }
+                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->in.data, ndr_get_array_size(ndr, &r->in.data)));
+                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.offered));
+                if (r->in.data) {
+                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data, r->in.offered));
+                }
         }
         if (flags & NDR_OUT) {
@@ -27911 +27872 @@
                 ndr_print_string(ndr, "value_name", r->in.value_name);
                 ndr_print_winreg_Type(ndr, "type", r->in.type);
-                ndr_print_set_switch_value(ndr, &r->in.data, r->in.type);
-                ndr_print_spoolss_PrinterData(ndr, "data", &r->in.data);
-                ndr_print_uint32(ndr, "_offered", (ndr->flags & LIBNDR_PRINT_SET_VALUES)?ndr_size_spoolss_PrinterData(&r->in.data, r->in.type, ndr->iconv_convenience, flags):r->in._offered);
+                ndr_print_ptr(ndr, "data", r->in.data);
+                ndr->depth++;
+                ndr_print_array_uint8(ndr, "data", r->in.data, r->in.offered);
+                ndr->depth--;
+                ndr_print_uint32(ndr, "offered", r->in.offered);
                 ndr->depth--;
         }
@@ -27925 +27888 @@
 }
 
-_PUBLIC_ enum ndr_err_code ndr_push__spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct _spoolss_GetPrinterDataEx *r)
+static enum ndr_err_code ndr_push_spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterDataEx *r)
 {
         if (flags & NDR_IN) {
@@ -27950 +27913 @@
                         return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
                 }
-                NDR_CHECK(ndr_push_DATA_BLOB(ndr, NDR_SCALARS, *r->out.data));
+                NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->in.offered));
+                NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, r->in.offered));
                 if (r->out.needed == NULL) {
                         return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
@@ -27960 +27924 @@
 }
 
-_PUBLIC_ enum ndr_err_code ndr_pull__spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct _spoolss_GetPrinterDataEx *r)
+static enum ndr_err_code ndr_pull_spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterDataEx *r)
 {
         TALLOC_CTX *_mem_save_handle_0;
         TALLOC_CTX *_mem_save_type_0;
-        TALLOC_CTX *_mem_save_data_0;
         TALLOC_CTX *_mem_save_needed_0;
         if (flags & NDR_IN) {
@@ -27993 +27956 @@
                 NDR_PULL_ALLOC(ndr, r->out.type);
                 ZERO_STRUCTP(r->out.type);
-                NDR_PULL_ALLOC(ndr, r->out.data);
-                ZERO_STRUCTP(r->out.data);
+                NDR_PULL_ALLOC_N(ndr, r->out.data, r->in.offered);
+                memset(r->out.data, 0, (r->in.offered) * sizeof(*r->out.data));
                 NDR_PULL_ALLOC(ndr, r->out.needed);
                 ZERO_STRUCTP(r->out.needed);
@@ -28006 +27969 @@
                 NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, r->out.type));
                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_type_0, LIBNDR_FLAG_REF_ALLOC);
+                NDR_CHECK(ndr_pull_array_size(ndr, &r->out.data));
                 if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                        NDR_PULL_ALLOC(ndr, r->out.data);
-                }
-                _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                NDR_PULL_SET_MEM_CTX(ndr, r->out.data, LIBNDR_FLAG_REF_ALLOC);
-                NDR_CHECK(ndr_pull_DATA_BLOB(ndr, NDR_SCALARS, r->out.data));
-                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, LIBNDR_FLAG_REF_ALLOC);
+                        NDR_PULL_ALLOC_N(ndr, r->out.data, ndr_get_array_size(ndr, &r->out.data));
+                }
+                NDR_CHECK(ndr_pull_array_uint8(ndr, NDR_SCALARS, r->out.data, ndr_get_array_size(ndr, &r->out.data)));
                 if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
                         NDR_PULL_ALLOC(ndr, r->out.needed);
@@ -28021 +27982 @@
                 NDR_PULL_SET_MEM_CTX(ndr, _mem_save_needed_0, LIBNDR_FLAG_REF_ALLOC);
                 NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_push___spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct __spoolss_GetPrinterDataEx *r)
-{
-        if (flags & NDR_IN) {
-                NDR_CHECK(ndr_push_winreg_Type(ndr, NDR_SCALARS, r->in.type));
-        }
-        if (flags & NDR_OUT) {
-                if (r->out.data == NULL) {
-                        return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
-                }
-                NDR_CHECK(ndr_push_set_switch_value(ndr, r->out.data, r->in.type));
-                NDR_CHECK(ndr_push_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-_PUBLIC_ enum ndr_err_code ndr_pull___spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct __spoolss_GetPrinterDataEx *r)
-{
-        TALLOC_CTX *_mem_save_data_0;
-        if (flags & NDR_IN) {
-                ZERO_STRUCT(r->out);
-
-                NDR_CHECK(ndr_pull_winreg_Type(ndr, NDR_SCALARS, &r->in.type));
-                NDR_PULL_ALLOC(ndr, r->out.data);
-                ZERO_STRUCTP(r->out.data);
-        }
-        if (flags & NDR_OUT) {
-                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                        NDR_PULL_ALLOC(ndr, r->out.data);
-                }
-                _mem_save_data_0 = NDR_PULL_GET_MEM_CTX(ndr);
-                NDR_PULL_SET_MEM_CTX(ndr, r->out.data, LIBNDR_FLAG_REF_ALLOC);
-                NDR_CHECK(ndr_pull_set_switch_value(ndr, r->out.data, r->in.type));
-                NDR_CHECK(ndr_pull_spoolss_PrinterData(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.data));
-                NDR_PULL_SET_MEM_CTX(ndr, _mem_save_data_0, LIBNDR_FLAG_REF_ALLOC);
+                if (r->out.data) {
+                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.data, r->in.offered));
+                }
         }
         return NDR_ERR_SUCCESS;
@@ -28091 +28017 @@
                 ndr_print_ptr(ndr, "data", r->out.data);
                 ndr->depth++;
-                ndr_print_set_switch_value(ndr, r->out.data, *r->out.type);
-                ndr_print_spoolss_PrinterData(ndr, "data", r->out.data);
+                ndr_print_array_uint8(ndr, "data", r->out.data, r->in.offered);
                 ndr->depth--;
                 ndr_print_ptr(ndr, "needed", r->out.needed);

vendor/current/librpc/gen_ndr/ndr_spoolss.h

@@ -612 +612 @@
 void ndr_print_spoolss_AddJob(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_AddJob *r);
 void ndr_print_spoolss_ScheduleJob(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_ScheduleJob *r);
-enum ndr_err_code ndr_push__spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct _spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_pull__spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct _spoolss_GetPrinterData *r);
-void ndr_print__spoolss_GetPrinterData(struct ndr_print *ndr, const char *name, int flags, const struct _spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_push___spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct __spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_pull___spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct __spoolss_GetPrinterData *r);
-void ndr_print___spoolss_GetPrinterData(struct ndr_print *ndr, const char *name, int flags, const struct __spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_push_spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterData *r);
 void ndr_print_spoolss_GetPrinterData(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_push__spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct _spoolss_SetPrinterData *r);
-enum ndr_err_code ndr_pull__spoolss_SetPrinterData(struct ndr_pull *ndr, int flags, struct _spoolss_SetPrinterData *r);
-void ndr_print__spoolss_SetPrinterData(struct ndr_print *ndr, const char *name, int flags, const struct _spoolss_SetPrinterData *r);
-enum ndr_err_code ndr_push___spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct __spoolss_SetPrinterData *r);
-enum ndr_err_code ndr_pull___spoolss_SetPrinterData(struct ndr_pull *ndr, int flags, struct __spoolss_SetPrinterData *r);
-void ndr_print___spoolss_SetPrinterData(struct ndr_print *ndr, const char *name, int flags, const struct __spoolss_SetPrinterData *r);
-enum ndr_err_code ndr_push_spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterData *r);
 void ndr_print_spoolss_SetPrinterData(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_SetPrinterData *r);
 void ndr_print_spoolss_WaitForPrinterChange(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_WaitForPrinterChange *r);
@@ -724 +709 @@
 void ndr_print_spoolss_4b(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_4b *r);
 void ndr_print_spoolss_4c(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_4c *r);
-enum ndr_err_code ndr_push__spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct _spoolss_SetPrinterDataEx *r);
-enum ndr_err_code ndr_pull__spoolss_SetPrinterDataEx(struct ndr_pull *ndr, int flags, struct _spoolss_SetPrinterDataEx *r);
-void ndr_print__spoolss_SetPrinterDataEx(struct ndr_print *ndr, const char *name, int flags, const struct _spoolss_SetPrinterDataEx *r);
-enum ndr_err_code ndr_push___spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct __spoolss_SetPrinterDataEx *r);
-enum ndr_err_code ndr_pull___spoolss_SetPrinterDataEx(struct ndr_pull *ndr, int flags, struct __spoolss_SetPrinterDataEx *r);
-void ndr_print___spoolss_SetPrinterDataEx(struct ndr_print *ndr, const char *name, int flags, const struct __spoolss_SetPrinterDataEx *r);
-enum ndr_err_code ndr_push_spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterDataEx *r);
 void ndr_print_spoolss_SetPrinterDataEx(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_SetPrinterDataEx *r);
-enum ndr_err_code ndr_push__spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct _spoolss_GetPrinterDataEx *r);
-enum ndr_err_code ndr_pull__spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct _spoolss_GetPrinterDataEx *r);
-void ndr_print__spoolss_GetPrinterDataEx(struct ndr_print *ndr, const char *name, int flags, const struct _spoolss_GetPrinterDataEx *r);
-enum ndr_err_code ndr_push___spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct __spoolss_GetPrinterDataEx *r);
-enum ndr_err_code ndr_pull___spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct __spoolss_GetPrinterDataEx *r);
-void ndr_print___spoolss_GetPrinterDataEx(struct ndr_print *ndr, const char *name, int flags, const struct __spoolss_GetPrinterDataEx *r);
-enum ndr_err_code ndr_push_spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterDataEx *r);
-enum ndr_err_code ndr_pull_spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterDataEx *r);
 void ndr_print_spoolss_GetPrinterDataEx(struct ndr_print *ndr, const char *name, int flags, const struct spoolss_GetPrinterDataEx *r);
 enum ndr_err_code ndr_push__spoolss_EnumPrinterDataEx(struct ndr_push *ndr, int flags, const struct _spoolss_EnumPrinterDataEx *r);

vendor/current/librpc/gen_ndr/ndr_winreg.c

@@ -2485 +2485 @@
                 NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data));
                 if (r->in.data) {
-                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, *r->in.data_size));
+                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->in.data_size?*r->in.data_size:0));
                         NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
-                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, *r->in.data_length));
-                        NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, *r->in.data_length));
+                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->in.data_length?*r->in.data_length:0));
+                        NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->in.data, r->in.data_length?*r->in.data_length:0));
                 }
                 NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.data_size));
@@ -2506 +2506 @@
                 NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.data));
                 if (r->out.data) {
-                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, *r->out.data_size));
+                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->out.data_size?*r->out.data_size:0));
                         NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, 0));
-                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, *r->out.data_length));
-                        NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, *r->out.data_length));
+                        NDR_CHECK(ndr_push_uint3264(ndr, NDR_SCALARS, r->out.data_length?*r->out.data_length:0));
+                        NDR_CHECK(ndr_push_array_uint8(ndr, NDR_SCALARS, r->out.data, r->out.data_length?*r->out.data_length:0));
                 }
                 NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.data_size));
@@ -2609 +2609 @@
                 if (r->in.data) {
                         if (r->in.data_size == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for size_is()");
-                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data, *r->in.data_size));
+                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->in.data, r->in.data_size?*r->in.data_size:0));
                 }
                 if (r->in.data) {
                         if (r->in.data_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
-                        NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->in.data, *r->in.data_length));
+                        NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->in.data, r->in.data_length?*r->in.data_length:0));
                 }
         }
@@ -2674 +2674 @@
                 if (r->out.data) {
                         if (r->out.data_size == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for size_is()");
-                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.data, *r->out.data_size));
+                        NDR_CHECK(ndr_check_array_size(ndr, (void*)&r->out.data, r->out.data_size?*r->out.data_size:0));
                 }
                 if (r->out.data) {
                         if (r->out.data_length == NULL) return ndr_pull_error(ndr, NDR_ERR_INVALID_POINTER, "NULL Pointer for length_is()");
-                        NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->out.data, *r->out.data_length));
+                        NDR_CHECK(ndr_check_array_length(ndr, (void*)&r->out.data, r->out.data_length?*r->out.data_length:0));
                 }
         }
@@ -2712 +2712 @@
                 if (r->in.data) {
                         if (r->in.data_length == NULL) return;
-                        ndr_print_array_uint8(ndr, "data", r->in.data, *r->in.data_length);
+                        ndr_print_array_uint8(ndr, "data", r->in.data, r->in.data_length?*r->in.data_length:0);
                 }
                 ndr->depth--;
@@ -2742 +2742 @@
                 if (r->out.data) {
                         if (r->out.data_length == NULL) return;
-                        ndr_print_array_uint8(ndr, "data", r->out.data, *r->out.data_length);
+                        ndr_print_array_uint8(ndr, "data", r->out.data, r->out.data_length?*r->out.data_length:0);
                 }
                 ndr->depth--;

vendor/current/librpc/gen_ndr/spoolss.h

@@ -2069 +2069 @@
         uint32_t value_name_len;/* [value(2*strlen_m_term(value_name))] */
         enum winreg_Type type;
-        union spoolss_PrinterData *data;/* [relative,subcontext_size(r->data_length),subcontext(0),switch_is(type)] */
-        uint32_t data_length;/* [value(ndr_size_spoolss_PrinterData(data,type,ndr->iconv_convenience,ndr->flags))] */
+        DATA_BLOB *data;/* [relative,subcontext_size(data_length),subcontext(0),flag(LIBNDR_FLAG_REMAINING)] */
+        uint32_t data_length;/* [value(data->length)] */
 }/* [relative_base,gensize,public] */;
 
@@ -2687 +2687 @@
 
 
-struct _spoolss_GetPrinterData {
+struct spoolss_GetPrinterData {
         struct {
                 struct policy_handle *handle;/* [ref] */
@@ -2696 +2696 @@
         struct {
                 enum winreg_Type *type;/* [ref] */
-                DATA_BLOB *data;/* [ref] */
+                uint8_t *data;/* [ref,size_is(offered)] */
                 uint32_t *needed;/* [ref] */
                 WERROR result;
@@ -2704 +2704 @@
 
 
-struct __spoolss_GetPrinterData {
-        struct {
-                enum winreg_Type type;
-        } in;
-
-        struct {
-                union spoolss_PrinterData *data;/* [ref,switch_is(type)] */
-        } out;
-
-};
-
-
-struct spoolss_GetPrinterData {
-        struct {
-                struct policy_handle *handle;/* [ref] */
-                const char *value_name;/* [charset(UTF16)] */
-                uint32_t offered;
-        } in;
-
-        struct {
-                enum winreg_Type *type;/* [ref] */
-                union spoolss_PrinterData *data;/* [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */
-                uint32_t *needed;/* [ref] */
-                WERROR result;
-        } out;
-
-};
-
-
-struct _spoolss_SetPrinterData {
+struct spoolss_SetPrinterData {
         struct {
                 struct policy_handle *handle;/* [ref] */
                 const char *value_name;/* [charset(UTF16)] */
                 enum winreg_Type type;
-                DATA_BLOB data;
-                uint32_t _offered;
-        } in;
-
-        struct {
-                WERROR result;
-        } out;
-
-};
-
-
-struct __spoolss_SetPrinterData {
-        struct {
-                enum winreg_Type type;
-        } in;
-
-        struct {
-                union spoolss_PrinterData *data;/* [ref,switch_is(type)] */
-        } out;
-
-};
-
-
-struct spoolss_SetPrinterData {
-        struct {
-                struct policy_handle *handle;/* [ref] */
-                const char *value_name;/* [charset(UTF16)] */
-                enum winreg_Type type;
-                union spoolss_PrinterData data;/* [subcontext(4),switch_is(type)] */
-                uint32_t _offered;/* [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */
+                uint8_t *data;/* [ref,size_is(offered)] */
+                uint32_t offered;
         } in;
 
@@ -3491 +3434 @@
 
 
-struct _spoolss_SetPrinterDataEx {
+struct spoolss_SetPrinterDataEx {
         struct {
                 struct policy_handle *handle;/* [ref] */
@@ -3497 +3440 @@
                 const char *value_name;/* [charset(UTF16)] */
                 enum winreg_Type type;
-                DATA_BLOB data;
-                uint32_t _offered;
-        } in;
-
-        struct {
-                WERROR result;
-        } out;
-
-};
-
-
-struct __spoolss_SetPrinterDataEx {
-        struct {
-                enum winreg_Type type;
-        } in;
-
-        struct {
-                union spoolss_PrinterData *data;/* [ref,switch_is(type)] */
-        } out;
-
-};
-
-
-struct spoolss_SetPrinterDataEx {
-        struct {
-                struct policy_handle *handle;/* [ref] */
-                const char *key_name;/* [charset(UTF16)] */
-                const char *value_name;/* [charset(UTF16)] */
-                enum winreg_Type type;
-                union spoolss_PrinterData data;/* [subcontext(4),switch_is(type)] */
-                uint32_t _offered;/* [value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] */
-        } in;
-
-        struct {
-                WERROR result;
-        } out;
-
-};
-
-
-struct _spoolss_GetPrinterDataEx {
+                uint8_t *data;/* [ref,size_is(offered)] */
+                uint32_t offered;
+        } in;
+
+        struct {
+                WERROR result;
+        } out;
+
+};
+
+
+struct spoolss_GetPrinterDataEx {
         struct {
                 struct policy_handle *handle;/* [ref] */
@@ -3547 +3461 @@
         struct {
                 enum winreg_Type *type;/* [ref] */
-                DATA_BLOB *data;/* [ref] */
-                uint32_t *needed;/* [ref] */
-                WERROR result;
-        } out;
-
-};
-
-
-struct __spoolss_GetPrinterDataEx {
-        struct {
-                enum winreg_Type type;
-        } in;
-
-        struct {
-                union spoolss_PrinterData *data;/* [ref,switch_is(type)] */
-        } out;
-
-};
-
-
-struct spoolss_GetPrinterDataEx {
-        struct {
-                struct policy_handle *handle;/* [ref] */
-                const char *key_name;/* [charset(UTF16)] */
-                const char *value_name;/* [charset(UTF16)] */
-                uint32_t offered;
-        } in;
-
-        struct {
-                enum winreg_Type *type;/* [ref] */
-                union spoolss_PrinterData *data;/* [subcontext_size(offered),ref,subcontext(4),switch_is(*type)] */
+                uint8_t *data;/* [ref,size_is(offered)] */
                 uint32_t *needed;/* [ref] */
                 WERROR result;

vendor/current/librpc/gen_ndr/srv_spoolss.c

@@ -2140 +2140 @@
         }
 
-        r->out.data = talloc_zero(r, union spoolss_PrinterData);
+        r->out.data = talloc_zero_array(r, uint8_t, r->in.offered);
         if (r->out.data == NULL) {
                 talloc_free(r);
@@ -6148 +6148 @@
         }
 
-        r->out.data = talloc_zero(r, union spoolss_PrinterData);
+        r->out.data = talloc_zero_array(r, uint8_t, r->in.offered);
         if (r->out.data == NULL) {
                 talloc_free(r);
@@ -8980 +8980 @@
                         }
 
-                        r->out.data = talloc_zero(mem_ctx, union spoolss_PrinterData);
+                        r->out.data = talloc_zero_array(mem_ctx, uint8_t, r->in.offered);
                         if (r->out.data == NULL) {
                         return NT_STATUS_NO_MEMORY;
@@ -9472 +9472 @@
                         }
 
-                        r->out.data = talloc_zero(mem_ctx, union spoolss_PrinterData);
+                        r->out.data = talloc_zero_array(mem_ctx, uint8_t, r->in.offered);
                         if (r->out.data == NULL) {
                         return NT_STATUS_NO_MEMORY;

vendor/current/librpc/gen_ndr/winreg.h

@@ -363 +363 @@
                 struct winreg_String *value_name;/* [ref] */
                 enum winreg_Type *type;/* [unique] */
-                uint8_t *data;/* [unique,length_is(*data_length),size_is(*data_size)] */
+                uint8_t *data;/* [unique,range(0,0x4000000),length_is(data_length?*data_length:0),size_is(data_size?*data_size:0)] */
                 uint32_t *data_size;/* [unique] */
                 uint32_t *data_length;/* [unique] */
@@ -370 +370 @@
         struct {
                 enum winreg_Type *type;/* [unique] */
-                uint8_t *data;/* [unique,length_is(*data_length),size_is(*data_size)] */
+                uint8_t *data;/* [unique,range(0,0x4000000),length_is(data_length?*data_length:0),size_is(data_size?*data_size:0)] */
                 uint32_t *data_size;/* [unique] */
                 uint32_t *data_length;/* [unique] */

vendor/current/librpc/idl/spoolss.idl

@@ -1622 +1622 @@
         const string SPOOL_REG_VERSIONNUMBER            = "versionNumber";
 
-        [noopnum,noprint,public] WERROR _spoolss_GetPrinterData(
+        WERROR spoolss_GetPrinterData(
                 [in,ref] policy_handle *handle,
                 [in]     [string,charset(UTF16)] uint16 value_name[],
+                [out,ref] winreg_Type *type,
+                [out,ref,size_is(offered)] uint8 *data,
                 [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref] DATA_BLOB *data,
                 [out,ref] uint32 *needed
         );
-        [noopnum,noprint,public] void __spoolss_GetPrinterData(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopull,nopush,public] WERROR spoolss_GetPrinterData(
-                [in,ref] policy_handle *handle,
-                [in]     [string,charset(UTF16)] uint16 value_name[],
-                [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref,subcontext(4),subcontext_size(offered),switch_is(*type)] spoolss_PrinterData *data,
-                [out,ref] uint32 *needed
-        );
 
         /******************/
         /* Function: 0x1b */
-        [noopnum,nopull,noprint,public] WERROR _spoolss_SetPrinterData(
+        WERROR spoolss_SetPrinterData(
                 [in,ref] policy_handle *handle,
                 [in] [string,charset(UTF16)] uint16 value_name[],
                 [in] winreg_Type type,
-                [in] DATA_BLOB data,
-                [in] uint32 _offered
-        );
-        [noopnum,nopull,noprint,public] void __spoolss_SetPrinterData(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopush] WERROR spoolss_SetPrinterData(
-                [in,ref] policy_handle *handle,
-                [in] [string,charset(UTF16)] uint16 value_name[],
-                [in] winreg_Type type,
-                [in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
-                [in,value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] uint32 _offered
+                [in,ref] [size_is(offered)] uint8 *data,
+                [in] uint32 offered
         );
 
@@ -2546 +2523 @@
         /******************/
         /* Function: 0x4d */
-        [noopnum,nopull,noprint,public] WERROR _spoolss_SetPrinterDataEx(
+        WERROR spoolss_SetPrinterDataEx(
                 [in,ref] policy_handle *handle,
                 [in] [string,charset(UTF16)] uint16 key_name[],
                 [in] [string,charset(UTF16)] uint16 value_name[],
                 [in] winreg_Type type,
-                [in] DATA_BLOB data,
-                [in] uint32 _offered
-        );
-        [noopnum,nopull,noprint,public] void __spoolss_SetPrinterDataEx(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopush] WERROR spoolss_SetPrinterDataEx(
-                [in,ref] policy_handle *handle,
-                [in] [string,charset(UTF16)] uint16 key_name[],
-                [in] [string,charset(UTF16)] uint16 value_name[],
-                [in] winreg_Type type,
-                [in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
-                [in,value(ndr_size_spoolss_PrinterData(&data,type,ndr->iconv_convenience,flags))] uint32 _offered
+                [in,ref] [size_is(offered)] uint8 *data,
+                [in] uint32 offered
         );
 
         /******************/
         /* Function: 0x4e */
-        [noopnum,noprint,public] WERROR _spoolss_GetPrinterDataEx(
+        WERROR spoolss_GetPrinterDataEx(
                 [in,ref] policy_handle *handle,
                 [in]     [string,charset(UTF16)] uint16 key_name[],
                 [in]     [string,charset(UTF16)] uint16 value_name[],
+                [out,ref] winreg_Type *type,
+                [out,ref,size_is(offered)] uint8 *data,
                 [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref] DATA_BLOB *data,
-                [out,ref] uint32 *needed
-        );
-        [noopnum,noprint,public] void __spoolss_GetPrinterDataEx(
-                [in] winreg_Type type,
-                [out,ref,switch_is(type)] spoolss_PrinterData *data
-        );
-        [nopull,nopush,public] WERROR spoolss_GetPrinterDataEx(
-                [in,ref] policy_handle *handle,
-                [in]     [string,charset(UTF16)] uint16 key_name[],
-                [in]     [string,charset(UTF16)] uint16 value_name[],
-                [in]     uint32 offered,
-                [out,ref] winreg_Type *type,
-                [out,ref,subcontext(4),subcontext_size(offered),switch_is(*type)] spoolss_PrinterData *data,
                 [out,ref] uint32 *needed
         );
@@ -2599 +2551 @@
                 [value(2*strlen_m_term(value_name))] uint32 value_name_len;
                 winreg_Type type;
-                [relative,switch_is(type),subcontext(0),subcontext_size(r->data_length)] spoolss_PrinterData *data;
-                [value(ndr_size_spoolss_PrinterData(data, type, ndr->iconv_convenience, ndr->flags))] uint32 data_length;
+                [relative,subcontext(0),subcontext_size(data_length),flag(NDR_REMAINING)] DATA_BLOB *data;
+                [value(data->length)] uint32 data_length;
         } spoolss_PrinterEnumValues;
 

vendor/current/librpc/idl/winreg.idl

@@ -257 +257 @@
                 [in,ref] winreg_String *value_name,
                 [in,out,unique] winreg_Type *type,
-                [in,out,unique,size_is(*data_size),length_is(*data_length)] uint8 *data,
+                [in,out,unique,size_is(data_size ? *data_size : 0),length_is(data_length ? *data_length : 0),range(0,0x4000000)] uint8 *data,
                 [in,out,unique] uint32 *data_size,
                 [in,out,unique] uint32 *data_length

vendor/current/librpc/ndr/ndr_spoolss_buf.c

@@ -558 +558 @@
 }
 
-/*
-  spoolss_GetPrinterData
-*/
-enum ndr_err_code ndr_push_spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterData *r)
-{
-        struct _spoolss_GetPrinterData _r;
-        if (flags & NDR_IN) {
-                _r.in.handle    = r->in.handle;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                NDR_CHECK(ndr_push__spoolss_GetPrinterData(ndr, flags, &_r));
-        }
-        if (flags & NDR_OUT) {
-                struct ndr_push *_ndr_info;
-                DATA_BLOB blob = data_blob(NULL, 0);
-                _r.in.handle    = r->in.handle;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                _r.out.type     = r->out.type;
-                _r.out.data     = &blob;
-                _r.out.needed   = r->out.needed;
-                _r.out.result   = r->out.result;
-                {
-                        struct __spoolss_GetPrinterData __r;
-                        DATA_BLOB _blob;
-                        _ndr_info = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-                        NDR_ERR_HAVE_NO_MEMORY(_ndr_info);
-                        _ndr_info->flags= ndr->flags;
-                        __r.in.type     = *r->out.type;
-                        __r.out.data    = r->out.data;
-                        NDR_CHECK(ndr_push___spoolss_GetPrinterData(_ndr_info, flags, &__r));
-                        if (r->in.offered > _ndr_info->offset) {
-                                uint32_t _padding_len = r->in.offered - _ndr_info->offset;
-                                NDR_CHECK(ndr_push_zero(_ndr_info, _padding_len));
-                        }
-                        _blob = ndr_push_blob(_ndr_info);
-                        _r.out.data = &_blob;
-                }
-                NDR_CHECK(ndr_push__spoolss_GetPrinterData(ndr, flags, &_r));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterData *r)
-{
-        struct _spoolss_GetPrinterData _r;
-        if (flags & NDR_IN) {
-                DATA_BLOB blob = data_blob(NULL,0);
-                ZERO_STRUCT(r->out);
-
-                _r.in.handle    = r->in.handle;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                _r.out.type     = r->out.type;
-                _r.out.data     = &blob;
-                _r.out.needed   = r->out.needed;
-                NDR_CHECK(ndr_pull__spoolss_GetPrinterData(ndr, flags, &_r));
-                r->in.handle    = _r.in.handle;
-                r->in.value_name= _r.in.value_name;
-                r->in.offered   = _r.in.offered;
-                r->out.needed   = _r.out.needed;
-        }
-        if (flags & NDR_OUT) {
-                DATA_BLOB blob = data_blob_talloc(ndr,NULL,0);
-                _r.in.handle    = r->in.handle;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                _r.out.type     = r->out.type;
-                _r.out.data     = &blob;
-                _r.out.needed   = r->out.needed;
-                _r.out.result   = r->out.result;
-                NDR_CHECK(ndr_pull__spoolss_GetPrinterData(ndr, flags, &_r));
-                r->out.type     = _r.out.type;
-                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                        NDR_PULL_ALLOC(ndr, r->out.data);
-                }
-                ZERO_STRUCTP(r->out.data);
-                r->out.needed   = _r.out.needed;
-                r->out.result   = _r.out.result;
-                if (_r.out.data && _r.out.data->length != r->in.offered) {
-                        return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,
-                                "SPOOLSS Buffer: r->in.offered[%u] doesn't match length of out buffer[%u]",
-                                (unsigned)r->in.offered, (unsigned)_r.out.data->length);
-                }
-                if (_r.out.data && _r.out.data->length > 0 && *r->out.needed <= _r.out.data->length) {
-                        struct __spoolss_GetPrinterData __r;
-                        struct ndr_pull *_ndr_data = ndr_pull_init_blob(_r.out.data, ndr, ndr->iconv_convenience);
-                        NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-                        _ndr_data->flags= ndr->flags;
-                        __r.in.type     = *r->out.type;
-                        __r.out.data    = r->out.data;
-                        NDR_CHECK(ndr_pull___spoolss_GetPrinterData(_ndr_data, flags, &__r));
-                        r->out.data     = __r.out.data;
-                } else {
-                        *r->out.type    = REG_NONE;
-                }
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-/*
-  spoolss_SetPrinterData
-*/
-enum ndr_err_code ndr_push_spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterData *r)
-{
-        struct _spoolss_SetPrinterData _r;
-        if (flags & NDR_IN) {
-                struct ndr_push *_ndr_data;
-                struct __spoolss_SetPrinterData __r;
-                DATA_BLOB _data_blob_data;
-
-                _ndr_data = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-                NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-                _ndr_data->flags= ndr->flags;
-
-                __r.in.type     = r->in.type;
-                __r.out.data    = discard_const_p(union spoolss_PrinterData, &r->in.data);
-                NDR_CHECK(ndr_push___spoolss_SetPrinterData(_ndr_data, NDR_OUT, &__r));
-                _data_blob_data = ndr_push_blob(_ndr_data);
-
-                _r.in.handle    = r->in.handle;
-                _r.in.value_name= r->in.value_name;
-                _r.in.type      = r->in.type;
-                _r.in.data      = _data_blob_data;
-                _r.in._offered  = _data_blob_data.length;
-                _r.out.result   = r->out.result;
-                NDR_CHECK(ndr_push__spoolss_SetPrinterData(ndr, flags, &_r));
-        }
-        if (flags & NDR_OUT) {
-                _r.in.handle    = r->in.handle;
-                _r.in.value_name= r->in.value_name;
-                _r.in.type      = r->in.type;
-                _r.in.data      = data_blob(NULL,0),
-                _r.in._offered  = r->in._offered;
-                _r.out.result   = r->out.result;
-                NDR_CHECK(ndr_push__spoolss_SetPrinterData(ndr, flags, &_r));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-/*
-  spoolss_GetPrinterDataEx
-*/
-enum ndr_err_code ndr_push_spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterDataEx *r)
-{
-        struct _spoolss_GetPrinterDataEx _r;
-        if (flags & NDR_IN) {
-                _r.in.handle    = r->in.handle;
-                _r.in.key_name  = r->in.key_name;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                NDR_CHECK(ndr_push__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-        }
-        if (flags & NDR_OUT) {
-                struct ndr_push *_ndr_info;
-                DATA_BLOB blob = data_blob(NULL, 0);
-                _r.in.handle    = r->in.handle;
-                _r.in.key_name  = r->in.key_name;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                _r.out.type     = r->out.type;
-                _r.out.data     = &blob;
-                _r.out.needed   = r->out.needed;
-                _r.out.result   = r->out.result;
-                {
-                        struct __spoolss_GetPrinterDataEx __r;
-                        DATA_BLOB _blob;
-                        _ndr_info = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-                        NDR_ERR_HAVE_NO_MEMORY(_ndr_info);
-                        _ndr_info->flags= ndr->flags;
-                        __r.in.type     = *r->out.type;
-                        __r.out.data    = r->out.data;
-                        NDR_CHECK(ndr_push___spoolss_GetPrinterDataEx(_ndr_info, flags, &__r));
-                        if (r->in.offered > _ndr_info->offset) {
-                                uint32_t _padding_len = r->in.offered - _ndr_info->offset;
-                                NDR_CHECK(ndr_push_zero(_ndr_info, _padding_len));
-                        }
-                        _blob = ndr_push_blob(_ndr_info);
-                        _r.out.data = &_blob;
-                }
-                NDR_CHECK(ndr_push__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-enum ndr_err_code ndr_pull_spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterDataEx *r)
-{
-        struct _spoolss_GetPrinterDataEx _r;
-        if (flags & NDR_IN) {
-                DATA_BLOB blob = data_blob(NULL,0);
-                ZERO_STRUCT(r->out);
-
-                _r.in.handle    = r->in.handle;
-                _r.in.key_name  = r->in.key_name;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                _r.out.type     = r->out.type;
-                _r.out.data     = &blob;
-                _r.out.needed   = r->out.needed;
-                NDR_CHECK(ndr_pull__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-                r->in.handle    = _r.in.handle;
-                r->in.key_name  = _r.in.key_name;
-                r->in.value_name= _r.in.value_name;
-                r->in.offered   = _r.in.offered;
-                r->out.needed   = _r.out.needed;
-        }
-        if (flags & NDR_OUT) {
-                DATA_BLOB blob = data_blob_talloc(ndr,NULL,0);
-                _r.in.handle    = r->in.handle;
-                _r.in.key_name  = r->in.key_name;
-                _r.in.value_name= r->in.value_name;
-                _r.in.offered   = r->in.offered;
-                _r.out.type     = r->out.type;
-                _r.out.data     = &blob;
-                _r.out.needed   = r->out.needed;
-                _r.out.result   = r->out.result;
-                NDR_CHECK(ndr_pull__spoolss_GetPrinterDataEx(ndr, flags, &_r));
-                r->out.type     = _r.out.type;
-                if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
-                        NDR_PULL_ALLOC(ndr, r->out.data);
-                }
-                ZERO_STRUCTP(r->out.data);
-                r->out.needed   = _r.out.needed;
-                r->out.result   = _r.out.result;
-                if (_r.out.data && _r.out.data->length != r->in.offered) {
-                        return ndr_pull_error(ndr, NDR_ERR_BUFSIZE,
-                                "SPOOLSS Buffer: r->in.offered[%u] doesn't match length of out buffer[%u]",
-                                (unsigned)r->in.offered, (unsigned)_r.out.data->length);
-                }
-                if (_r.out.data && _r.out.data->length > 0 && *r->out.needed <= _r.out.data->length) {
-                        struct __spoolss_GetPrinterDataEx __r;
-                        struct ndr_pull *_ndr_data = ndr_pull_init_blob(_r.out.data, ndr, ndr->iconv_convenience);
-                        NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-                        _ndr_data->flags= ndr->flags;
-                        __r.in.type     = *r->out.type;
-                        __r.out.data    = r->out.data;
-                        NDR_CHECK(ndr_pull___spoolss_GetPrinterDataEx(_ndr_data, flags, &__r));
-                        r->out.data     = __r.out.data;
-                } else {
-                        *r->out.type    = REG_NONE;
-                }
-        }
-        return NDR_ERR_SUCCESS;
-}
-
-/*
-  spoolss_SetPrinterDataEx
-*/
-enum ndr_err_code ndr_push_spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterDataEx *r)
-{
-        struct _spoolss_SetPrinterDataEx _r;
-        if (flags & NDR_IN) {
-                struct ndr_push *_ndr_data;
-                struct __spoolss_SetPrinterDataEx __r;
-                DATA_BLOB _data_blob_data;
-
-                _ndr_data = ndr_push_init_ctx(ndr, ndr->iconv_convenience);
-                NDR_ERR_HAVE_NO_MEMORY(_ndr_data);
-                _ndr_data->flags= ndr->flags;
-
-                __r.in.type     = r->in.type;
-                __r.out.data    = discard_const_p(union spoolss_PrinterData, &r->in.data);
-                NDR_CHECK(ndr_push___spoolss_SetPrinterDataEx(_ndr_data, NDR_OUT, &__r));
-                _data_blob_data = ndr_push_blob(_ndr_data);
-
-                _r.in.handle    = r->in.handle;
-                _r.in.key_name  = r->in.key_name;
-                _r.in.value_name= r->in.value_name;
-                _r.in.type      = r->in.type;
-                _r.in.data      = _data_blob_data;
-                _r.in._offered  = _data_blob_data.length;
-                _r.out.result   = r->out.result;
-                NDR_CHECK(ndr_push__spoolss_SetPrinterDataEx(ndr, flags, &_r));
-        }
-        if (flags & NDR_OUT) {
-                _r.in.handle    = r->in.handle;
-                _r.in.key_name  = r->in.key_name;
-                _r.in.value_name= r->in.value_name;
-                _r.in.type      = r->in.type;
-                _r.in.data      = data_blob(NULL,0),
-                _r.in._offered  = r->in._offered;
-                _r.out.result   = r->out.result;
-                NDR_CHECK(ndr_push__spoolss_SetPrinterDataEx(ndr, flags, &_r));
-        }
-        return NDR_ERR_SUCCESS;
-}
-
 uint32_t _ndr_size_spoolss_DeviceMode(struct spoolss_DeviceMode *devmode, struct smb_iconv_convenience *ic, uint32_t flags)
 {

vendor/current/librpc/ndr/ndr_spoolss_buf.h

@@ -43 +43 @@
 uint32_t ndr_size_spoolss_EnumPrinterDataEx_info(TALLOC_CTX *mem_ctx, struct smb_iconv_convenience *iconv_convenience,
                                                  uint32_t count, struct spoolss_PrinterEnumValues *info);
-enum ndr_err_code ndr_push_spoolss_GetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_pull_spoolss_GetPrinterData(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterData *r);
-enum ndr_err_code ndr_push_spoolss_SetPrinterData(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterData *r);
-enum ndr_err_code ndr_push_spoolss_GetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_GetPrinterDataEx *r);
-enum ndr_err_code ndr_pull_spoolss_GetPrinterDataEx(struct ndr_pull *ndr, int flags, struct spoolss_GetPrinterDataEx *r);
-enum ndr_err_code ndr_push_spoolss_SetPrinterDataEx(struct ndr_push *ndr, int flags, const struct spoolss_SetPrinterDataEx *r);
 uint32_t _ndr_size_spoolss_DeviceMode(struct spoolss_DeviceMode *devmode, struct smb_iconv_convenience *ic, uint32_t flags);
 size_t ndr_size_spoolss_StringArray(const struct spoolss_StringArray *r, struct smb_iconv_convenience *ic, int flags);