svcctl: use offered/needed for buffer sizes as in spoolss.
[ira/wip.git] / librpc / gen_ndr / cli_svcctl.c
index 3288e4a1ec76144b8c2cec8cb12e6d4fbc0ada5b..bc49121ed976e0a592be477889dd84b17cd048ab 100644 (file)
@@ -21,7 +21,7 @@ NTSTATUS rpccli_svcctl_CloseServiceHandle(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_CloseServiceHandle, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CLOSESERVICEHANDLE,
@@ -68,7 +68,7 @@ NTSTATUS rpccli_svcctl_ControlService(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ControlService, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CONTROLSERVICE,
@@ -112,7 +112,7 @@ NTSTATUS rpccli_svcctl_DeleteService(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_DeleteService, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_DELETESERVICE,
@@ -156,7 +156,7 @@ NTSTATUS rpccli_svcctl_LockServiceDatabase(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_LockServiceDatabase, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_LOCKSERVICEDATABASE,
@@ -206,7 +206,7 @@ NTSTATUS rpccli_svcctl_QueryServiceObjectSecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceObjectSecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICEOBJECTSECURITY,
@@ -257,7 +257,7 @@ NTSTATUS rpccli_svcctl_SetServiceObjectSecurity(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SetServiceObjectSecurity, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SETSERVICEOBJECTSECURITY,
@@ -301,7 +301,7 @@ NTSTATUS rpccli_svcctl_QueryServiceStatus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceStatus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICESTATUS,
@@ -343,7 +343,7 @@ NTSTATUS rpccli_svcctl_SetServiceStatus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SetServiceStatus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SETSERVICESTATUS,
@@ -386,7 +386,7 @@ NTSTATUS rpccli_svcctl_UnlockServiceDatabase(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_UnlockServiceDatabase, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_UNLOCKSERVICEDATABASE,
@@ -428,7 +428,7 @@ NTSTATUS rpccli_svcctl_NotifyBootConfigStatus(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_NotifyBootConfigStatus, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_NOTIFYBOOTCONFIGSTATUS,
@@ -477,7 +477,7 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SCSetServiceBitsW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SCSETSERVICEBITSW,
@@ -509,8 +509,8 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx,
                                            struct policy_handle *handle /* [in] [ref] */,
                                            uint32_t type /* [in]  */,
-                                           uint32_t start /* [in]  */,
-                                           uint32_t error /* [in]  */,
+                                           enum svcctl_StartType start_type /* [in]  */,
+                                           enum svcctl_ErrorControl error_control /* [in]  */,
                                            const char *binary_path /* [in] [unique,charset(UTF16)] */,
                                            const char *load_order_group /* [in] [unique,charset(UTF16)] */,
                                            uint32_t *tag_id /* [out] [ref] */,
@@ -526,8 +526,8 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.handle = handle;
        r.in.type = type;
-       r.in.start = start;
-       r.in.error = error;
+       r.in.start_type = start_type;
+       r.in.error_control = error_control;
        r.in.binary_path = binary_path;
        r.in.load_order_group = load_order_group;
        r.in.dependencies = dependencies;
@@ -539,7 +539,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfigW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIGW,
@@ -575,8 +575,8 @@ NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli,
                                      const char *DisplayName /* [in] [unique,charset(UTF16)] */,
                                      uint32_t desired_access /* [in]  */,
                                      uint32_t type /* [in]  */,
-                                     uint32_t start_type /* [in]  */,
-                                     uint32_t error_control /* [in]  */,
+                                     enum svcctl_StartType start_type /* [in]  */,
+                                     enum svcctl_ErrorControl error_control /* [in]  */,
                                      const char *binary_path /* [in] [charset(UTF16)] */,
                                      const char *LoadOrderGroupKey /* [in] [unique,charset(UTF16)] */,
                                      uint32_t *TagId /* [in,out] [unique] */,
@@ -612,7 +612,7 @@ NTSTATUS rpccli_svcctl_CreateServiceW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_CreateServiceW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CREATESERVICEW,
@@ -648,9 +648,9 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx,
                                              struct policy_handle *service /* [in] [ref] */,
                                              uint32_t state /* [in]  */,
-                                             uint8_t *service_status /* [out] [ref,size_is(buf_size)] */,
-                                             uint32_t buf_size /* [in] [range(0,0x40000)] */,
-                                             uint32_t *bytes_needed /* [out] [ref,range(0,0x40000)] */,
+                                             uint8_t *service_status /* [out] [ref,size_is(offered)] */,
+                                             uint32_t offered /* [in] [range(0,0x40000)] */,
+                                             uint32_t *needed /* [out] [ref,range(0,0x40000)] */,
                                              uint32_t *services_returned /* [out] [ref,range(0,0x40000)] */,
                                              WERROR *werror)
 {
@@ -660,13 +660,13 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.service = service;
        r.in.state = state;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_EnumDependentServicesW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMDEPENDENTSERVICESW,
@@ -685,8 +685,8 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesW(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(service_status, r.out.service_status, r.in.buf_size * sizeof(*service_status));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(service_status, r.out.service_status, r.in.offered * sizeof(*service_status));
+       *needed = *r.out.needed;
        *services_returned = *r.out.services_returned;
 
        /* Return result */
@@ -701,11 +701,11 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
                                           struct policy_handle *handle /* [in] [ref] */,
                                           uint32_t type /* [in]  */,
-                                          uint32_t state /* [in]  */,
-                                          uint8_t *service /* [out] [ref,size_is(buf_size)] */,
-                                          uint32_t buf_size /* [in] [range(0,262144)] */,
-                                          uint32_t *bytes_needed /* [out] [ref,range(0,262144)] */,
-                                          uint32_t *services_returned /* [out] [ref,range(0,262144)] */,
+                                          enum svcctl_ServiceState state /* [in]  */,
+                                          uint8_t *service /* [out] [ref,size_is(offered)] */,
+                                          uint32_t offered /* [in] [range(0,0x40000)] */,
+                                          uint32_t *needed /* [out] [ref,range(0,0x40000)] */,
+                                          uint32_t *services_returned /* [out] [ref,range(0,0x40000)] */,
                                           uint32_t *resume_handle /* [in,out] [unique] */,
                                           WERROR *werror)
 {
@@ -716,14 +716,14 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
        r.in.handle = handle;
        r.in.type = type;
        r.in.state = state;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
        r.in.resume_handle = resume_handle;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_EnumServicesStatusW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMSERVICESSTATUSW,
@@ -742,8 +742,8 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusW(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(service, r.out.service, r.in.buf_size * sizeof(*service));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(service, r.out.service, r.in.offered * sizeof(*service));
+       *needed = *r.out.needed;
        *services_returned = *r.out.services_returned;
        if (resume_handle && r.out.resume_handle) {
                *resume_handle = *r.out.resume_handle;
@@ -777,7 +777,7 @@ NTSTATUS rpccli_svcctl_OpenSCManagerW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenSCManagerW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSCMANAGERW,
@@ -826,7 +826,7 @@ NTSTATUS rpccli_svcctl_OpenServiceW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenServiceW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSERVICEW,
@@ -859,8 +859,8 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
                                           struct policy_handle *handle /* [in] [ref] */,
                                           struct QUERY_SERVICE_CONFIG *query /* [out] [ref] */,
-                                          uint32_t buf_size /* [in] [range(0,8192)] */,
-                                          uint32_t *bytes_needed /* [out] [ref,range(0,8192)] */,
+                                          uint32_t offered /* [in] [range(0,8192)] */,
+                                          uint32_t *needed /* [out] [ref,range(0,8192)] */,
                                           WERROR *werror)
 {
        struct svcctl_QueryServiceConfigW r;
@@ -868,13 +868,13 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
 
        /* In parameters */
        r.in.handle = handle;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfigW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIGW,
@@ -894,7 +894,7 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
 
        /* Return variables */
        *query = *r.out.query;
-       *bytes_needed = *r.out.bytes_needed;
+       *needed = *r.out.needed;
 
        /* Return result */
        if (werror) {
@@ -907,9 +907,9 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigW(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
                                               TALLOC_CTX *mem_ctx,
                                               struct policy_handle *handle /* [in] [ref] */,
-                                              uint32_t buf_size /* [in]  */,
+                                              uint32_t offered /* [in]  */,
                                               struct SERVICE_LOCK_STATUS *lock_status /* [out] [ref] */,
-                                              uint32_t *required_buf_size /* [out] [ref] */,
+                                              uint32_t *needed /* [out] [ref] */,
                                               WERROR *werror)
 {
        struct svcctl_QueryServiceLockStatusW r;
@@ -917,13 +917,13 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
 
        /* In parameters */
        r.in.handle = handle;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceLockStatusW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICELOCKSTATUSW,
@@ -943,7 +943,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusW(struct rpc_pipe_client *cli,
 
        /* Return variables */
        *lock_status = *r.out.lock_status;
-       *required_buf_size = *r.out.required_buf_size;
+       *needed = *r.out.needed;
 
        /* Return result */
        if (werror) {
@@ -972,7 +972,7 @@ NTSTATUS rpccli_svcctl_StartServiceW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_StartServiceW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_STARTSERVICEW,
@@ -1020,7 +1020,7 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceDisplayNameW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEDISPLAYNAMEW,
@@ -1072,7 +1072,7 @@ NTSTATUS rpccli_svcctl_GetServiceKeyNameW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceKeyNameW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEKEYNAMEW,
@@ -1125,7 +1125,7 @@ NTSTATUS rpccli_svcctl_SCSetServiceBitsA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SCSetServiceBitsA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SCSETSERVICEBITSA,
@@ -1157,8 +1157,8 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx,
                                            struct policy_handle *handle /* [in] [ref] */,
                                            uint32_t type /* [in]  */,
-                                           uint32_t start /* [in]  */,
-                                           uint32_t error /* [in]  */,
+                                           enum svcctl_StartType start_type /* [in]  */,
+                                           enum svcctl_ErrorControl error_control /* [in]  */,
                                            const char *binary_path /* [in] [unique,charset(UTF16)] */,
                                            const char *load_order_group /* [in] [unique,charset(UTF16)] */,
                                            uint32_t *tag_id /* [out] [ref] */,
@@ -1174,8 +1174,8 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.handle = handle;
        r.in.type = type;
-       r.in.start = start;
-       r.in.error = error;
+       r.in.start_type = start_type;
+       r.in.error_control = error_control;
        r.in.binary_path = binary_path;
        r.in.load_order_group = load_order_group;
        r.in.dependencies = dependencies;
@@ -1187,7 +1187,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfigA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfigA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIGA,
@@ -1223,8 +1223,8 @@ NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli,
                                      const char *DisplayName /* [in] [unique,charset(UTF16)] */,
                                      uint32_t desired_access /* [in]  */,
                                      uint32_t type /* [in]  */,
-                                     uint32_t start_type /* [in]  */,
-                                     uint32_t error_control /* [in]  */,
+                                     enum svcctl_StartType start_type /* [in]  */,
+                                     enum svcctl_ErrorControl error_control /* [in]  */,
                                      const char *binary_path /* [in] [unique,charset(UTF16)] */,
                                      const char *LoadOrderGroupKey /* [in] [unique,charset(UTF16)] */,
                                      uint32_t *TagId /* [out] [unique] */,
@@ -1254,7 +1254,7 @@ NTSTATUS rpccli_svcctl_CreateServiceA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_CreateServiceA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CREATESERVICEA,
@@ -1289,9 +1289,9 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
                                              TALLOC_CTX *mem_ctx,
                                              struct policy_handle *service /* [in] [ref] */,
                                              uint32_t state /* [in]  */,
-                                             struct ENUM_SERVICE_STATUS *service_status /* [out] [unique] */,
-                                             uint32_t buf_size /* [in]  */,
-                                             uint32_t *bytes_needed /* [out] [ref] */,
+                                             struct ENUM_SERVICE_STATUSA *service_status /* [out] [unique] */,
+                                             uint32_t offered /* [in]  */,
+                                             uint32_t *needed /* [out] [ref] */,
                                              uint32_t *services_returned /* [out] [ref] */,
                                              WERROR *werror)
 {
@@ -1301,13 +1301,13 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.service = service;
        r.in.state = state;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_EnumDependentServicesA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMDEPENDENTSERVICESA,
@@ -1329,7 +1329,7 @@ NTSTATUS rpccli_svcctl_EnumDependentServicesA(struct rpc_pipe_client *cli,
        if (service_status && r.out.service_status) {
                *service_status = *r.out.service_status;
        }
-       *bytes_needed = *r.out.bytes_needed;
+       *needed = *r.out.needed;
        *services_returned = *r.out.services_returned;
 
        /* Return result */
@@ -1344,10 +1344,10 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
                                           struct policy_handle *handle /* [in] [ref] */,
                                           uint32_t type /* [in]  */,
-                                          uint32_t state /* [in]  */,
-                                          uint32_t buf_size /* [in]  */,
-                                          uint8_t *service /* [out] [size_is(buf_size)] */,
-                                          uint32_t *bytes_needed /* [out] [ref] */,
+                                          enum svcctl_ServiceState state /* [in]  */,
+                                          uint32_t offered /* [in]  */,
+                                          uint8_t *service /* [out] [size_is(offered)] */,
+                                          uint32_t *needed /* [out] [ref] */,
                                           uint32_t *services_returned /* [out] [ref] */,
                                           uint32_t *resume_handle /* [in,out] [unique] */,
                                           WERROR *werror)
@@ -1359,14 +1359,14 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
        r.in.handle = handle;
        r.in.type = type;
        r.in.state = state;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
        r.in.resume_handle = resume_handle;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_EnumServicesStatusA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMSERVICESSTATUSA,
@@ -1385,8 +1385,8 @@ NTSTATUS rpccli_svcctl_EnumServicesStatusA(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(service, r.out.service, r.in.buf_size * sizeof(*service));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(service, r.out.service, r.in.offered * sizeof(*service));
+       *needed = *r.out.needed;
        *services_returned = *r.out.services_returned;
        if (resume_handle && r.out.resume_handle) {
                *resume_handle = *r.out.resume_handle;
@@ -1420,7 +1420,7 @@ NTSTATUS rpccli_svcctl_OpenSCManagerA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenSCManagerA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSCMANAGERA,
@@ -1468,7 +1468,7 @@ NTSTATUS rpccli_svcctl_OpenServiceA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_OpenServiceA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_OPENSERVICEA,
@@ -1500,8 +1500,8 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
                                           struct policy_handle *handle /* [in] [ref] */,
                                           uint8_t *query /* [out]  */,
-                                          uint32_t buf_size /* [in]  */,
-                                          uint32_t *bytes_needed /* [out] [ref] */,
+                                          uint32_t offered /* [in]  */,
+                                          uint32_t *needed /* [out] [ref] */,
                                           WERROR *werror)
 {
        struct svcctl_QueryServiceConfigA r;
@@ -1509,13 +1509,13 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
 
        /* In parameters */
        r.in.handle = handle;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfigA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIGA,
@@ -1534,8 +1534,8 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(query, r.out.query, r.in.buf_size * sizeof(*query));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(query, r.out.query, r.in.offered * sizeof(*query));
+       *needed = *r.out.needed;
 
        /* Return result */
        if (werror) {
@@ -1548,9 +1548,9 @@ NTSTATUS rpccli_svcctl_QueryServiceConfigA(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
                                               TALLOC_CTX *mem_ctx,
                                               struct policy_handle *handle /* [in] [ref] */,
-                                              uint32_t buf_size /* [in]  */,
+                                              uint32_t offered /* [in]  */,
                                               struct SERVICE_LOCK_STATUS *lock_status /* [out] [ref] */,
-                                              uint32_t *required_buf_size /* [out] [ref] */,
+                                              uint32_t *needed /* [out] [ref] */,
                                               WERROR *werror)
 {
        struct svcctl_QueryServiceLockStatusA r;
@@ -1558,13 +1558,13 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
 
        /* In parameters */
        r.in.handle = handle;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceLockStatusA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICELOCKSTATUSA,
@@ -1584,7 +1584,7 @@ NTSTATUS rpccli_svcctl_QueryServiceLockStatusA(struct rpc_pipe_client *cli,
 
        /* Return variables */
        *lock_status = *r.out.lock_status;
-       *required_buf_size = *r.out.required_buf_size;
+       *needed = *r.out.needed;
 
        /* Return result */
        if (werror) {
@@ -1613,7 +1613,7 @@ NTSTATUS rpccli_svcctl_StartServiceA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_StartServiceA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_STARTSERVICEA,
@@ -1661,7 +1661,7 @@ NTSTATUS rpccli_svcctl_GetServiceDisplayNameA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceDisplayNameA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEDISPLAYNAMEA,
@@ -1713,7 +1713,7 @@ NTSTATUS rpccli_svcctl_GetServiceKeyNameA(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetServiceKeyNameA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETSERVICEKEYNAMEA,
@@ -1758,7 +1758,7 @@ NTSTATUS rpccli_svcctl_GetCurrentGroupeStateW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_GetCurrentGroupeStateW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_GETCURRENTGROUPESTATEW,
@@ -1799,7 +1799,7 @@ NTSTATUS rpccli_svcctl_EnumServiceGroupW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_EnumServiceGroupW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_ENUMSERVICEGROUPW,
@@ -1846,7 +1846,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2A(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfig2A, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIG2A,
@@ -1893,7 +1893,7 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2W(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_ChangeServiceConfig2W, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_CHANGESERVICECONFIG2W,
@@ -1924,10 +1924,10 @@ NTSTATUS rpccli_svcctl_ChangeServiceConfig2W(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx,
                                            struct policy_handle *handle /* [in] [ref] */,
-                                           uint32_t info_level /* [in]  */,
+                                           enum svcctl_ConfigLevel info_level /* [in]  */,
                                            uint8_t *buffer /* [out]  */,
-                                           uint32_t buf_size /* [in]  */,
-                                           uint32_t *bytes_needed /* [out] [ref] */,
+                                           uint32_t offered /* [in]  */,
+                                           uint32_t *needed /* [out] [ref] */,
                                            WERROR *werror)
 {
        struct svcctl_QueryServiceConfig2A r;
@@ -1936,13 +1936,13 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.handle = handle;
        r.in.info_level = info_level;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfig2A, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIG2A,
@@ -1961,8 +1961,8 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
+       *needed = *r.out.needed;
 
        /* Return result */
        if (werror) {
@@ -1975,10 +1975,10 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2A(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx,
                                            struct policy_handle *handle /* [in] [ref] */,
-                                           uint32_t info_level /* [in]  */,
-                                           uint8_t *buffer /* [out] [ref,size_is(buf_size)] */,
-                                           uint32_t buf_size /* [in] [range(0,8192)] */,
-                                           uint32_t *bytes_needed /* [out] [ref,range(0,8192)] */,
+                                           enum svcctl_ConfigLevel info_level /* [in]  */,
+                                           uint8_t *buffer /* [out] [ref,size_is(offered)] */,
+                                           uint32_t offered /* [in] [range(0,8192)] */,
+                                           uint32_t *needed /* [out] [ref,range(0,8192)] */,
                                            WERROR *werror)
 {
        struct svcctl_QueryServiceConfig2W r;
@@ -1987,13 +1987,13 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.handle = handle;
        r.in.info_level = info_level;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceConfig2W, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICECONFIG2W,
@@ -2012,8 +2012,8 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
+       *needed = *r.out.needed;
 
        /* Return result */
        if (werror) {
@@ -2026,10 +2026,10 @@ NTSTATUS rpccli_svcctl_QueryServiceConfig2W(struct rpc_pipe_client *cli,
 NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
                                            TALLOC_CTX *mem_ctx,
                                            struct policy_handle *handle /* [in] [ref] */,
-                                           uint32_t info_level /* [in]  */,
-                                           uint8_t *buffer /* [out] [ref,size_is(buf_size)] */,
-                                           uint32_t buf_size /* [in] [range(0,8192)] */,
-                                           uint32_t *bytes_needed /* [out] [ref,range(0,8192)] */,
+                                           enum svcctl_StatusLevel info_level /* [in]  */,
+                                           uint8_t *buffer /* [out] [ref,size_is(offered)] */,
+                                           uint32_t offered /* [in] [range(0,8192)] */,
+                                           uint32_t *needed /* [out] [ref,range(0,8192)] */,
                                            WERROR *werror)
 {
        struct svcctl_QueryServiceStatusEx r;
@@ -2038,13 +2038,13 @@ NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
        /* In parameters */
        r.in.handle = handle;
        r.in.info_level = info_level;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(svcctl_QueryServiceStatusEx, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_QUERYSERVICESTATUSEX,
@@ -2063,8 +2063,8 @@ NTSTATUS rpccli_svcctl_QueryServiceStatusEx(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(buffer, r.out.buffer, r.in.buf_size * sizeof(*buffer));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(buffer, r.out.buffer, r.in.offered * sizeof(*buffer));
+       *needed = *r.out.needed;
 
        /* Return result */
        if (werror) {
@@ -2079,10 +2079,10 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
                                      struct policy_handle *scmanager /* [in] [ref] */,
                                      uint32_t info_level /* [in]  */,
                                      uint32_t type /* [in]  */,
-                                     uint32_t state /* [in]  */,
+                                     enum svcctl_ServiceState state /* [in]  */,
                                      uint8_t *services /* [out]  */,
-                                     uint32_t buf_size /* [in]  */,
-                                     uint32_t *bytes_needed /* [out] [ref] */,
+                                     uint32_t offered /* [in]  */,
+                                     uint32_t *needed /* [out] [ref] */,
                                      uint32_t *service_returned /* [out] [ref] */,
                                      uint32_t *resume_handle /* [in,out] [unique] */,
                                      const char **group_name /* [out] [ref,charset(UTF16)] */,
@@ -2096,14 +2096,14 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
        r.in.info_level = info_level;
        r.in.type = type;
        r.in.state = state;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
        r.in.resume_handle = resume_handle;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(EnumServicesStatusExA, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_ENUMSERVICESSTATUSEXA,
@@ -2122,8 +2122,8 @@ NTSTATUS rpccli_EnumServicesStatusExA(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(services, r.out.services, r.in.buf_size * sizeof(*services));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(services, r.out.services, r.in.offered * sizeof(*services));
+       *needed = *r.out.needed;
        *service_returned = *r.out.service_returned;
        if (resume_handle && r.out.resume_handle) {
                *resume_handle = *r.out.resume_handle;
@@ -2143,12 +2143,12 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
                                      struct policy_handle *scmanager /* [in] [ref] */,
                                      uint32_t info_level /* [in]  */,
                                      uint32_t type /* [in]  */,
-                                     uint32_t state /* [in]  */,
-                                     uint8_t *services /* [out] [ref,size_is(buf_size)] */,
-                                     uint32_t buf_size /* [in] [range(0,262144)] */,
-                                     uint32_t *bytes_needed /* [out] [ref,range(0,262144)] */,
-                                     uint32_t *service_returned /* [out] [ref,range(0,262144)] */,
-                                     uint32_t *resume_handle /* [in,out] [unique,range(0,262144)] */,
+                                     enum svcctl_ServiceState state /* [in]  */,
+                                     uint8_t *services /* [out] [ref,size_is(offered)] */,
+                                     uint32_t offered /* [in] [range(0,0x40000)] */,
+                                     uint32_t *needed /* [out] [ref,range(0,0x40000)] */,
+                                     uint32_t *service_returned /* [out] [ref,range(0,0x40000)] */,
+                                     uint32_t *resume_handle /* [in,out] [unique,range(0,0x40000)] */,
                                      const char *group_name /* [in] [unique,charset(UTF16)] */,
                                      WERROR *werror)
 {
@@ -2160,7 +2160,7 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
        r.in.info_level = info_level;
        r.in.type = type;
        r.in.state = state;
-       r.in.buf_size = buf_size;
+       r.in.offered = offered;
        r.in.resume_handle = resume_handle;
        r.in.group_name = group_name;
 
@@ -2168,7 +2168,7 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(EnumServicesStatusExW, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_ENUMSERVICESSTATUSEXW,
@@ -2187,8 +2187,8 @@ NTSTATUS rpccli_EnumServicesStatusExW(struct rpc_pipe_client *cli,
        }
 
        /* Return variables */
-       memcpy(services, r.out.services, r.in.buf_size * sizeof(*services));
-       *bytes_needed = *r.out.bytes_needed;
+       memcpy(services, r.out.services, r.in.offered * sizeof(*services));
+       *needed = *r.out.needed;
        *service_returned = *r.out.service_returned;
        if (resume_handle && r.out.resume_handle) {
                *resume_handle = *r.out.resume_handle;
@@ -2215,7 +2215,7 @@ NTSTATUS rpccli_svcctl_SCSendTSMessage(struct rpc_pipe_client *cli,
                NDR_PRINT_IN_DEBUG(svcctl_SCSendTSMessage, &r);
        }
 
-       status = cli_do_rpc_ndr(cli,
+       status = cli->dispatch(cli,
                                mem_ctx,
                                &ndr_table_svcctl,
                                NDR_SVCCTL_SCSENDTSMESSAGE,