Re-run make idl.

Guenther
(This used to be commit cbc3f328d0deecdb7a6c2ff6088ab10ce7d0fbd5)

diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.c b/source3/librpc/gen_ndr/cli_ntsvcs.c
index 2efcf6b6c90cb5f50c5663dcd8eca2c01a0c5269..5597fccdb5b6579e72dfe9a95f3bd973b5affb9b 100644 (file)
--- a/source3/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.c
@@ -1766,12 +1766,20 @@ NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
 
 NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
                                  TALLOC_CTX *mem_ctx,
+                                 uint32_t idx,
+                                 struct PNP_HwProfInfo *info,
+                                 uint32_t unknown1,
+                                 uint32_t unknown2,
                                  WERROR *werror)
 {
        struct PNP_GetHwProfInfo r;
        NTSTATUS status;
 
        /* In parameters */
+       r.in.idx = idx;
+       r.in.info = info;
+       r.in.unknown1 = unknown1;
+       r.in.unknown2 = unknown2;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(PNP_GetHwProfInfo, &r);
@@ -1797,6 +1805,7 @@ NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
+       *info = *r.out.info;
 
        /* Return result */
        if (werror) {

diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.h b/source3/librpc/gen_ndr/cli_ntsvcs.h
index 84aad76139d5eecbe1258e93bf0ecab4fc9ce50e..33df63ee5d0a9240d8f11fbbe8cc282c2f8b5312 100644 (file)
--- a/source3/librpc/gen_ndr/cli_ntsvcs.h
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.h
@@ -141,6 +141,10 @@ NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
                                WERROR *werror);
 NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
                                  TALLOC_CTX *mem_ctx,
+                                 uint32_t idx,
+                                 struct PNP_HwProfInfo *info,
+                                 uint32_t unknown1,
+                                 uint32_t unknown2,
                                  WERROR *werror);
 NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,
                                    TALLOC_CTX *mem_ctx,

diff --git a/source3/librpc/gen_ndr/ndr_ntsvcs.c b/source3/librpc/gen_ndr/ndr_ntsvcs.c
index 2b299964e58d4380eb5c89327ae56535e579d5f7..058b78104a928a08770d22b765256dd4fbfdad8d 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/source3/librpc/gen_ndr/ndr_ntsvcs.c
@@ -3,6 +3,59 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_ntsvcs.h"
 
+static enum ndr_err_code ndr_push_PNP_HwProfInfo(struct ndr_push *ndr, int ndr_flags, const struct PNP_HwProfInfo *r)
+{
+       uint32_t cntr_unknown2_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_push_align(ndr, 4));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown1));
+               for (cntr_unknown2_0 = 0; cntr_unknown2_0 < 160; cntr_unknown2_0++) {
+                       NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, r->unknown2[cntr_unknown2_0]));
+               }
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown3));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+static enum ndr_err_code ndr_pull_PNP_HwProfInfo(struct ndr_pull *ndr, int ndr_flags, struct PNP_HwProfInfo *r)
+{
+       uint32_t cntr_unknown2_0;
+       if (ndr_flags & NDR_SCALARS) {
+               NDR_CHECK(ndr_pull_align(ndr, 4));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown1));
+               for (cntr_unknown2_0 = 0; cntr_unknown2_0 < 160; cntr_unknown2_0++) {
+                       NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, &r->unknown2[cntr_unknown2_0]));
+               }
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown3));
+       }
+       if (ndr_flags & NDR_BUFFERS) {
+       }
+       return NDR_ERR_SUCCESS;
+}
+
+_PUBLIC_ void ndr_print_PNP_HwProfInfo(struct ndr_print *ndr, const char *name, const struct PNP_HwProfInfo *r)
+{
+       uint32_t cntr_unknown2_0;
+       ndr_print_struct(ndr, name, "PNP_HwProfInfo");
+       ndr->depth++;
+       ndr_print_uint32(ndr, "unknown1", r->unknown1);
+       ndr->print(ndr, "%s: ARRAY(%d)", "unknown2", 160);
+       ndr->depth++;
+       for (cntr_unknown2_0=0;cntr_unknown2_0<160;cntr_unknown2_0++) {
+               char *idx_0=NULL;
+               asprintf(&idx_0, "[%d]", cntr_unknown2_0);
+               if (idx_0) {
+                       ndr_print_uint16(ndr, "unknown2", r->unknown2[cntr_unknown2_0]);
+                       free(idx_0);
+               }
+       }
+       ndr->depth--;
+       ndr_print_uint32(ndr, "unknown3", r->unknown3);
+       ndr->depth--;
+}
+
 static enum ndr_err_code ndr_push_PNP_Disconnect(struct ndr_push *ndr, int flags, const struct PNP_Disconnect *r)
 {
        if (flags & NDR_IN) {
@@ -1981,8 +2034,19 @@ _PUBLIC_ void ndr_print_PNP_HwProfFlags(struct ndr_print *ndr, const char *name,
 static enum ndr_err_code ndr_push_PNP_GetHwProfInfo(struct ndr_push *ndr, int flags, const struct PNP_GetHwProfInfo *r)
 {
        if (flags & NDR_IN) {
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.idx));
+               if (r->in.info == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_PNP_HwProfInfo(ndr, NDR_SCALARS, r->in.info));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown1));
+               NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.unknown2));
        }
        if (flags & NDR_OUT) {
+               if (r->out.info == NULL) {
+                       return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+               }
+               NDR_CHECK(ndr_push_PNP_HwProfInfo(ndr, NDR_SCALARS, r->out.info));
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -1990,9 +2054,31 @@ static enum ndr_err_code ndr_push_PNP_GetHwProfInfo(struct ndr_push *ndr, int fl
 
 static enum ndr_err_code ndr_pull_PNP_GetHwProfInfo(struct ndr_pull *ndr, int flags, struct PNP_GetHwProfInfo *r)
 {
+       TALLOC_CTX *_mem_save_info_0;
        if (flags & NDR_IN) {
+               ZERO_STRUCT(r->out);
+
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.idx));
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->in.info);
+               }
+               _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->in.info, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_PNP_HwProfInfo(ndr, NDR_SCALARS, r->in.info));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown1));
+               NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.unknown2));
+               NDR_PULL_ALLOC(ndr, r->out.info);
+               *r->out.info = *r->in.info;
        }
        if (flags & NDR_OUT) {
+               if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+                       NDR_PULL_ALLOC(ndr, r->out.info);
+               }
+               _mem_save_info_0 = NDR_PULL_GET_MEM_CTX(ndr);
+               NDR_PULL_SET_MEM_CTX(ndr, r->out.info, LIBNDR_FLAG_REF_ALLOC);
+               NDR_CHECK(ndr_pull_PNP_HwProfInfo(ndr, NDR_SCALARS, r->out.info));
+               NDR_PULL_SET_MEM_CTX(ndr, _mem_save_info_0, LIBNDR_FLAG_REF_ALLOC);
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
        }
        return NDR_ERR_SUCCESS;
@@ -2008,11 +2094,22 @@ _PUBLIC_ void ndr_print_PNP_GetHwProfInfo(struct ndr_print *ndr, const char *nam
        if (flags & NDR_IN) {
                ndr_print_struct(ndr, "in", "PNP_GetHwProfInfo");
                ndr->depth++;
+               ndr_print_uint32(ndr, "idx", r->in.idx);
+               ndr_print_ptr(ndr, "info", r->in.info);
+               ndr->depth++;
+               ndr_print_PNP_HwProfInfo(ndr, "info", r->in.info);
+               ndr->depth--;
+               ndr_print_uint32(ndr, "unknown1", r->in.unknown1);
+               ndr_print_uint32(ndr, "unknown2", r->in.unknown2);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
                ndr_print_struct(ndr, "out", "PNP_GetHwProfInfo");
                ndr->depth++;
+               ndr_print_ptr(ndr, "info", r->out.info);
+               ndr->depth++;
+               ndr_print_PNP_HwProfInfo(ndr, "info", r->out.info);
+               ndr->depth--;
                ndr_print_WERROR(ndr, "result", r->out.result);
                ndr->depth--;
        }

diff --git a/source3/librpc/gen_ndr/ndr_ntsvcs.h b/source3/librpc/gen_ndr/ndr_ntsvcs.h
index b415d6056b3d8f517bb6bde112a84daecb4e9c36..0e3b6b91c4d0ae2a71e5281b71d922580dc3cee2 100644 (file)
--- a/source3/librpc/gen_ndr/ndr_ntsvcs.h
+++ b/source3/librpc/gen_ndr/ndr_ntsvcs.h
@@ -142,6 +142,7 @@ extern const struct ndr_interface_table ndr_table_ntsvcs;
 #define NDR_PNP_GETSERVERSIDEDEVICEINSTALLFLAGS (0x40)
 
 #define NDR_NTSVCS_CALL_COUNT (65)
+void ndr_print_PNP_HwProfInfo(struct ndr_print *ndr, const char *name, const struct PNP_HwProfInfo *r);
 void ndr_print_PNP_Disconnect(struct ndr_print *ndr, const char *name, int flags, const struct PNP_Disconnect *r);
 void ndr_print_PNP_Connect(struct ndr_print *ndr, const char *name, int flags, const struct PNP_Connect *r);
 void ndr_print_PNP_GetVersion(struct ndr_print *ndr, const char *name, int flags, const struct PNP_GetVersion *r);

diff --git a/source3/librpc/gen_ndr/ntsvcs.h b/source3/librpc/gen_ndr/ntsvcs.h
index 8f8af699f3c31b0b7dadbe20f3f1b8c9eff6b449..9cdfa656b4148877a144bcf9d2abfc7d8aba60ac 100644 (file)
--- a/source3/librpc/gen_ndr/ntsvcs.h
+++ b/source3/librpc/gen_ndr/ntsvcs.h
@@ -5,6 +5,12 @@
 #ifndef _HEADER_ntsvcs
 #define _HEADER_ntsvcs
 
+struct PNP_HwProfInfo {
+       uint32_t unknown1;
+       uint16_t unknown2[160];
+       uint32_t unknown3;
+};
+
 
 struct PNP_Disconnect {
        struct {
@@ -362,6 +368,14 @@ struct PNP_HwProfFlags {
 
 struct PNP_GetHwProfInfo {
        struct {
+               uint32_t idx;
+               uint32_t unknown1;
+               uint32_t unknown2;
+               struct PNP_HwProfInfo *info;/* [ref] */
+       } in;
+
+       struct {
+               struct PNP_HwProfInfo *info;/* [ref] */
                WERROR result;
        } out;
 

diff --git a/source3/librpc/gen_ndr/srv_ntsvcs.c b/source3/librpc/gen_ndr/srv_ntsvcs.c
index b51f9304148934f3e3193bc52efb9c70353221a8..339de6c747a3d4a63fd5b8e8286bf4ef2014c321 100644 (file)
--- a/source3/librpc/gen_ndr/srv_ntsvcs.c
+++ b/source3/librpc/gen_ndr/srv_ntsvcs.c
@@ -3060,6 +3060,8 @@ static bool api_PNP_GetHwProfInfo(pipes_struct *p)
                NDR_PRINT_IN_DEBUG(PNP_GetHwProfInfo, r);
        }
 
+       ZERO_STRUCT(r->out);
+       r->out.info = r->in.info;
        r->out.result = _PNP_GetHwProfInfo(p, r);
 
        if (p->rng_fault_state) {