The branch, v3-3-test has been updated
via 86deff8d6e6b8e094b15a4e5392098d9b23e5ff5 (commit)
via 111ec984729fe2c47e173dab82f438bcacf42d1c (commit)
from 4beb7d74597f7e485b3832560b26e681439b606a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 86deff8d6e6b8e094b15a4e5392098d9b23e5ff5
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Nov 13 21:11:12 2008 +0100
re-run make idl.
Guenther
commit 111ec984729fe2c47e173dab82f438bcacf42d1c
Author: Günther Deschner <[EMAIL PROTECTED]>
Date: Thu Nov 13 21:11:31 2008 +0100
Fix PNP_GetHwProfInfo() (fixes Bug: #5888).
Guenther
-----------------------------------------------------------------------
Summary of changes:
source/librpc/gen_ndr/cli_ntsvcs.c | 8 +++---
source/librpc/gen_ndr/cli_ntsvcs.h | 4 +-
source/librpc/gen_ndr/ndr_ntsvcs.c | 46 ++++++++++++++++++------------------
source/librpc/gen_ndr/ntsvcs.h | 10 ++++----
source/librpc/idl/ntsvcs.idl | 10 ++++----
5 files changed, 39 insertions(+), 39 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/librpc/gen_ndr/cli_ntsvcs.c
b/source/librpc/gen_ndr/cli_ntsvcs.c
index bc5dba4..4b86923 100644
--- a/source/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source/librpc/gen_ndr/cli_ntsvcs.c
@@ -1744,8 +1744,8 @@ NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
uint32_t idx /* [in] */,
struct PNP_HwProfInfo *info /* [in,out] [ref]
*/,
- uint32_t unknown1 /* [in] */,
- uint32_t unknown2 /* [in] */,
+ uint32_t size /* [in] */,
+ uint32_t flags /* [in] */,
WERROR *werror)
{
struct PNP_GetHwProfInfo r;
@@ -1754,8 +1754,8 @@ NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client
*cli,
/* In parameters */
r.in.idx = idx;
r.in.info = info;
- r.in.unknown1 = unknown1;
- r.in.unknown2 = unknown2;
+ r.in.size = size;
+ r.in.flags = flags;
if (DEBUGLEVEL >= 10) {
NDR_PRINT_IN_DEBUG(PNP_GetHwProfInfo, &r);
diff --git a/source/librpc/gen_ndr/cli_ntsvcs.h
b/source/librpc/gen_ndr/cli_ntsvcs.h
index a52a79e..e8f393f 100644
--- a/source/librpc/gen_ndr/cli_ntsvcs.h
+++ b/source/librpc/gen_ndr/cli_ntsvcs.h
@@ -150,8 +150,8 @@ NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client
*cli,
TALLOC_CTX *mem_ctx,
uint32_t idx /* [in] */,
struct PNP_HwProfInfo *info /* [in,out] [ref]
*/,
- uint32_t unknown1 /* [in] */,
- uint32_t unknown2 /* [in] */,
+ uint32_t size /* [in] */,
+ uint32_t flags /* [in] */,
WERROR *werror);
NTSTATUS rpccli_PNP_AddEmptyLogConf(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 62acf47..6502970 100644
--- a/source/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/source/librpc/gen_ndr/ndr_ntsvcs.c
@@ -5,14 +5,14 @@
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;
+ uint32_t cntr_friendly_name_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->profile_handle));
+ for (cntr_friendly_name_0 = 0; cntr_friendly_name_0 < 80;
cntr_friendly_name_0++) {
+ NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS,
r->friendly_name[cntr_friendly_name_0]));
}
- NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->unknown3));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->flags));
}
if (ndr_flags & NDR_BUFFERS) {
}
@@ -21,14 +21,14 @@ static enum ndr_err_code ndr_push_PNP_HwProfInfo(struct
ndr_push *ndr, int ndr_f
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;
+ uint32_t cntr_friendly_name_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->profile_handle));
+ for (cntr_friendly_name_0 = 0; cntr_friendly_name_0 < 80;
cntr_friendly_name_0++) {
+ NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS,
&r->friendly_name[cntr_friendly_name_0]));
}
- NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->unknown3));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->flags));
}
if (ndr_flags & NDR_BUFFERS) {
}
@@ -37,21 +37,21 @@ static enum ndr_err_code ndr_pull_PNP_HwProfInfo(struct
ndr_pull *ndr, int ndr_f
_PUBLIC_ void ndr_print_PNP_HwProfInfo(struct ndr_print *ndr, const char
*name, const struct PNP_HwProfInfo *r)
{
- uint32_t cntr_unknown2_0;
+ uint32_t cntr_friendly_name_0;
ndr_print_struct(ndr, name, "PNP_HwProfInfo");
ndr->depth++;
- ndr_print_uint32(ndr, "unknown1", r->unknown1);
- ndr->print(ndr, "%s: ARRAY(%d)", "unknown2", (int)160);
+ ndr_print_uint32(ndr, "profile_handle", r->profile_handle);
+ ndr->print(ndr, "%s: ARRAY(%d)", "friendly_name", (int)80);
ndr->depth++;
- for (cntr_unknown2_0=0;cntr_unknown2_0<160;cntr_unknown2_0++) {
+ for
(cntr_friendly_name_0=0;cntr_friendly_name_0<80;cntr_friendly_name_0++) {
char *idx_0=NULL;
- if (asprintf(&idx_0, "[%d]", cntr_unknown2_0) != -1) {
- ndr_print_uint16(ndr, "unknown2",
r->unknown2[cntr_unknown2_0]);
+ if (asprintf(&idx_0, "[%d]", cntr_friendly_name_0) != -1) {
+ ndr_print_uint16(ndr, "friendly_name",
r->friendly_name[cntr_friendly_name_0]);
free(idx_0);
}
}
ndr->depth--;
- ndr_print_uint32(ndr, "unknown3", r->unknown3);
+ ndr_print_uint32(ndr, "flags", r->flags);
ndr->depth--;
}
@@ -2191,8 +2191,8 @@ static enum ndr_err_code
ndr_push_PNP_GetHwProfInfo(struct ndr_push *ndr, int fl
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));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.size));
+ NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.flags));
}
if (flags & NDR_OUT) {
if (r->out.info == NULL) {
@@ -2218,8 +2218,8 @@ static enum ndr_err_code
ndr_pull_PNP_GetHwProfInfo(struct ndr_pull *ndr, int fl
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_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.size));
+ NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.flags));
NDR_PULL_ALLOC(ndr, r->out.info);
*r->out.info = *r->in.info;
}
@@ -2251,8 +2251,8 @@ _PUBLIC_ void ndr_print_PNP_GetHwProfInfo(struct
ndr_print *ndr, const char *nam
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_print_uint32(ndr, "size", r->in.size);
+ ndr_print_uint32(ndr, "flags", r->in.flags);
ndr->depth--;
}
if (flags & NDR_OUT) {
diff --git a/source/librpc/gen_ndr/ntsvcs.h b/source/librpc/gen_ndr/ntsvcs.h
index 95484e4..11e6a47 100644
--- a/source/librpc/gen_ndr/ntsvcs.h
+++ b/source/librpc/gen_ndr/ntsvcs.h
@@ -7,9 +7,9 @@
#define DEV_REGPROP_DESC ( 1 )
struct PNP_HwProfInfo {
- uint32_t unknown1;
- uint16_t unknown2[160];
- uint32_t unknown3;
+ uint32_t profile_handle;
+ uint16_t friendly_name[80];
+ uint32_t flags;
};
@@ -383,8 +383,8 @@ struct PNP_HwProfFlags {
struct PNP_GetHwProfInfo {
struct {
uint32_t idx;
- uint32_t unknown1;
- uint32_t unknown2;
+ uint32_t size;
+ uint32_t flags;
struct PNP_HwProfInfo *info;/* [ref] */
} in;
diff --git a/source/librpc/idl/ntsvcs.idl b/source/librpc/idl/ntsvcs.idl
index bac2549..1dec1fc 100644
--- a/source/librpc/idl/ntsvcs.idl
+++ b/source/librpc/idl/ntsvcs.idl
@@ -246,16 +246,16 @@ interface ntsvcs
/* Function: 0x29 */
typedef struct {
- uint32 unknown1;
- uint16 unknown2[160];
- uint32 unknown3;
+ uint32 profile_handle;
+ uint16 friendly_name[80];
+ uint32 flags;
} PNP_HwProfInfo;
WERROR PNP_GetHwProfInfo(
[in] uint32 idx,
[in,out,ref] PNP_HwProfInfo *info,
- [in] uint32 unknown1,
- [in] uint32 unknown2
+ [in] uint32 size,
+ [in] uint32 flags
);
/******************/
--
Samba Shared Repository
