From 92c505bf7f15a79c6e32a38b2d218f65b0283507 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 31 May 2007 15:46:01 +0000 Subject: [PATCH] r23269: Regenerate svcctl files after IDL fixes --- source/librpc/gen_ndr/cli_svcctl.c | 28 +++---- source/librpc/gen_ndr/cli_svcctl.h | 12 +-- source/librpc/gen_ndr/ndr_svcctl.c | 164 ++++++++++++++++++------------------- source/librpc/gen_ndr/srv_svcctl.c | 24 +++--- source/librpc/gen_ndr/svcctl.h | 12 +-- 5 files changed, 120 insertions(+), 120 deletions(-) diff --git a/source/librpc/gen_ndr/cli_svcctl.c b/source/librpc/gen_ndr/cli_svcctl.c index 5fb6f68b62b..ce1904f04f3 100644 --- a/source/librpc/gen_ndr/cli_svcctl.c +++ b/source/librpc/gen_ndr/cli_svcctl.c @@ -37,7 +37,7 @@ NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli, TALLOC_CT return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t control, struct SERVICE_STATUS *status) +NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t control, struct SERVICE_STATUS *service_status) { struct svcctl_ControlService r; NTSTATUS status; @@ -63,7 +63,7 @@ NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli, TALLOC_CTX *m } /* Return variables */ - *status = *r.out.status; + *service_status = *r.out.service_status; /* Return result */ return werror_to_ntstatus(r.out.result); @@ -188,7 +188,7 @@ NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli, TAL return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct SERVICE_STATUS *status) +NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct SERVICE_STATUS *service_status) { struct svcctl_QueryServiceStatus r; NTSTATUS status; @@ -213,7 +213,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli, TALLOC_CT } /* Return variables */ - *status = *r.out.status; + *service_status = *r.out.service_status; /* Return result */ return werror_to_ntstatus(r.out.result); @@ -429,7 +429,7 @@ NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli, TALLOC_CTX *m return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned) +NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *service_status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned) { struct svcctl_EnumDependentServicesW r; NTSTATUS status; @@ -456,8 +456,8 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli, TALLO } /* Return variables */ - if ( status ) { - *status = *r.out.status; + if ( service_status ) { + *service_status = *r.out.service_status; } *bytes_needed = *r.out.bytes_needed; *services_returned = *r.out.services_returned; @@ -605,7 +605,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli, TALLOC_C return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *status, uint32_t *required_buf_size) +NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *lock_status, uint32_t *required_buf_size) { struct svcctl_QueryServiceLockStatusW r; NTSTATUS status; @@ -631,7 +631,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli, TALL } /* Return variables */ - *status = *r.out.status; + *lock_status = *r.out.lock_status; *required_buf_size = *r.out.required_buf_size; /* Return result */ @@ -859,7 +859,7 @@ NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli, TALLOC_CTX *m return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned) +NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *service_status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned) { struct svcctl_EnumDependentServicesA r; NTSTATUS status; @@ -886,8 +886,8 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli, TALLO } /* Return variables */ - if ( status ) { - *status = *r.out.status; + if ( service_status ) { + *service_status = *r.out.service_status; } *bytes_needed = *r.out.bytes_needed; *services_returned = *r.out.services_returned; @@ -1034,7 +1034,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli, TALLOC_C return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *status, uint32_t *required_buf_size) +NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *lock_status, uint32_t *required_buf_size) { struct svcctl_QueryServiceLockStatusA r; NTSTATUS status; @@ -1060,7 +1060,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli, TALL } /* Return variables */ - *status = *r.out.status; + *lock_status = *r.out.lock_status; *required_buf_size = *r.out.required_buf_size; /* Return result */ diff --git a/source/librpc/gen_ndr/cli_svcctl.h b/source/librpc/gen_ndr/cli_svcctl.h index 0812427b4ce..27fed17925a 100644 --- a/source/librpc/gen_ndr/cli_svcctl.h +++ b/source/librpc/gen_ndr/cli_svcctl.h @@ -2,36 +2,36 @@ #ifndef __CLI_SVCCTL__ #define __CLI_SVCCTL__ NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle); -NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t control, struct SERVICE_STATUS *status); +NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t control, struct SERVICE_STATUS *service_status); NTSTATUS rpccli_svcctl_DeleteService(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle); NTSTATUS rpccli_svcctl_LockServiceDatabase(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct policy_handle *lock); NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); -NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct SERVICE_STATUS *status); +NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, struct SERVICE_STATUS *service_status); NTSTATUS rpccli_svcctl_SetServiceStatus(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); NTSTATUS rpccli_svcctl_UnlockServiceDatabase(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *lock); NTSTATUS rpccli_svcctl_NotifyBootConfigStatus(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx); NTSTATUS rpccli_svcctl_SCSetServiceBitsW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t bits, uint32_t bitson, uint32_t immediate); NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t type, uint32_t start, uint32_t error, const char *binary_path, const char *load_order_group, uint32_t *tag_id, const char *dependencies, const char *service_start_name, const char *password, const char *display_name); NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *scmanager_handle, const char *ServiceName, const char *DisplayName, uint32_t desired_access, uint32_t type, uint32_t start_type, uint32_t error_control, const char *binary_path, const char *LoadOrderGroupKey, uint32_t *TagId, uint8_t *dependencies, uint32_t dependencies_size, const char *service_start_name, uint8_t *password, uint32_t password_size, struct policy_handle *handle); -NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned); +NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *service_status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned); NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t type, uint32_t state, uint32_t buf_size, uint8_t *service, uint32_t *bytes_needed, uint32_t *services_returned, uint32_t *resume_handle); NTSTATUS rpccli_svcctl_OpenSCManagerW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *MachineName, const char *DatabaseName, uint32_t access_mask, struct policy_handle *handle); NTSTATUS rpccli_svcctl_OpenServiceW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *scmanager_handle, const char *ServiceName, uint32_t access_mask, struct policy_handle *handle); NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint8_t *query, uint32_t buf_size, uint32_t *bytes_needed); -NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *status, uint32_t *required_buf_size); +NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *lock_status, uint32_t *required_buf_size); NTSTATUS rpccli_svcctl_StartServiceW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t NumArgs, const char *Arguments); NTSTATUS rpccli_svcctl_GetServiceDisplayNameW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *service_name, const char **display_name, uint32_t *display_name_length); NTSTATUS rpccli_svcctl_GetServiceKeyNameW(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *service_name, const char **key_name, uint32_t *display_name_length); NTSTATUS rpccli_svcctl_SCSetServiceBitsA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t bits, uint32_t bitson, uint32_t immediate); NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t type, uint32_t start, uint32_t error, const char *binary_path, const char *load_order_group, uint32_t *tag_id, const char *dependencies, const char *service_start_name, const char *password, const char *display_name); NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *ServiceName, const char *DisplayName, uint32_t desired_access, uint32_t type, uint32_t start_type, uint32_t error_control, const char *binary_path, const char *LoadOrderGroupKey, uint32_t *TagId, const char *dependencies, const char *service_start_name, const char *password); -NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned); +NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *service, uint32_t state, struct ENUM_SERVICE_STATUS *service_status, uint32_t buf_size, uint32_t *bytes_needed, uint32_t *services_returned); NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t type, uint32_t state, uint32_t buf_size, uint8_t *service, uint32_t *bytes_needed, uint32_t *services_returned, uint32_t *resume_handle); NTSTATUS rpccli_svcctl_OpenSCManagerA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *MachineName, const char *DatabaseName, uint32_t access_mask, struct policy_handle *handle); NTSTATUS rpccli_svcctl_OpenServiceA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *scmanager_handle, const char *ServiceName, uint32_t access_mask); NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint8_t *query, uint32_t buf_size, uint32_t *bytes_needed); -NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *status, uint32_t *required_buf_size); +NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t buf_size, struct SERVICE_LOCK_STATUS *lock_status, uint32_t *required_buf_size); NTSTATUS rpccli_svcctl_StartServiceA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, uint32_t NumArgs, const char *Arguments); NTSTATUS rpccli_svcctl_GetServiceDisplayNameA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *service_name, const char **display_name, uint32_t *display_name_length); NTSTATUS rpccli_svcctl_GetServiceKeyNameA(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, struct policy_handle *handle, const char *service_name, const char **key_name, uint32_t *display_name_length); diff --git a/source/librpc/gen_ndr/ndr_svcctl.c b/source/librpc/gen_ndr/ndr_svcctl.c index d3930fa5c79..f3ea9862a99 100644 --- a/source/librpc/gen_ndr/ndr_svcctl.c +++ b/source/librpc/gen_ndr/ndr_svcctl.c @@ -375,8 +375,8 @@ NTSTATUS ndr_push_svcctl_ControlService(struct ndr_push *ndr, int flags, const s NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.control)); } if (flags & NDR_OUT) { - if (r->out.status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; - NDR_CHECK(ndr_push_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.status)); + if (r->out.service_status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; + NDR_CHECK(ndr_push_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.service_status)); NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); } return NT_STATUS_OK; @@ -385,7 +385,7 @@ NTSTATUS ndr_push_svcctl_ControlService(struct ndr_push *ndr, int flags, const s NTSTATUS ndr_pull_svcctl_ControlService(struct ndr_pull *ndr, int flags, struct svcctl_ControlService *r) { TALLOC_CTX *_mem_save_handle_0; - TALLOC_CTX *_mem_save_status_0; + TALLOC_CTX *_mem_save_service_status_0; if (flags & NDR_IN) { ZERO_STRUCT(r->out); @@ -397,17 +397,17 @@ NTSTATUS ndr_pull_svcctl_ControlService(struct ndr_pull *ndr, int flags, struct NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.handle)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.control)); - NDR_PULL_ALLOC(ndr, r->out.status); - ZERO_STRUCTP(r->out.status); + NDR_PULL_ALLOC(ndr, r->out.service_status); + ZERO_STRUCTP(r->out.service_status); } if (flags & NDR_OUT) { if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { - NDR_PULL_ALLOC(ndr, r->out.status); + NDR_PULL_ALLOC(ndr, r->out.service_status); } - _mem_save_status_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.status, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.status)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_status_0, LIBNDR_FLAG_REF_ALLOC); + _mem_save_service_status_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.service_status, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.service_status)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_service_status_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); } return NT_STATUS_OK; @@ -433,9 +433,9 @@ _PUBLIC_ void ndr_print_svcctl_ControlService(struct ndr_print *ndr, const char if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "svcctl_ControlService"); ndr->depth++; - ndr_print_ptr(ndr, "status", r->out.status); + ndr_print_ptr(ndr, "service_status", r->out.service_status); ndr->depth++; - ndr_print_SERVICE_STATUS(ndr, "status", r->out.status); + ndr_print_SERVICE_STATUS(ndr, "service_status", r->out.service_status); ndr->depth--; ndr_print_WERROR(ndr, "result", r->out.result); ndr->depth--; @@ -660,8 +660,8 @@ NTSTATUS ndr_push_svcctl_QueryServiceStatus(struct ndr_push *ndr, int flags, con NDR_CHECK(ndr_push_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.handle)); } if (flags & NDR_OUT) { - if (r->out.status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; - NDR_CHECK(ndr_push_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.status)); + if (r->out.service_status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; + NDR_CHECK(ndr_push_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.service_status)); NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); } return NT_STATUS_OK; @@ -670,7 +670,7 @@ NTSTATUS ndr_push_svcctl_QueryServiceStatus(struct ndr_push *ndr, int flags, con NTSTATUS ndr_pull_svcctl_QueryServiceStatus(struct ndr_pull *ndr, int flags, struct svcctl_QueryServiceStatus *r) { TALLOC_CTX *_mem_save_handle_0; - TALLOC_CTX *_mem_save_status_0; + TALLOC_CTX *_mem_save_service_status_0; if (flags & NDR_IN) { ZERO_STRUCT(r->out); @@ -681,17 +681,17 @@ NTSTATUS ndr_pull_svcctl_QueryServiceStatus(struct ndr_pull *ndr, int flags, str NDR_PULL_SET_MEM_CTX(ndr, r->in.handle, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.handle)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC); - NDR_PULL_ALLOC(ndr, r->out.status); - ZERO_STRUCTP(r->out.status); + NDR_PULL_ALLOC(ndr, r->out.service_status); + ZERO_STRUCTP(r->out.service_status); } if (flags & NDR_OUT) { if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { - NDR_PULL_ALLOC(ndr, r->out.status); + NDR_PULL_ALLOC(ndr, r->out.service_status); } - _mem_save_status_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.status, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.status)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_status_0, LIBNDR_FLAG_REF_ALLOC); + _mem_save_service_status_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.service_status, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_SERVICE_STATUS(ndr, NDR_SCALARS, r->out.service_status)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_service_status_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result)); } return NT_STATUS_OK; @@ -716,9 +716,9 @@ _PUBLIC_ void ndr_print_svcctl_QueryServiceStatus(struct ndr_print *ndr, const c if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "svcctl_QueryServiceStatus"); ndr->depth++; - ndr_print_ptr(ndr, "status", r->out.status); + ndr_print_ptr(ndr, "service_status", r->out.service_status); ndr->depth++; - ndr_print_SERVICE_STATUS(ndr, "status", r->out.status); + ndr_print_SERVICE_STATUS(ndr, "service_status", r->out.service_status); ndr->depth--; ndr_print_WERROR(ndr, "result", r->out.result); ndr->depth--; @@ -1553,9 +1553,9 @@ NTSTATUS ndr_push_svcctl_EnumDependentServicesW(struct ndr_push *ndr, int flags, NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.buf_size)); } if (flags & NDR_OUT) { - NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.status)); - if (r->out.status) { - NDR_CHECK(ndr_push_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); + NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.service_status)); + if (r->out.service_status) { + NDR_CHECK(ndr_push_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.service_status)); } if (r->out.bytes_needed == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.bytes_needed)); @@ -1568,9 +1568,9 @@ NTSTATUS ndr_push_svcctl_EnumDependentServicesW(struct ndr_push *ndr, int flags, NTSTATUS ndr_pull_svcctl_EnumDependentServicesW(struct ndr_pull *ndr, int flags, struct svcctl_EnumDependentServicesW *r) { - uint32_t _ptr_status; + uint32_t _ptr_service_status; TALLOC_CTX *_mem_save_service_0; - TALLOC_CTX *_mem_save_status_0; + TALLOC_CTX *_mem_save_service_status_0; TALLOC_CTX *_mem_save_bytes_needed_0; TALLOC_CTX *_mem_save_services_returned_0; if (flags & NDR_IN) { @@ -1591,17 +1591,17 @@ NTSTATUS ndr_pull_svcctl_EnumDependentServicesW(struct ndr_pull *ndr, int flags, ZERO_STRUCTP(r->out.services_returned); } if (flags & NDR_OUT) { - NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_status)); - if (_ptr_status) { - NDR_PULL_ALLOC(ndr, r->out.status); + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_service_status)); + if (_ptr_service_status) { + NDR_PULL_ALLOC(ndr, r->out.service_status); } else { - r->out.status = NULL; + r->out.service_status = NULL; } - if (r->out.status) { - _mem_save_status_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.status, 0); - NDR_CHECK(ndr_pull_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_status_0, 0); + if (r->out.service_status) { + _mem_save_service_status_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.service_status, 0); + NDR_CHECK(ndr_pull_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.service_status)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_service_status_0, 0); } if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->out.bytes_needed); @@ -1643,10 +1643,10 @@ _PUBLIC_ void ndr_print_svcctl_EnumDependentServicesW(struct ndr_print *ndr, con if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "svcctl_EnumDependentServicesW"); ndr->depth++; - ndr_print_ptr(ndr, "status", r->out.status); + ndr_print_ptr(ndr, "service_status", r->out.service_status); ndr->depth++; - if (r->out.status) { - ndr_print_ENUM_SERVICE_STATUS(ndr, "status", r->out.status); + if (r->out.service_status) { + ndr_print_ENUM_SERVICE_STATUS(ndr, "service_status", r->out.service_status); } ndr->depth--; ndr_print_ptr(ndr, "bytes_needed", r->out.bytes_needed); @@ -2120,8 +2120,8 @@ NTSTATUS ndr_push_svcctl_QueryServiceLockStatusW(struct ndr_push *ndr, int flags NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.buf_size)); } if (flags & NDR_OUT) { - if (r->out.status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; - NDR_CHECK(ndr_push_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); + if (r->out.lock_status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; + NDR_CHECK(ndr_push_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.lock_status)); if (r->out.required_buf_size == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.required_buf_size)); NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); @@ -2132,7 +2132,7 @@ NTSTATUS ndr_push_svcctl_QueryServiceLockStatusW(struct ndr_push *ndr, int flags NTSTATUS ndr_pull_svcctl_QueryServiceLockStatusW(struct ndr_pull *ndr, int flags, struct svcctl_QueryServiceLockStatusW *r) { TALLOC_CTX *_mem_save_handle_0; - TALLOC_CTX *_mem_save_status_0; + TALLOC_CTX *_mem_save_lock_status_0; TALLOC_CTX *_mem_save_required_buf_size_0; if (flags & NDR_IN) { ZERO_STRUCT(r->out); @@ -2145,19 +2145,19 @@ NTSTATUS ndr_pull_svcctl_QueryServiceLockStatusW(struct ndr_pull *ndr, int flags NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.handle)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size)); - NDR_PULL_ALLOC(ndr, r->out.status); - ZERO_STRUCTP(r->out.status); + NDR_PULL_ALLOC(ndr, r->out.lock_status); + ZERO_STRUCTP(r->out.lock_status); NDR_PULL_ALLOC(ndr, r->out.required_buf_size); ZERO_STRUCTP(r->out.required_buf_size); } if (flags & NDR_OUT) { if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { - NDR_PULL_ALLOC(ndr, r->out.status); + NDR_PULL_ALLOC(ndr, r->out.lock_status); } - _mem_save_status_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.status, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_status_0, LIBNDR_FLAG_REF_ALLOC); + _mem_save_lock_status_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.lock_status, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.lock_status)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_lock_status_0, LIBNDR_FLAG_REF_ALLOC); if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->out.required_buf_size); } @@ -2190,9 +2190,9 @@ _PUBLIC_ void ndr_print_svcctl_QueryServiceLockStatusW(struct ndr_print *ndr, co if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "svcctl_QueryServiceLockStatusW"); ndr->depth++; - ndr_print_ptr(ndr, "status", r->out.status); + ndr_print_ptr(ndr, "lock_status", r->out.lock_status); ndr->depth++; - ndr_print_SERVICE_LOCK_STATUS(ndr, "status", r->out.status); + ndr_print_SERVICE_LOCK_STATUS(ndr, "lock_status", r->out.lock_status); ndr->depth--; ndr_print_ptr(ndr, "required_buf_size", r->out.required_buf_size); ndr->depth++; @@ -3308,9 +3308,9 @@ NTSTATUS ndr_push_svcctl_EnumDependentServicesA(struct ndr_push *ndr, int flags, NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.buf_size)); } if (flags & NDR_OUT) { - NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.status)); - if (r->out.status) { - NDR_CHECK(ndr_push_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); + NDR_CHECK(ndr_push_unique_ptr(ndr, r->out.service_status)); + if (r->out.service_status) { + NDR_CHECK(ndr_push_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.service_status)); } if (r->out.bytes_needed == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.bytes_needed)); @@ -3323,9 +3323,9 @@ NTSTATUS ndr_push_svcctl_EnumDependentServicesA(struct ndr_push *ndr, int flags, NTSTATUS ndr_pull_svcctl_EnumDependentServicesA(struct ndr_pull *ndr, int flags, struct svcctl_EnumDependentServicesA *r) { - uint32_t _ptr_status; + uint32_t _ptr_service_status; TALLOC_CTX *_mem_save_service_0; - TALLOC_CTX *_mem_save_status_0; + TALLOC_CTX *_mem_save_service_status_0; TALLOC_CTX *_mem_save_bytes_needed_0; TALLOC_CTX *_mem_save_services_returned_0; if (flags & NDR_IN) { @@ -3346,17 +3346,17 @@ NTSTATUS ndr_pull_svcctl_EnumDependentServicesA(struct ndr_pull *ndr, int flags, ZERO_STRUCTP(r->out.services_returned); } if (flags & NDR_OUT) { - NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_status)); - if (_ptr_status) { - NDR_PULL_ALLOC(ndr, r->out.status); + NDR_CHECK(ndr_pull_generic_ptr(ndr, &_ptr_service_status)); + if (_ptr_service_status) { + NDR_PULL_ALLOC(ndr, r->out.service_status); } else { - r->out.status = NULL; + r->out.service_status = NULL; } - if (r->out.status) { - _mem_save_status_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.status, 0); - NDR_CHECK(ndr_pull_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_status_0, 0); + if (r->out.service_status) { + _mem_save_service_status_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.service_status, 0); + NDR_CHECK(ndr_pull_ENUM_SERVICE_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.service_status)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_service_status_0, 0); } if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->out.bytes_needed); @@ -3398,10 +3398,10 @@ _PUBLIC_ void ndr_print_svcctl_EnumDependentServicesA(struct ndr_print *ndr, con if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "svcctl_EnumDependentServicesA"); ndr->depth++; - ndr_print_ptr(ndr, "status", r->out.status); + ndr_print_ptr(ndr, "service_status", r->out.service_status); ndr->depth++; - if (r->out.status) { - ndr_print_ENUM_SERVICE_STATUS(ndr, "status", r->out.status); + if (r->out.service_status) { + ndr_print_ENUM_SERVICE_STATUS(ndr, "service_status", r->out.service_status); } ndr->depth--; ndr_print_ptr(ndr, "bytes_needed", r->out.bytes_needed); @@ -3878,8 +3878,8 @@ NTSTATUS ndr_push_svcctl_QueryServiceLockStatusA(struct ndr_push *ndr, int flags NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.buf_size)); } if (flags & NDR_OUT) { - if (r->out.status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; - NDR_CHECK(ndr_push_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); + if (r->out.lock_status == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; + NDR_CHECK(ndr_push_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.lock_status)); if (r->out.required_buf_size == NULL) return NT_STATUS_INVALID_PARAMETER_MIX; NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, *r->out.required_buf_size)); NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result)); @@ -3890,7 +3890,7 @@ NTSTATUS ndr_push_svcctl_QueryServiceLockStatusA(struct ndr_push *ndr, int flags NTSTATUS ndr_pull_svcctl_QueryServiceLockStatusA(struct ndr_pull *ndr, int flags, struct svcctl_QueryServiceLockStatusA *r) { TALLOC_CTX *_mem_save_handle_0; - TALLOC_CTX *_mem_save_status_0; + TALLOC_CTX *_mem_save_lock_status_0; TALLOC_CTX *_mem_save_required_buf_size_0; if (flags & NDR_IN) { ZERO_STRUCT(r->out); @@ -3903,19 +3903,19 @@ NTSTATUS ndr_pull_svcctl_QueryServiceLockStatusA(struct ndr_pull *ndr, int flags NDR_CHECK(ndr_pull_policy_handle(ndr, NDR_SCALARS|NDR_BUFFERS, r->in.handle)); NDR_PULL_SET_MEM_CTX(ndr, _mem_save_handle_0, LIBNDR_FLAG_REF_ALLOC); NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.buf_size)); - NDR_PULL_ALLOC(ndr, r->out.status); - ZERO_STRUCTP(r->out.status); + NDR_PULL_ALLOC(ndr, r->out.lock_status); + ZERO_STRUCTP(r->out.lock_status); NDR_PULL_ALLOC(ndr, r->out.required_buf_size); ZERO_STRUCTP(r->out.required_buf_size); } if (flags & NDR_OUT) { if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { - NDR_PULL_ALLOC(ndr, r->out.status); + NDR_PULL_ALLOC(ndr, r->out.lock_status); } - _mem_save_status_0 = NDR_PULL_GET_MEM_CTX(ndr); - NDR_PULL_SET_MEM_CTX(ndr, r->out.status, LIBNDR_FLAG_REF_ALLOC); - NDR_CHECK(ndr_pull_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.status)); - NDR_PULL_SET_MEM_CTX(ndr, _mem_save_status_0, LIBNDR_FLAG_REF_ALLOC); + _mem_save_lock_status_0 = NDR_PULL_GET_MEM_CTX(ndr); + NDR_PULL_SET_MEM_CTX(ndr, r->out.lock_status, LIBNDR_FLAG_REF_ALLOC); + NDR_CHECK(ndr_pull_SERVICE_LOCK_STATUS(ndr, NDR_SCALARS|NDR_BUFFERS, r->out.lock_status)); + NDR_PULL_SET_MEM_CTX(ndr, _mem_save_lock_status_0, LIBNDR_FLAG_REF_ALLOC); if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) { NDR_PULL_ALLOC(ndr, r->out.required_buf_size); } @@ -3948,9 +3948,9 @@ _PUBLIC_ void ndr_print_svcctl_QueryServiceLockStatusA(struct ndr_print *ndr, co if (flags & NDR_OUT) { ndr_print_struct(ndr, "out", "svcctl_QueryServiceLockStatusA"); ndr->depth++; - ndr_print_ptr(ndr, "status", r->out.status); + ndr_print_ptr(ndr, "lock_status", r->out.lock_status); ndr->depth++; - ndr_print_SERVICE_LOCK_STATUS(ndr, "status", r->out.status); + ndr_print_SERVICE_LOCK_STATUS(ndr, "lock_status", r->out.lock_status); ndr->depth--; ndr_print_ptr(ndr, "required_buf_size", r->out.required_buf_size); ndr->depth++; diff --git a/source/librpc/gen_ndr/srv_svcctl.c b/source/librpc/gen_ndr/srv_svcctl.c index 070a24d670c..0211baa5836 100644 --- a/source/librpc/gen_ndr/srv_svcctl.c +++ b/source/librpc/gen_ndr/srv_svcctl.c @@ -103,8 +103,8 @@ static BOOL api_svcctl_ControlService(pipes_struct *p) NDR_PRINT_IN_DEBUG(svcctl_ControlService, &r); ZERO_STRUCT(r.out); - r.out.status = talloc_zero(mem_ctx, struct SERVICE_STATUS); - if (r.out.status == NULL) { + r.out.service_status = talloc_zero(mem_ctx, struct SERVICE_STATUS); + if (r.out.service_status == NULL) { talloc_free(mem_ctx); return False; } @@ -437,8 +437,8 @@ static BOOL api_svcctl_QueryServiceStatus(pipes_struct *p) NDR_PRINT_IN_DEBUG(svcctl_QueryServiceStatus, &r); ZERO_STRUCT(r.out); - r.out.status = talloc_zero(mem_ctx, struct SERVICE_STATUS); - if (r.out.status == NULL) { + r.out.service_status = talloc_zero(mem_ctx, struct SERVICE_STATUS); + if (r.out.service_status == NULL) { talloc_free(mem_ctx); return False; } @@ -909,8 +909,8 @@ static BOOL api_svcctl_EnumDependentServicesW(pipes_struct *p) NDR_PRINT_IN_DEBUG(svcctl_EnumDependentServicesW, &r); ZERO_STRUCT(r.out); - r.out.status = talloc_zero(mem_ctx, struct ENUM_SERVICE_STATUS); - if (r.out.status == NULL) { + r.out.service_status = talloc_zero(mem_ctx, struct ENUM_SERVICE_STATUS); + if (r.out.service_status == NULL) { talloc_free(mem_ctx); return False; } @@ -1295,8 +1295,8 @@ static BOOL api_svcctl_QueryServiceLockStatusW(pipes_struct *p) NDR_PRINT_IN_DEBUG(svcctl_QueryServiceLockStatusW, &r); ZERO_STRUCT(r.out); - r.out.status = talloc_zero(mem_ctx, struct SERVICE_LOCK_STATUS); - if (r.out.status == NULL) { + r.out.lock_status = talloc_zero(mem_ctx, struct SERVICE_LOCK_STATUS); + if (r.out.lock_status == NULL) { talloc_free(mem_ctx); return False; } @@ -1786,8 +1786,8 @@ static BOOL api_svcctl_EnumDependentServicesA(pipes_struct *p) NDR_PRINT_IN_DEBUG(svcctl_EnumDependentServicesA, &r); ZERO_STRUCT(r.out); - r.out.status = talloc_zero(mem_ctx, struct ENUM_SERVICE_STATUS); - if (r.out.status == NULL) { + r.out.service_status = talloc_zero(mem_ctx, struct ENUM_SERVICE_STATUS); + if (r.out.service_status == NULL) { talloc_free(mem_ctx); return False; } @@ -2165,8 +2165,8 @@ static BOOL api_svcctl_QueryServiceLockStatusA(pipes_struct *p) NDR_PRINT_IN_DEBUG(svcctl_QueryServiceLockStatusA, &r); ZERO_STRUCT(r.out); - r.out.status = talloc_zero(mem_ctx, struct SERVICE_LOCK_STATUS); - if (r.out.status == NULL) { + r.out.lock_status = talloc_zero(mem_ctx, struct SERVICE_LOCK_STATUS); + if (r.out.lock_status == NULL) { talloc_free(mem_ctx); return False; } diff --git a/source/librpc/gen_ndr/svcctl.h b/source/librpc/gen_ndr/svcctl.h index 22651f2d211..5c7f32cd7b8 100644 --- a/source/librpc/gen_ndr/svcctl.h +++ b/source/librpc/gen_ndr/svcctl.h @@ -101,7 +101,7 @@ struct svcctl_ControlService { } in; struct { - struct SERVICE_STATUS *status;/* [ref] */ + struct SERVICE_STATUS *service_status;/* [ref] */ WERROR result; } out; @@ -155,7 +155,7 @@ struct svcctl_QueryServiceStatus { } in; struct { - struct SERVICE_STATUS *status;/* [ref] */ + struct SERVICE_STATUS *service_status;/* [ref] */ WERROR result; } out; @@ -264,7 +264,7 @@ struct svcctl_EnumDependentServicesW { } in; struct { - struct ENUM_SERVICE_STATUS *status;/* [unique] */ + struct ENUM_SERVICE_STATUS *service_status;/* [unique] */ uint32_t *bytes_needed;/* [ref] */ uint32_t *services_returned;/* [ref] */ WERROR result; @@ -345,7 +345,7 @@ struct svcctl_QueryServiceLockStatusW { } in; struct { - struct SERVICE_LOCK_STATUS *status;/* [ref] */ + struct SERVICE_LOCK_STATUS *lock_status;/* [ref] */ uint32_t *required_buf_size;/* [ref] */ WERROR result; } out; @@ -468,7 +468,7 @@ struct svcctl_EnumDependentServicesA { } in; struct { - struct ENUM_SERVICE_STATUS *status;/* [unique] */ + struct ENUM_SERVICE_STATUS *service_status;/* [unique] */ uint32_t *bytes_needed;/* [ref] */ uint32_t *services_returned;/* [ref] */ WERROR result; @@ -548,7 +548,7 @@ struct svcctl_QueryServiceLockStatusA { } in; struct { - struct SERVICE_LOCK_STATUS *status;/* [ref] */ + struct SERVICE_LOCK_STATUS *lock_status;/* [ref] */ uint32_t *required_buf_size;/* [ref] */ WERROR result; } out; -- 2.11.4.GIT