From 66c089acaab90569a0b9597fa320d1b8fc944155 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 20 Sep 2006 16:32:29 +0000 Subject: r18713: Autogenerate srvsvc and svcctl interfaces (This used to be commit a8aa312b7e597c4fc922a6d1783d5b6d43bceecb) --- source3/librpc/idl/srvsvc.idl | 92 +++++++++++++++++++++++-------------------- source3/librpc/idl/svcctl.idl | 52 ++++++++++++------------ 2 files changed, 76 insertions(+), 68 deletions(-) (limited to 'source3/librpc/idl') diff --git a/source3/librpc/idl/srvsvc.idl b/source3/librpc/idl/srvsvc.idl index 2dfc198f5b..a20660b378 100644 --- a/source3/librpc/idl/srvsvc.idl +++ b/source3/librpc/idl/srvsvc.idl @@ -56,11 +56,11 @@ /* Function: 0x00 */ WERROR srvsvc_NetCharDevEnum( [in] [string,charset(UTF16)] uint16 *server_unc, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetCharDevCtr ctr, + [in,out,ref] uint32 *level, + [in,out,ref,switch_is(*level)] srvsvc_NetCharDevCtr *ctr, [in] uint32 max_buffer, - [out] uint32 totalentries, - [in,out] uint32 *resume_handle + [out,ref] uint32 *totalentries, + [in,out,unique] uint32 *resume_handle ); /******************/ @@ -69,7 +69,7 @@ [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 device_name[], [in] uint32 level, - [out,switch_is(level)] srvsvc_NetCharDevInfo info + [out,ref,switch_is(level)] srvsvc_NetCharDevInfo *info ); /******************/ @@ -122,10 +122,10 @@ WERROR srvsvc_NetCharDevQEnum( [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 *user, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetCharDevQCtr ctr, + [in,out,ref] uint32 *level, + [in,out,switch_is(*level),ref] srvsvc_NetCharDevQCtr *ctr, [in] uint32 max_buffer, - [out] uint32 totalentries, + [out,ref] uint32 *totalentries, [in,out] uint32 *resume_handle ); @@ -136,7 +136,7 @@ [in] [string,charset(UTF16)] uint16 queue_name[], [in] [string,charset(UTF16)] uint16 user[], [in] uint32 level, - [out,switch_is(level)] srvsvc_NetCharDevQInfo info + [out,switch_is(level),ref] srvsvc_NetCharDevQInfo *info ); /******************/ @@ -202,11 +202,11 @@ WERROR srvsvc_NetConnEnum( [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 *path, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetConnCtr ctr, + [in,out,ref] uint32 *level, + [in,out,switch_is(*level),ref] srvsvc_NetConnCtr *ctr, [in] uint32 max_buffer, - [out] uint32 totalentries, - [in,out] uint32 *resume_handle + [out,ref] uint32 *totalentries, + [in,out,unique] uint32 *resume_handle ); /**************************/ @@ -252,11 +252,11 @@ [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 *path, [in] [string,charset(UTF16)] uint16 *user, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetFileCtr ctr, + [in,out,ref] uint32 *level, + [in,out,switch_is(*level),ref] srvsvc_NetFileCtr *ctr, [in] uint32 max_buffer, - [out] uint32 totalentries, - [in,out] uint32 *resume_handle + [out,ref] uint32 *totalentries, + [in,out,unique] uint32 *resume_handle ); /******************/ @@ -265,7 +265,7 @@ [in] [string,charset(UTF16)] uint16 *server_unc, [in] uint32 fid, [in] uint32 level, - [out,switch_is(level)] srvsvc_NetFileInfo info + [out,switch_is(level),ref] srvsvc_NetFileInfo *info ); /******************/ @@ -359,11 +359,11 @@ [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 *client, [in] [string,charset(UTF16)] uint16 *user, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetSessCtr ctr, + [in,out,ref] uint32 *level, + [in,out,switch_is(*level),ref] srvsvc_NetSessCtr *ctr, [in] uint32 max_buffer, - [out] uint32 totalentries, - [in,out] uint32 *resume_handle + [out,ref] uint32 *totalentries, + [in,out,unique] uint32 *resume_handle ); /******************/ @@ -473,8 +473,16 @@ [size_is(count)] srvsvc_NetShareInfo1004 *array; } srvsvc_NetShareCtr1004; + typedef bitmap { + SHARE_1005_IN_DFS = 0x00000001, + SHARE_1005_DFS_ROOT = 0x00000002 + } NetShareInfo1005Flags; + + const uint32 SHARE_1005_CSC_POLICY_MASK = 0x00000030; + const uint32 SHARE_1005_CSC_POLICY_SHIFT = 4; + typedef struct { - uint32 dfs_flags; + NetShareInfo1005Flags dfs_flags; } srvsvc_NetShareInfo1005; typedef struct { @@ -547,10 +555,10 @@ /* Function: 0x0f */ WERROR srvsvc_NetShareEnumAll ( [in] [string,charset(UTF16)] uint16 *server_unc, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetShareCtr ctr, + [in,out,ref] uint32 *level, + [in,out,ref,switch_is(*level)] srvsvc_NetShareCtr *ctr, [in] uint32 max_buffer, - [out] uint32 totalentries, + [out,ref] uint32 *totalentries, [in,out] uint32 *resume_handle ); @@ -560,7 +568,7 @@ [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 share_name[], [in] uint32 level, - [out,switch_is(level)] srvsvc_NetShareInfo info + [out,ref,switch_is(level)] srvsvc_NetShareInfo *info ); /******************/ @@ -594,7 +602,7 @@ WERROR srvsvc_NetShareCheck( [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 device_name[], - [out] srvsvc_ShareType type + [out,ref] srvsvc_ShareType *type ); /**************************/ @@ -1104,7 +1112,7 @@ WERROR srvsvc_NetSrvGetInfo( [in] [string,charset(UTF16)] uint16 *server_unc, [in] uint32 level, - [out,switch_is(level)] srvsvc_NetSrvInfo info + [out,ref,switch_is(level)] srvsvc_NetSrvInfo *info ); /******************/ @@ -1133,9 +1141,9 @@ WERROR srvsvc_NetDiskEnum( [in] [string,charset(UTF16)] uint16 *server_unc, [in] uint32 level, - [in,out] srvsvc_NetDiskInfo info, + [in,out,ref] srvsvc_NetDiskInfo *info, [in] uint32 maxlen, - [out] uint32 totalentries, + [out,ref] uint32 *totalentries, [in,out] uint32 *resume_handle ); @@ -1169,7 +1177,7 @@ [in] [string,charset(UTF16)] uint16 *service, [in] uint32 level, [in] uint32 options, - [out] srvsvc_Statistics stat + [out,ref] srvsvc_Statistics *stat ); /**************************/ @@ -1254,11 +1262,11 @@ /* Function: 0x1a */ WERROR srvsvc_NetTransportEnum( [in] [string,charset(UTF16)] uint16 *server_unc, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetTransportCtr transports, + [in,out,ref] uint32 *level, + [in,out,ref,switch_is(*level)] srvsvc_NetTransportCtr *transports, [in] uint32 max_buffer, - [out] uint32 totalentries, - [in,out] uint32 *resume_handle + [out,ref] uint32 *totalentries, + [in,out,unique] uint32 *resume_handle ); /******************/ @@ -1315,7 +1323,7 @@ [in] [string,charset(UTF16)] uint16 *server_unc, [in] [string,charset(UTF16)] uint16 path[], [in] uint32 pathflags, - [out] uint32 pathtype + [out,ref] uint32 *pathtype ); /******************/ @@ -1326,7 +1334,7 @@ [out] [size_is(maxbuf)] uint8 can_path[], [in] uint32 maxbuf, [in] [string,charset(UTF16)] uint16 prefix[], - [in,out] uint32 pathtype, + [in,out,ref] uint32 *pathtype, [in] uint32 pathflags ); @@ -1376,11 +1384,11 @@ total entries ... */ WERROR srvsvc_NetShareEnum( [in] [string,charset(UTF16)] uint16 *server_unc, - [in,out] uint32 level, - [in,out,switch_is(level)] srvsvc_NetShareCtr ctr, + [in,out,ref] uint32 *level, + [in,out,ref,switch_is(*level)] srvsvc_NetShareCtr *ctr, [in] uint32 max_buffer, - [out] uint32 totalentries, - [in,out] uint32 *resume_handle + [out,ref] uint32 *totalentries, + [in,out,unique] uint32 *resume_handle ); /******************/ diff --git a/source3/librpc/idl/svcctl.idl b/source3/librpc/idl/svcctl.idl index 57d25efd0d..aa159da24e 100644 --- a/source3/librpc/idl/svcctl.idl +++ b/source3/librpc/idl/svcctl.idl @@ -108,7 +108,7 @@ WERROR svcctl_LockServiceDatabase( [in,ref] policy_handle *handle, - [out] policy_handle lock + [out,ref] policy_handle *lock ); /*****************/ @@ -155,7 +155,7 @@ [in] uint32 error, [in] [string,charset(UTF16)] uint16 *binary_path, [in] [string,charset(UTF16)] uint16 *load_order_group, - [out] uint32 tag_id, + [out,ref] uint32 *tag_id, [in] [string,charset(UTF16)] uint16 *dependencies, [in] [string,charset(UTF16)] uint16 *service_start_name, [in] [string,charset(UTF16)] uint16 *password, @@ -186,8 +186,8 @@ [in] uint32 state, [out] ENUM_SERVICE_STATUS *status, [in] uint32 buf_size, - [out] uint32 bytes_needed, - [out] uint32 services_returned); + [out,ref] uint32 *bytes_needed, + [out,ref] uint32 *services_returned); /*****************/ /* Function 0x0e */ @@ -197,8 +197,8 @@ [in] uint32 state, [in] uint32 buf_size, [out,size_is(buf_size)] uint8 service[*], - [out] uint32 bytes_needed, - [out] uint32 services_returned, + [out,ref] uint32 *bytes_needed, + [out,ref] uint32 *services_returned, [in,out] uint32 *resume_handle ); /*****************/ @@ -221,7 +221,7 @@ WERROR svcctl_QueryServiceConfigW([in,ref] policy_handle *handle, [out] uint8 query[buf_size], /*QUERY_SERVICE_CONFIG */ [in] uint32 buf_size, - [out] uint32 bytes_needed + [out,ref] uint32 *bytes_needed ); /*****************/ @@ -244,13 +244,13 @@ /* Function 0x14 */ WERROR svcctl_GetServiceDisplayNameW([in,ref] policy_handle *handle, [in] [string,charset(UTF16)] uint16 *service_name, - [out] [string,charset(UTF16)] uint16 *display_name, + [out,ref] [string,charset(UTF16)] uint16 **display_name, [in,out] uint32 *display_name_length); /*****************/ /* Function 0x15 */ WERROR svcctl_GetServiceKeyNameW([in,ref] policy_handle *handle, [in] [string,charset(UTF16)] uint16 *service_name, - [out] [string,charset(UTF16)] uint16 *key_name, + [out,ref] [string,charset(UTF16)] uint16 **key_name, [in,out] uint32 *display_name_length); /*****************/ /* Function 0x16 */ @@ -268,7 +268,7 @@ [in] uint32 error, [in] [string,charset(UTF16)] uint16 *binary_path, [in] [string,charset(UTF16)] uint16 *load_order_group, - [out] uint32 tag_id, + [out,ref] uint32 *tag_id, [in] [string,charset(UTF16)] uint16 *dependencies, [in] [string,charset(UTF16)] uint16 *service_start_name, [in] [string,charset(UTF16)] uint16 *password, @@ -296,8 +296,8 @@ [in] uint32 state, [out] ENUM_SERVICE_STATUS *status, [in] uint32 buf_size, - [out] uint32 bytes_needed, - [out] uint32 services_returned); + [out,ref] uint32 *bytes_needed, + [out,ref] uint32 *services_returned); /*****************/ /* Function 0x1a */ @@ -307,8 +307,8 @@ [in] uint32 state, [in] uint32 buf_size, [out,size_is(buf_size)] uint8 service[*], - [out] uint32 bytes_needed, - [out] uint32 services_returned, + [out,ref] uint32 *bytes_needed, + [out,ref] uint32 *services_returned, [in,out] uint32 *resume_handle ); @@ -331,7 +331,7 @@ WERROR svcctl_QueryServiceConfigA([in,ref] policy_handle *handle, [out] uint8 query[buf_size], /*QUERYU_SERVICE_CONFIG */ [in] uint32 buf_size, - [out] uint32 bytes_needed + [out,ref] uint32 *bytes_needed ); /*****************/ @@ -354,13 +354,13 @@ /* Function 0x20 */ WERROR svcctl_GetServiceDisplayNameA([in,ref] policy_handle *handle, [in] [string,charset(UTF16)] uint16 *service_name, - [out] [string,charset(UTF16)] uint16 *display_name, + [out,ref] [string,charset(UTF16)] uint16 **display_name, [in,out] uint32 *display_name_length); /*****************/ /* Function 0x21 */ WERROR svcctl_GetServiceKeyNameA([in,ref] policy_handle *handle, [in] [string,charset(UTF16)] uint16 *service_name, - [out] [string,charset(UTF16)] uint16 *key_name, + [out,ref] [string,charset(UTF16)] uint16 **key_name, [in,out] uint32 *display_name_length); /*****************/ @@ -391,7 +391,7 @@ [in] uint32 info_level, [out] uint8 buffer[buf_size], [in] uint32 buf_size, - [out] uint32 bytes_needed); + [out,ref] uint32 *bytes_needed); /*****************/ /* Function 0x27 */ @@ -400,7 +400,7 @@ [in] uint32 info_level, [out] uint8 buffer[buf_size], [in] uint32 buf_size, - [out] uint32 bytes_needed); + [out,ref] uint32 *bytes_needed); /*****************/ /* Function 0x28 */ @@ -409,7 +409,7 @@ [in] uint32 info_level, [out] uint8 buffer[buf_size], [in] uint32 buf_size, - [out] uint32 bytes_needed); + [out,ref] uint32 *bytes_needed); /*****************/ /* Function 0x29 */ @@ -420,10 +420,10 @@ [in] uint32 state, [out] uint8 services[buf_size], [in] uint32 buf_size, - [out] uint32 bytes_needed, - [out] uint32 service_returned, + [out,ref] uint32 *bytes_needed, + [out,ref] uint32 *service_returned, [in,out] uint32 *resume_handle, - [out] [string,charset(UTF16)] uint16 *group_name); + [out,ref] [string,charset(UTF16)] uint16 **group_name); /*****************/ /* Function 0x2a */ @@ -434,10 +434,10 @@ [in] uint32 state, [out] uint8 services[buf_size], [in] uint32 buf_size, - [out] uint32 bytes_needed, - [out] uint32 service_returned, + [out,ref] uint32 *bytes_needed, + [out,ref] uint32 *service_returned, [in,out] uint32 *resume_handle, - [out] [string,charset(UTF16)] uint16 *group_name); + [out,ref] [string,charset(UTF16)] uint16 **group_name); /*****************/ /* Function 0x2b */ -- cgit