Re-run make idl.

Guenther

diff --git a/source/librpc/gen_ndr/cli_ntsvcs.c b/source/librpc/gen_ndr/cli_ntsvcs.c
index 7f2758060582e613737f4b70b13901acadf9a7ed..2efcf6b6c90cb5f50c5663dcd8eca2c01a0c5269 100644 (file)
--- a/source/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source/librpc/gen_ndr/cli_ntsvcs.c
@@ -1700,12 +1700,29 @@ NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
                                TALLOC_CTX *mem_ctx,
+                               uint32_t unknown1,
+                               const char *devicepath,
+                               uint32_t unknown2,
+                               uint32_t *unknown3,
+                               uint16_t *unknown4,
+                               const char *unknown5,
+                               const char **unknown5a,
+                               uint32_t unknown6,
+                               uint32_t unknown7,
                                WERROR *werror)
 {
        struct PNP_HwProfFlags r;
        NTSTATUS status;
 
        /* In parameters */
+       r.in.unknown1 = unknown1;
+       r.in.devicepath = devicepath;
+       r.in.unknown2 = unknown2;
+       r.in.unknown3 = unknown3;
+       r.in.unknown4 = unknown4;
+       r.in.unknown5 = unknown5;
+       r.in.unknown6 = unknown6;
+       r.in.unknown7 = unknown7;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(PNP_HwProfFlags, &r);
@@ -1731,6 +1748,13 @@ NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
+       *unknown3 = *r.out.unknown3;
+       if (unknown4 && r.out.unknown4) {
+               *unknown4 = *r.out.unknown4;
+       }
+       if (unknown5a && r.out.unknown5a) {
+               *unknown5a = *r.out.unknown5a;
+       }
 
        /* Return result */
        if (werror) {

diff --git a/source/librpc/gen_ndr/cli_ntsvcs.h b/source/librpc/gen_ndr/cli_ntsvcs.h
index 911200055f3c96c7ceac3d6e74b5b86920d7ccd4..84aad76139d5eecbe1258e93bf0ecab4fc9ce50e 100644 (file)
--- a/source/librpc/gen_ndr/cli_ntsvcs.h
+++ b/source/librpc/gen_ndr/cli_ntsvcs.h
@@ -129,6 +129,15 @@ NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
                                   WERROR *werror);
 NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
                                TALLOC_CTX *mem_ctx,
+                               uint32_t unknown1,
+                               const char *devicepath,
+                               uint32_t unknown2,
+                               uint32_t *unknown3,
+                               uint16_t *unknown4,
+                               const char *unknown5,
+                               const char **unknown5a,
+                               uint32_t unknown6,
+                               uint32_t unknown7,
                                WERROR *werror);
 NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
                                  TALLOC_CTX *mem_ctx,

diff --git a/source/librpc/gen_ndr/ndr_ntsvcs.c b/source/librpc/gen_ndr/ndr_ntsvcs.c
index c66ec2aa874aa71efef7f37c01582410ae06fb66..2b299964e58d4380eb5c89327ae56535e579d5f7 100644 (file)
--- a/source/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/source/librpc/gen_ndr/ndr_ntsvcs.c
@@ -1743,8 +1743,52 @@ _PUBLIC_ void ndr_print_PNP_RequestEjectPC(struct ndr_print *ndr, const char *na
 static enum ndr_err_code ndr_push_PNP_HwProfFlags(struct ndr_push *ndr, int flags, const struct PNP_HwProfFlags *r)
 {
        if (flags & NDR_IN) {
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown1));
+               if (r->in.devicepath == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.devicepath, CH_UTF16)));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.devicepath, CH_UTF16)));
+               NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.devicepath, ndr_charset_length(r->in.devicepath, CH_UTF16), sizeof(uint16_t), CH_UTF16));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown2));
+               if (r->in.unknown3 == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->in.unknown3));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.unknown4));
+               if (r->in.unknown4) {
+                       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, *r->in.unknown4));
+               }
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->in.unknown5));
+               if (r->in.unknown5) {
+                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.unknown5, CH_UTF16)));
+                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+                       NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(r->in.unknown5, CH_UTF16)));
+                       NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, r->in.unknown5, ndr_charset_length(r->in.unknown5, CH_UTF16), sizeof(uint16_t), CH_UTF16));
+               }
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown6));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown7));
        }
        if (flags & NDR_OUT) {
+               if (r->out.unknown3 == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.unknown3));
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.unknown4));
+               if (r->out.unknown4) {
+                       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, *r->out.unknown4));
+               }
+               NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.unknown5a));
+               if (r->out.unknown5a) {
+                       NDR_CHECK(ndr_push_unique_ptr(ndr, *r->out.unknown5a));
+                       if (*r->out.unknown5a) {
+                               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(*r->out.unknown5a, CH_UTF16)));
+                               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+                               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, ndr_charset_length(*r->out.unknown5a, CH_UTF16)));
+                               NDR_CHECK(ndr_push_charset(ndr, NDR_SCALARS, *r->out.unknown5a, ndr_charset_length(*r->out.unknown5a, CH_UTF16), sizeof(uint16_t), CH_UTF16));
+                       }
+               }
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -1752,9 +1796,117 @@ static enum ndr_err_code ndr_push_PNP_HwProfFlags(struct ndr_push *ndr, int flag
 
 static enum ndr_err_code ndr_pull_PNP_HwProfFlags(struct ndr_pull *ndr, int flags, struct PNP_HwProfFlags *r)
 {
+       uint32_t _ptr_unknown4;
+       uint32_t _ptr_unknown5;
+       uint32_t _ptr_unknown5a;
+       TALLOC_CTX *_mem_save_unknown3_0;
+       TALLOC_CTX *_mem_save_unknown4_0;
+       TALLOC_CTX *_mem_save_unknown5_0;
+       TALLOC_CTX *_mem_save_unknown5a_0;
+       TALLOC_CTX *_mem_save_unknown5a_1;
        if (flags & NDR_IN) {
+               ZERO_STRUCT(r->out);
+
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown1));
+               NDR_CHECK(ndr_pull_array_size(ndr, &r->in.devicepath));
+               NDR_CHECK(ndr_pull_array_length(ndr, &r->in.devicepath));
+               if (ndr_get_array_length(ndr, &r->in.devicepath) > ndr_get_array_size(ndr, &r->in.devicepath)) {
+                       return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.devicepath), ndr_get_array_length(ndr, &r->in.devicepath));
+               }
+               NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.devicepath), sizeof(uint16_t)));
+               NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.devicepath, ndr_get_array_length(ndr, &r->in.devicepath), sizeof(uint16_t), CH_UTF16));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown2));
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->in.unknown3);
+               }
+               _mem_save_unknown3_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->in.unknown3, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->in.unknown3));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown3_0, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_unknown4));
+               if (_ptr_unknown4) {
+                       NDR_PULL_ALLOC(ndr, r->in.unknown4);
+               } else {
+                       r->in.unknown4 = NULL;
+               }
+               if (r->in.unknown4) {
+                       _mem_save_unknown4_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->in.unknown4, 0);
+                       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, r->in.unknown4));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown4_0, 0);
+               }
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_unknown5));
+               if (_ptr_unknown5) {
+                       NDR_PULL_ALLOC(ndr, r->in.unknown5);
+               } else {
+                       r->in.unknown5 = NULL;
+               }
+               if (r->in.unknown5) {
+                       _mem_save_unknown5_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->in.unknown5, 0);
+                       NDR_CHECK(ndr_pull_array_size(ndr, &r->in.unknown5));
+                       NDR_CHECK(ndr_pull_array_length(ndr, &r->in.unknown5));
+                       if (ndr_get_array_length(ndr, &r->in.unknown5) > ndr_get_array_size(ndr, &r->in.unknown5)) {
+                               return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, &r->in.unknown5), ndr_get_array_length(ndr, &r->in.unknown5));
+                       }
+                       NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, &r->in.unknown5), sizeof(uint16_t)));
+                       NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, &r->in.unknown5, ndr_get_array_length(ndr, &r->in.unknown5), sizeof(uint16_t), CH_UTF16));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown5_0, 0);
+               }
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown6));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown7));
+               NDR_PULL_ALLOC(ndr, r->out.unknown3);
+               *r->out.unknown3 = *r->in.unknown3;
        }
        if (flags & NDR_OUT) {
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->out.unknown3);
+               }
+               _mem_save_unknown3_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->out.unknown3, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, r->out.unknown3));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown3_0, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_unknown4));
+               if (_ptr_unknown4) {
+                       NDR_PULL_ALLOC(ndr, r->out.unknown4);
+               } else {
+                       r->out.unknown4 = NULL;
+               }
+               if (r->out.unknown4) {
+                       _mem_save_unknown4_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->out.unknown4, 0);
+                       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, r->out.unknown4));
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown4_0, 0);
+               }
+               NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_unknown5a));
+               if (_ptr_unknown5a) {
+                       NDR_PULL_ALLOC(ndr, r->out.unknown5a);
+               } else {
+                       r->out.unknown5a = NULL;
+               }
+               if (r->out.unknown5a) {
+                       _mem_save_unknown5a_0 = NDR_PULL_GET_MEM_CTX(ndr);
+                       NDR_PULL_SET_MEM_CTX(ndr, r->out.unknown5a, 0);
+                       NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_unknown5a));
+                       if (_ptr_unknown5a) {
+                               NDR_PULL_ALLOC(ndr, *r->out.unknown5a);
+                       } else {
+                               *r->out.unknown5a = NULL;
+                       }
+                       if (*r->out.unknown5a) {
+                               _mem_save_unknown5a_1 = NDR_PULL_GET_MEM_CTX(ndr);
+                               NDR_PULL_SET_MEM_CTX(ndr, *r->out.unknown5a, 0);
+                               NDR_CHECK(ndr_pull_array_size(ndr, r->out.unknown5a));
+                               NDR_CHECK(ndr_pull_array_length(ndr, r->out.unknown5a));
+                               if (ndr_get_array_length(ndr, r->out.unknown5a) > ndr_get_array_size(ndr, r->out.unknown5a)) {
+                                       return ndr_pull_error(ndr, NDR_ERR_ARRAY_SIZE, "Bad array size %u should exceed array length %u", ndr_get_array_size(ndr, r->out.unknown5a), ndr_get_array_length(ndr, r->out.unknown5a));
+                               }
+                               NDR_CHECK(ndr_check_string_terminator(ndr, ndr_get_array_length(ndr, r->out.unknown5a), sizeof(uint16_t)));
+                               NDR_CHECK(ndr_pull_charset(ndr, NDR_SCALARS, r->out.unknown5a, ndr_get_array_length(ndr, r->out.unknown5a), sizeof(uint16_t), CH_UTF16));
+                               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown5a_1, 0);
+                       }
+                       NDR_PULL_SET_MEM_CTX(ndr, _mem_save_unknown5a_0, 0);
+               }
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -1770,11 +1922,56 @@ _PUBLIC_ void ndr_print_PNP_HwProfFlags(struct ndr_print *ndr, const char *name,
        if (flags & NDR_IN) {
                ndr_print_struct(ndr, "in", "PNP_HwProfFlags");
                ndr->depth++;
+               ndr_print_uint32(ndr, "unknown1", r->in.unknown1);
+               ndr_print_ptr(ndr, "devicepath", r->in.devicepath);
+               ndr->depth++;
+               ndr_print_string(ndr, "devicepath", r->in.devicepath);
+               ndr->depth--;
+               ndr_print_uint32(ndr, "unknown2", r->in.unknown2);
+               ndr_print_ptr(ndr, "unknown3", r->in.unknown3);
+               ndr->depth++;
+               ndr_print_uint32(ndr, "unknown3", *r->in.unknown3);
+               ndr->depth--;
+               ndr_print_ptr(ndr, "unknown4", r->in.unknown4);
+               ndr->depth++;
+               if (r->in.unknown4) {
+                       ndr_print_uint16(ndr, "unknown4", *r->in.unknown4);
+               }
+               ndr->depth--;
+               ndr_print_ptr(ndr, "unknown5", r->in.unknown5);
+               ndr->depth++;
+               if (r->in.unknown5) {
+                       ndr_print_string(ndr, "unknown5", r->in.unknown5);
+               }
+               ndr->depth--;
+               ndr_print_uint32(ndr, "unknown6", r->in.unknown6);
+               ndr_print_uint32(ndr, "unknown7", r->in.unknown7);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
                ndr_print_struct(ndr, "out", "PNP_HwProfFlags");
                ndr->depth++;
+               ndr_print_ptr(ndr, "unknown3", r->out.unknown3);
+               ndr->depth++;
+               ndr_print_uint32(ndr, "unknown3", *r->out.unknown3);
+               ndr->depth--;
+               ndr_print_ptr(ndr, "unknown4", r->out.unknown4);
+               ndr->depth++;
+               if (r->out.unknown4) {
+                       ndr_print_uint16(ndr, "unknown4", *r->out.unknown4);
+               }
+               ndr->depth--;
+               ndr_print_ptr(ndr, "unknown5a", r->out.unknown5a);
+               ndr->depth++;
+               if (r->out.unknown5a) {
+                       ndr_print_ptr(ndr, "unknown5a", *r->out.unknown5a);
+                       ndr->depth++;
+                       if (*r->out.unknown5a) {
+                               ndr_print_string(ndr, "unknown5a", *r->out.unknown5a);
+                       }
+                       ndr->depth--;
+               }
+               ndr->depth--;
                ndr_print_WERROR(ndr, "result", r->out.result);
                ndr->depth--;
        }

diff --git a/source/librpc/gen_ndr/ntsvcs.h b/source/librpc/gen_ndr/ntsvcs.h
index 2384011789f76eeb9f59716f4f1691b3b70ebb8a..8f8af699f3c31b0b7dadbe20f3f1b8c9eff6b449 100644 (file)
--- a/source/librpc/gen_ndr/ntsvcs.h
+++ b/source/librpc/gen_ndr/ntsvcs.h
@@ -340,6 +340,20 @@ struct PNP_RequestEjectPC {
 
 struct PNP_HwProfFlags {
        struct {
+               uint32_t unknown1;
+               const char *devicepath;/* [ref,charset(UTF16)] */
+               uint32_t unknown2;
+               const char *unknown5;/* [unique,charset(UTF16)] */
+               uint32_t unknown6;
+               uint32_t unknown7;
+               uint32_t *unknown3;/* [ref] */
+               uint16_t *unknown4;/* [unique] */
+       } in;
+
+       struct {
+               const char **unknown5a;/* [unique,charset(UTF16)] */
+               uint32_t *unknown3;/* [ref] */
+               uint16_t *unknown4;/* [unique] */
                WERROR result;
        } out;
 

diff --git a/source/librpc/gen_ndr/srv_ntsvcs.c b/source/librpc/gen_ndr/srv_ntsvcs.c
index 608353c480560d149bda27526155541cb729159a..b51f9304148934f3e3193bc52efb9c70353221a8 100644 (file)
--- a/source/librpc/gen_ndr/srv_ntsvcs.c
+++ b/source/librpc/gen_ndr/srv_ntsvcs.c
@@ -2978,6 +2978,15 @@ static bool api_PNP_HwProfFlags(pipes_struct *p)
                NDR_PRINT_IN_DEBUG(PNP_HwProfFlags, r);
        }
 
+       ZERO_STRUCT(r->out);
+       r->out.unknown3 = r->in.unknown3;
+       r->out.unknown4 = r->in.unknown4;
+       r->out.unknown5a = talloc_zero(r, const char *);
+       if (r->out.unknown5a == NULL) {
+               talloc_free(r);
+               return false;
+       }
+
        r->out.result = _PNP_HwProfFlags(p, r);
 
        if (p->rng_fault_state) {