summaryrefslogtreecommitdiff
path: root/source4/librpc
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-10-16 18:54:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:44:49 -0500
commit98800eb41e63afcba5d0f0a7784dfb1077d322c6 (patch)
treed36d6712cfadc5d33450a7d4fc008b45cacae434 /source4/librpc
parent8d036f304ed8bbb61be3e26c3670a8c743bd7152 (diff)
downloadsamba-98800eb41e63afcba5d0f0a7784dfb1077d322c6.tar.gz
samba-98800eb41e63afcba5d0f0a7784dfb1077d322c6.tar.bz2
samba-98800eb41e63afcba5d0f0a7784dfb1077d322c6.zip
r11100: Replace unistr with [string,charset(UTF16)]
(This used to be commit 48f45927ceb4f7d39c4cc47b3b843e43a53b7f2b)
Diffstat (limited to 'source4/librpc')
-rw-r--r--source4/librpc/idl/lsa.idl8
-rw-r--r--source4/librpc/idl/netlogon.idl170
-rw-r--r--source4/librpc/idl/remact.idl2
-rw-r--r--source4/librpc/idl/srvsvc.idl206
-rw-r--r--source4/librpc/idl/svcctl.idl90
-rw-r--r--source4/librpc/idl/wkssvc.idl26
6 files changed, 251 insertions, 251 deletions
diff --git a/source4/librpc/idl/lsa.idl b/source4/librpc/idl/lsa.idl
index 3dbb12fc71..824ebac689 100644
--- a/source4/librpc/idl/lsa.idl
+++ b/source4/librpc/idl/lsa.idl
@@ -107,7 +107,7 @@
typedef struct {
uint32 len; /* ignored */
uint8 *root_dir;
- unistr *object_name;
+ [string,charset(UTF16)] uint16 *object_name;
uint32 attributes;
security_descriptor *sec_desc;
lsa_QosInfo *sec_qos;
@@ -632,7 +632,7 @@
/* Function: 0x24 */
typedef struct {
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
} lsa_RightAttribute;
typedef struct {
@@ -685,7 +685,7 @@
/**********************/
/* Function: 0x2c */
NTSTATUS lsa_OpenPolicy2 (
- [in,unique] unistr *system_name,
+ [in,unique] [string,charset(UTF16)] uint16 *system_name,
[in] lsa_ObjectAttribute *attr,
[in] uint32 access_mask,
[out] policy_handle *handle
@@ -698,7 +698,7 @@
} lsa_StringPointer;
NTSTATUS lsa_GetUserName(
- [in,unique] unistr *system_name,
+ [in,unique] [string,charset(UTF16)] uint16 *system_name,
[in,out,unique] lsa_String *account_name,
[in,out,unique] lsa_StringPointer *authority_name
);
diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index 4730fba56a..bec28e3b25 100644
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -23,7 +23,7 @@ interface netlogon
/* Function 0x00 */
typedef struct {
- unistr *account_name;
+ [string,charset(UTF16)] uint16 *account_name;
uint32 priv;
uint32 auth_flags;
uint32 logon_count;
@@ -35,16 +35,16 @@ interface netlogon
uint32 password_age;
time_t pw_can_change;
time_t pw_must_change;
- unistr *computer;
- unistr *domain;
- unistr *script_path;
+ [string,charset(UTF16)] uint16 *computer;
+ [string,charset(UTF16)] uint16 *domain;
+ [string,charset(UTF16)] uint16 *script_path;
uint32 unknown;
} netr_UasInfo;
WERROR netr_LogonUasLogon(
- [in] unistr *server_name,
- [in] unistr account_name,
- [in] unistr workstation,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 account_name[],
+ [in] [string,charset(UTF16)] uint16 workstation[],
[out] netr_UasInfo *info
);
@@ -58,9 +58,9 @@ interface netlogon
} netr_UasLogoffInfo;
WERROR netr_LogonUasLogoff(
- [in] unistr *server_name,
- [in] unistr account_name,
- [in] unistr workstation,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 account_name[],
+ [in] [string,charset(UTF16)] uint16 workstation[],
[out] netr_UasLogoffInfo info
);
@@ -224,8 +224,8 @@ interface netlogon
} netr_Authenticator;
NTSTATUS netr_LogonSamLogon(
- [in] unistr *server_name,
- [in] unistr *workstation,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 *workstation,
[in] netr_Authenticator *credential,
[in][out] netr_Authenticator *return_authenticator,
[in] uint16 logon_level,
@@ -240,8 +240,8 @@ interface netlogon
/* Function 0x03 */
NTSTATUS netr_LogonSamLogoff(
- [in] unistr *server_name,
- [in] unistr *computer_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 *computer_name,
[in] netr_Authenticator *credential,
[in][out] netr_Authenticator *return_authenticator,
[in] uint16 logon_level,
@@ -254,8 +254,8 @@ interface netlogon
/* Function 0x04 */
NTSTATUS netr_ServerReqChallenge(
- [in] unistr *server_name,
- [in] unistr computer_name,
+ [in,string,charset(UTF16)] uint16 *server_name,
+ [in,string,charset(UTF16)] uint16 computer_name[],
[in,out,ref] netr_Credential *credentials
);
@@ -266,10 +266,10 @@ interface netlogon
declare enum netr_SchannelType;
NTSTATUS netr_ServerAuthenticate(
- [in] unistr *server_name,
- [in] unistr account_name,
- [in] netr_SchannelType secure_channel_type,
- [in] unistr computer_name,
+ [in,string,charset(UTF16)] uint16 *server_name,
+ [in,string,charset(UTF16)] uint16 account_name[],
+ [in] netr_SchannelType secure_channel_type,
+ [in,string,charset(UTF16)] uint16 computer_name[],
[in,out,ref] netr_Credential *credentials
);
@@ -278,10 +278,10 @@ interface netlogon
/* Function 0x06 */
NTSTATUS netr_ServerPasswordSet(
- [in] unistr *server_name,
- [in] unistr account_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 account_name[],
[in] netr_SchannelType secure_channel_type,
- [in] unistr computer_name,
+ [in] [string,charset(UTF16)] uint16 computer_name[],
[in] netr_Authenticator credential,
[in] samr_Password new_password,
[out] netr_Authenticator return_authenticator
@@ -294,7 +294,7 @@ interface netlogon
declare enum netr_SamDatabaseID;
typedef struct {
- unistr *account_name;
+ [string,charset(UTF16)] uint16 *account_name;
lsa_String unknown1;
lsa_String unknown2;
lsa_String unknown3;
@@ -642,8 +642,8 @@ interface netlogon
[case(NETR_DELTA_DELETE_TRUST)] dom_sid2 *sid;
[case(NETR_DELTA_ACCOUNT)] dom_sid2 *sid;
[case(NETR_DELTA_DELETE_ACCOUNT)] dom_sid2 *sid;
- [case(NETR_DELTA_SECRET)] unistr *name;
- [case(NETR_DELTA_DELETE_SECRET)] unistr *name;
+ [case(NETR_DELTA_SECRET)] [string,charset(UTF16)] uint16 *name;
+ [case(NETR_DELTA_DELETE_SECRET)] [string,charset(UTF16)] uint16 *name;
[case(NETR_DELTA_DELETE_GROUP2)] uint32 rid;
[case(NETR_DELTA_DELETE_USER2)] uint32 rid;
[case(NETR_DELTA_MODIFY_COUNT)] ;
@@ -662,8 +662,8 @@ interface netlogon
NTSTATUS netr_DatabaseDeltas(
- [in] unistr logon_server,
- [in] unistr computername,
+ [in] [string,charset(UTF16)] uint16 logon_server[],
+ [in] [string,charset(UTF16)] uint16 computername[],
[in] netr_Authenticator credential,
[in,out] netr_Authenticator return_authenticator,
[in] netr_SamDatabaseID database_id,
@@ -677,8 +677,8 @@ interface netlogon
/* Function 0x08 */
NTSTATUS netr_DatabaseSync(
- [in] unistr logon_server,
- [in] unistr computername,
+ [in] [string,charset(UTF16)] uint16 logon_server[],
+ [in] [string,charset(UTF16)] uint16 computername[],
[in] netr_Authenticator credential,
[in,out] netr_Authenticator return_authenticator,
[in] netr_SamDatabaseID database_id,
@@ -704,8 +704,8 @@ interface netlogon
} netr_AccountBuffer;
NTSTATUS netr_AccountDeltas(
- [in] unistr *logon_server,
- [in] unistr computername,
+ [in] [string,charset(UTF16)] uint16 *logon_server,
+ [in] [string,charset(UTF16)] uint16 computername[],
[in] netr_Authenticator credential,
[in,out] netr_Authenticator return_authenticator,
[in] netr_UAS_INFO_0 uas,
@@ -723,8 +723,8 @@ interface netlogon
/* Function 0x0A */
NTSTATUS netr_AccountSync(
- [in] unistr *logon_server,
- [in] unistr computername,
+ [in] [string,charset(UTF16)] uint16 *logon_server,
+ [in] [string,charset(UTF16)] uint16 computername[],
[in] netr_Authenticator credential,
[in,out] netr_Authenticator return_authenticator,
[in] uint32 reference,
@@ -742,9 +742,9 @@ interface netlogon
/* Function 0x0B */
NTSTATUS netr_GetDcName(
- [in] unistr logon_server,
- [in] unistr *domainname,
- [out] unistr *dcname
+ [in] [string,charset(UTF16)] uint16 logon_server[],
+ [in] [string,charset(UTF16)] uint16 *domainname,
+ [out] [string,charset(UTF16)] uint16 *dcname
);
/*****************/
@@ -758,7 +758,7 @@ interface netlogon
typedef struct {
uint32 flags;
uint32 pdc_connection_status;
- unistr trusted_dc_name;
+ [string,charset(UTF16)] uint16 trusted_dc_name[];
uint32 tc_connection_status;
} netr_NETLOGON_INFO_2;
@@ -787,7 +787,7 @@ interface netlogon
} netr_LogonControlCode;
WERROR netr_LogonControl(
- [in] unistr *logon_server,
+ [in] [string,charset(UTF16)] uint16 *logon_server,
[in] netr_LogonControlCode function_code,
[in] uint32 level,
[out,switch_is(level)] netr_CONTROL_QUERY_INFORMATION info
@@ -798,9 +798,9 @@ interface netlogon
/* Function 0x0D */
WERROR netr_GetAnyDCName(
- [in] unistr *logon_server,
- [in] unistr *domainname,
- [out] unistr *dcname
+ [in] [string,charset(UTF16)] uint16 *logon_server,
+ [in] [string,charset(UTF16)] uint16 *domainname,
+ [out] [string,charset(UTF16)] uint16 *dcname
);
@@ -808,14 +808,14 @@ interface netlogon
/* Function 0x0E */
typedef union {
- [case(NETLOGON_CONTROL_REDISCOVER)] unistr *domain;
- [case(NETLOGON_CONTROL_TC_QUERY)] unistr *domain;
- [case(NETLOGON_CONTROL_TRANSPORT_NOTIFY)] unistr *domain;
+ [case(NETLOGON_CONTROL_REDISCOVER)] [string,charset(UTF16)] uint16 *domain;
+ [case(NETLOGON_CONTROL_TC_QUERY)] [string,charset(UTF16)] uint16 *domain;
+ [case(NETLOGON_CONTROL_TRANSPORT_NOTIFY)] [string,charset(UTF16)] uint16 *domain;
[case(NETLOGON_CONTROL_SET_DBFLAG)] uint32 debug_level;
} netr_CONTROL_DATA_INFORMATION;
WERROR netr_LogonControl2(
- [in] unistr *logon_server,
+ [in] [string,charset(UTF16)] uint16 *logon_server,
[in] uint32 function_code,
[in] uint32 level,
[in][switch_is(function_code)] netr_CONTROL_DATA_INFORMATION data,
@@ -834,10 +834,10 @@ interface netlogon
/* Function 0x0F */
NTSTATUS netr_ServerAuthenticate2(
- [in] unistr *server_name,
- [in] unistr account_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 account_name[],
[in] netr_SchannelType secure_channel_type,
- [in] unistr computer_name,
+ [in] [string,charset(UTF16)] uint16 computer_name[],
[in,out,ref] netr_Credential *credentials,
[in,out,ref] uint32 *negotiate_flags
);
@@ -847,8 +847,8 @@ interface netlogon
/* Function 0x10 */
NTSTATUS netr_DatabaseSync2(
- [in] unistr logon_server,
- [in] unistr computername,
+ [in] [string,charset(UTF16)] uint16 logon_server[],
+ [in] [string,charset(UTF16)] uint16 computername[],
[in] netr_Authenticator credential,
[in,out] netr_Authenticator return_authenticator,
[in] netr_SamDatabaseID database_id,
@@ -865,8 +865,8 @@ interface netlogon
/* i'm not at all sure how this call works */
NTSTATUS netr_DatabaseRedo(
- [in] unistr logon_server,
- [in] unistr computername,
+ [in] [string,charset(UTF16)] uint16 logon_server[],
+ [in] [string,charset(UTF16)] uint16 computername[],
[in] netr_Authenticator credential,
[in,out] netr_Authenticator return_authenticator,
[in][size_is(change_log_entry_size)] uint8 *change_log_entry,
@@ -879,7 +879,7 @@ interface netlogon
/* Function 0x12 */
WERROR netr_LogonControl2Ex(
- [in] unistr *logon_server,
+ [in] [string,charset(UTF16)] uint16 *logon_server,
[in] uint32 function_code,
[in] uint32 level,
[in][switch_is(function_code)] netr_CONTROL_DATA_INFORMATION data,
@@ -917,10 +917,10 @@ interface netlogon
/****************/
/* Function 0x1a */
NTSTATUS netr_ServerAuthenticate3(
- [in] unistr *server_name,
- [in] unistr account_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 account_name[],
[in] netr_SchannelType secure_channel_type,
- [in] unistr computer_name,
+ [in] [string,charset(UTF16)] uint16 computer_name[],
[in,out,ref] netr_Credential *credentials,
[in,out,ref] uint32 *negotiate_flags,
[out,ref] uint32 *rid
@@ -950,12 +950,12 @@ interface netlogon
typedef struct {
netr_Blob blob;
- unistr *workstation_domain;
- unistr *workstation_site;
- unistr *unknown1;
- unistr *unknown2;
- unistr *unknown3;
- unistr *unknown4;
+ [string,charset(UTF16)] uint16 *workstation_domain;
+ [string,charset(UTF16)] uint16 *workstation_site;
+ [string,charset(UTF16)] uint16 *unknown1;
+ [string,charset(UTF16)] uint16 *unknown2;
+ [string,charset(UTF16)] uint16 *unknown3;
+ [string,charset(UTF16)] uint16 *unknown4;
netr_BinaryString blob2;
lsa_String product;
lsa_String unknown5;
@@ -991,8 +991,8 @@ interface netlogon
} netr_DomainInfo;
NTSTATUS netr_LogonGetDomainInfo(
- [in] unistr server_name,
- [in] unistr *computer_name,
+ [in] [string,charset(UTF16)] uint16 server_name[],
+ [in] [string,charset(UTF16)] uint16 *computer_name,
[in,ref] netr_Authenticator *credential,
[in,out,ref] netr_Authenticator *return_authenticator,
[in] uint32 level,
@@ -1008,10 +1008,10 @@ interface netlogon
/*****************/
/* Function 0x1e */
NTSTATUS netr_ServerPasswordSet2(
- [in] unistr *server_name,
- [in] unistr account_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 account_name[],
[in] netr_SchannelType secure_channel_type,
- [in] unistr computer_name,
+ [in] [string,charset(UTF16)] uint16 computer_name[],
[in] netr_Authenticator credential,
[in] netr_CryptPassword new_password,
[out] netr_Authenticator return_authenticator
@@ -1032,24 +1032,24 @@ interface netlogon
/****************/
/* Function 0x22 */
typedef struct {
- unistr *dc_unc;
- unistr *dc_address;
+ [string,charset(UTF16)] uint16 *dc_unc;
+ [string,charset(UTF16)] uint16 *dc_address;
int32 dc_address_type;
GUID domain_guid;
- unistr *domain_name;
- unistr *forest_name;
+ [string,charset(UTF16)] uint16 *domain_name;
+ [string,charset(UTF16)] uint16 *forest_name;
uint32 dc_flags;
- unistr *dc_site_name;
- unistr *client_site_name;
+ [string,charset(UTF16)] uint16 *dc_site_name;
+ [string,charset(UTF16)] uint16 *client_site_name;
} netr_DrsGetDCNameEx2Info;
WERROR netr_DrsGetDCNameEx2(
- [in] unistr *server_unc,
- [in] unistr *client_account,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 *client_account,
[in] uint32 mask,
- [in] unistr *domain_name,
+ [in] [string,charset(UTF16)] uint16 *domain_name,
[in] GUID *domain_guid,
- [in] unistr *site_name,
+ [in] [string,charset(UTF16)] uint16 *site_name,
[in] uint32 flags,
[out] netr_DrsGetDCNameEx2Info *info
);
@@ -1073,8 +1073,8 @@ interface netlogon
/****************/
/* Function 0x27 */
NTSTATUS netr_LogonSamLogonEx(
- [in] unistr *server_name,
- [in] unistr *workstation,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 *workstation,
[in] uint16 logon_level,
[in] [switch_is(logon_level)] netr_LogonLevel logon,
[in] uint16 validation_level,
@@ -1113,8 +1113,8 @@ interface netlogon
} netr_TrustAttributes;
typedef struct {
- unistr *netbios_name;
- unistr *dns_name;
+ [string,charset(UTF16)] uint16 *netbios_name;
+ [string,charset(UTF16)] uint16 *dns_name;
netr_TrustFlags trust_flags;
uint32 parent_index;
netr_TrustType trust_type;
@@ -1124,7 +1124,7 @@ interface netlogon
} netr_DomainTrust;
WERROR netr_DsrEnumerateDomainTrusts(
- [in] unistr *server_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
[in] netr_TrustFlags trust_flags,
[out] uint32 count,
[out,size_is(count)] netr_DomainTrust *trusts
@@ -1152,8 +1152,8 @@ interface netlogon
/* this is the ADS varient. I don't yet know what the "flags" are for */
NTSTATUS netr_LogonSamLogonWithFlags(
- [in] unistr *server_name,
- [in] unistr *workstation,
+ [in] [string,charset(UTF16)] uint16 *server_name,
+ [in] [string,charset(UTF16)] uint16 *workstation,
[in] netr_Authenticator *credential,
[in][out] netr_Authenticator *return_authenticator,
[in] uint16 logon_level,
diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl
index 05192e31a5..f57b1b4335 100644
--- a/source4/librpc/idl/remact.idl
+++ b/source4/librpc/idl/remact.idl
@@ -28,7 +28,7 @@ interface IRemoteActivation
[in] ORPCTHIS this,
[out] ORPCTHAT that,
[in] GUID Clsid,
- [in] unistr *pwszObjectName,
+ [in] [string,charset(UTF16)] uint16 *pwszObjectName,
[in] MInterfacePointer *pObjectStorage,
[in] uint32 ClientImpLevel,
[in] uint32 Mode,
diff --git a/source4/librpc/idl/srvsvc.idl b/source4/librpc/idl/srvsvc.idl
index 0a9d910c1f..05406c3f76 100644
--- a/source4/librpc/idl/srvsvc.idl
+++ b/source4/librpc/idl/srvsvc.idl
@@ -19,7 +19,7 @@
/* srvsvc_NetCharDev */
/**************************/
typedef struct {
- unistr *device;
+ [string,charset(UTF16)] uint16 *device;
} srvsvc_NetCharDevInfo0;
typedef struct {
@@ -28,9 +28,9 @@
} srvsvc_NetCharDevCtr0;
typedef struct {
- unistr *device;
+ [string,charset(UTF16)] uint16 *device;
uint32 status;
- unistr *user;
+ [string,charset(UTF16)] uint16 *user;
uint32 time;
} srvsvc_NetCharDevInfo1;
@@ -54,7 +54,7 @@
/******************/
/* Function: 0x00 */
WERROR srvsvc_NetCharDevEnum(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in,out] uint32 level,
[in,out,switch_is(level)] srvsvc_NetCharDevCtr ctr,
[in] uint32 max_buffer,
@@ -65,8 +65,8 @@
/******************/
/* Function: 0x01 */
WERROR srvsvc_NetCharDevGetInfo(
- [in] unistr *server_unc,
- [in] unistr device_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 device_name[],
[in] uint32 level,
[out,switch_is(level)] srvsvc_NetCharDevInfo info
);
@@ -74,8 +74,8 @@
/******************/
/* Function: 0x02 */
WERROR srvsvc_NetCharDevControl(
- [in] unistr *server_unc,
- [in] unistr device_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 device_name[],
[in] uint32 opcode
);
@@ -83,7 +83,7 @@
/* srvsvc_NetCharDevQ */
/**************************/
typedef struct {
- unistr *device;
+ [string,charset(UTF16)] uint16 *device;
} srvsvc_NetCharDevQInfo0;
typedef struct {
@@ -92,9 +92,9 @@
} srvsvc_NetCharDevQCtr0;
typedef struct {
- unistr *device;
+ [string,charset(UTF16)] uint16 *device;
uint32 priority;
- unistr *devices;
+ [string,charset(UTF16)] uint16 *devices;
uint32 users;
uint32 num_ahead;
} srvsvc_NetCharDevQInfo1;
@@ -119,8 +119,8 @@
/******************/
/* Function: 0x03 */
WERROR srvsvc_NetCharDevQEnum(
- [in] unistr *server_unc,
- [in] unistr *user,
+ [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] uint32 max_buffer,
@@ -131,9 +131,9 @@
/******************/
/* Function: 0x04 */
WERROR srvsvc_NetCharDevQGetInfo(
- [in] unistr *server_unc,
- [in] unistr queue_name,
- [in] unistr user,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 queue_name[],
+ [in] [string,charset(UTF16)] uint16 user[],
[in] uint32 level,
[out,switch_is(level)] srvsvc_NetCharDevQInfo info
);
@@ -141,8 +141,8 @@
/******************/
/* Function: 0x05 */
WERROR srvsvc_NetCharDevQSetInfo(
- [in] unistr *server_unc,
- [in] unistr queue_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 queue_name[],
[in] uint32 level,
[in,switch_is(level)] srvsvc_NetCharDevQInfo info,
[in,out] uint32 *parm_error
@@ -151,16 +151,16 @@
/******************/
/* Function: 0x06 */
WERROR srvsvc_NetCharDevQPurge(
- [in] unistr *server_unc,
- [in] unistr queue_name
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 queue_name[]
);
/******************/
/* Function: 0x07 */
WERROR srvsvc_NetCharDevQPurgeSelf(
- [in] unistr *server_unc,
- [in] unistr queue_name,
- [in] unistr computer_name
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 queue_name[],
+ [in] [string,charset(UTF16)] uint16 computer_name[]
);
/**************************/
@@ -181,8 +181,8 @@
uint32 num_open;
uint32 num_users;
uint32 conn_time;
- unistr *user;
- unistr *client;
+ [string,charset(UTF16)] uint16 *user;
+ [string,charset(UTF16)] uint16 *client;
} srvsvc_NetConnInfo1;
typedef struct {
@@ -199,8 +199,8 @@
/******************/
/* Function: 0x08 */
WERROR srvsvc_NetConnEnum(
- [in] unistr *server_unc,
- [in] unistr *path,
+ [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] uint32 max_buffer,
@@ -224,8 +224,8 @@
uint32 fid;
uint32 permissions;
uint32 num_locks;
- unistr *path;
- unistr *user;
+ [string,charset(UTF16)] uint16 *path;
+ [string,charset(UTF16)] uint16 *user;
} srvsvc_NetFileInfo3;
typedef struct {
@@ -248,9 +248,9 @@
/******************/
/* Function: 0x09 */
WERROR srvsvc_NetFileEnum(
- [in] unistr *server_unc,
- [in] unistr *path,
- [in] unistr *user,
+ [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] uint32 max_buffer,
@@ -261,7 +261,7 @@
/******************/
/* Function: 0x0a */
WERROR srvsvc_NetFileGetInfo(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in] uint32 fid,
[in] uint32 level,
[out,switch_is(level)] srvsvc_NetFileInfo info
@@ -270,7 +270,7 @@
/******************/
/* Function: 0x0b */
WERROR srvsvc_NetFileClose(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in] uint32 fid
);
@@ -278,7 +278,7 @@
/* srvsvc_NetSess */
/**************************/
typedef struct {
- unistr *client;
+ [string,charset(UTF16)] uint16 *client;
} srvsvc_NetSessInfo0;
typedef struct {
@@ -287,8 +287,8 @@
} srvsvc_NetSessCtr0;
typedef struct {
- unistr *client;
- unistr *user;
+ [string,charset(UTF16)] uint16 *client;
+ [string,charset(UTF16)] uint16 *user;
uint32 num_open;
uint32 time;
uint32 idle_time;
@@ -301,13 +301,13 @@
} srvsvc_NetSessCtr1;
typedef struct {
- unistr *client;
- unistr *user;
+ [string,charset(UTF16)] uint16 *client;
+ [string,charset(UTF16)] uint16 *user;
uint32 num_open;
uint32 time;
uint32 idle_time;
uint32 user_flags;
- unistr *client_type;
+ [string,charset(UTF16)] uint16 *client_type;
} srvsvc_NetSessInfo2;
typedef struct {
@@ -316,8 +316,8 @@
} srvsvc_NetSessCtr2;
typedef struct {
- unistr *client;
- unistr *user;
+ [string,charset(UTF16)] uint16 *client;
+ [string,charset(UTF16)] uint16 *user;
uint32 time;
uint32 idle_time;
} srvsvc_NetSessInfo10;
@@ -328,14 +328,14 @@
} srvsvc_NetSessCtr10;
typedef struct {
- unistr *client;
- unistr *user;
+ [string,charset(UTF16)] uint16 *client;
+ [string,charset(UTF16)] uint16 *user;
uint32 num_open;
uint32 time;
uint32 idle_time;
uint32 user_flags;
- unistr *client_type;
- unistr *transport;
+ [string,charset(UTF16)] uint16 *client_type;
+ [string,charset(UTF16)] uint16 *transport;
} srvsvc_NetSessInfo502;
typedef struct {
@@ -355,9 +355,9 @@
/******************/
/* Function: 0x0c */
WERROR srvsvc_NetSessEnum(
- [in] unistr *server_unc,
- [in] unistr *client,
- [in] unistr *user,
+ [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] uint32 max_buffer,
@@ -368,9 +368,9 @@
/******************/
/* Function: 0x0d */
WERROR srvsvc_NetSessDel(
- [in] unistr *server_unc,
- [in] unistr *client,
- [in] unistr *user
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 *client,
+ [in] [string,charset(UTF16)] uint16 *user
);
/**************************/
@@ -397,7 +397,7 @@
} srvsvc_ShareType;
typedef struct {
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
} srvsvc_NetShareInfo0;
typedef struct {
@@ -406,9 +406,9 @@
} srvsvc_NetShareCtr0;
typedef struct {
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
srvsvc_ShareType type;
- unistr *comment;
+ [string,charset(UTF16)] uint16 *comment;
} srvsvc_NetShareInfo1;
typedef struct {
@@ -417,14 +417,14 @@
} srvsvc_NetShareCtr1;
typedef struct {
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
srvsvc_ShareType type;
- unistr *comment;
+ [string,charset(UTF16)] uint16 *comment;
uint32 permissions;
uint32 max_users;
uint32 current_users;
- unistr *path;
- unistr *password;
+ [string,charset(UTF16)] uint16 *path;
+ [string,charset(UTF16)] uint16 *password;
} srvsvc_NetShareInfo2;
typedef struct {
@@ -433,9 +433,9 @@
} srvsvc_NetShareCtr2;
typedef struct {
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
srvsvc_ShareType type;
- unistr *comment;
+ [string,charset(UTF16)] uint16 *comment;
uint32 csc_policy;
} srvsvc_NetShareInfo501;
@@ -445,14 +445,14 @@
} srvsvc_NetShareCtr501;
typedef struct {
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
srvsvc_ShareType type;
- unistr *comment;
+ [string,charset(UTF16)] uint16 *comment;
uint32 permissions;
int32 max_users;
uint32 current_users;
- unistr *path;
- unistr *password;
+ [string,charset(UTF16)] uint16 *path;
+ [string,charset(UTF16)] uint16 *password;
uint32 unknown;
[subcontext(4)] security_descriptor *sd;
} srvsvc_NetShareInfo502;
@@ -463,7 +463,7 @@
} srvsvc_NetShareCtr502;
typedef struct {
- unistr *comment;
+ [string,charset(UTF16)] uint16 *comment;
} srvsvc_NetShareInfo1004;
typedef struct {
@@ -504,7 +504,7 @@
/******************/
/* Function: 0x0e */
WERROR srvsvc_NetShareAdd(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in] uint32 level,
[in,switch_is(level)] srvsvc_NetShareInfo info,
[in,out] uint32 *parm_error
@@ -513,7 +513,7 @@
/******************/
/* Function: 0x0f */
WERROR srvsvc_NetShareEnumAll (
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in,out] uint32 level,
[in,out,switch_is(level)] srvsvc_NetShareCtr ctr,
[in] uint32 max_buffer,
@@ -524,8 +524,8 @@
/******************/
/* Function: 0x10 */
WERROR srvsvc_NetShareGetInfo(
- [in] unistr *server_unc,
- [in] unistr share_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 share_name[],
[in] uint32 level,
[out,switch_is(level)] srvsvc_NetShareInfo info
);
@@ -533,8 +533,8 @@
/******************/
/* Function: 0x11 */
WERROR srvsvc_NetShareSetInfo(
- [in] unistr *server_unc,
- [in] unistr share_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 share_name[],
[in] uint32 level,
[in,switch_is(level)] srvsvc_NetShareInfo info,
[in,out] uint32 *parm_error
@@ -543,24 +543,24 @@
/******************/
/* Function: 0x12 */
WERROR srvsvc_NetShareDel(
- [in] unistr *server_unc,
- [in] unistr share_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 share_name[],
[in] uint32 reserved
);
/******************/
/* Function: 0x13 */
WERROR srvsvc_NetShareDelSticky(
- [in] unistr *server_unc,
- [in] unistr share_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 share_name[],
[in] uint32 reserved
);
/******************/
/* Function: 0x14 */
WERROR srvsvc_NetShareCheck(
- [in] unistr *server_unc,
- [in] unistr device_name,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
+ [in] [string,charset(UTF16)] uint16 device_name[],
[out] srvsvc_ShareType type
);
@@ -573,43 +573,43 @@
typedef struct {
srvsvc_PlatformId platform_id;
- unistr *server_name;
+ [string,charset(UTF16)] uint16 *server_name;
} srvsvc_NetSrvInfo100;
typedef struct {
srvsvc_PlatformId platform_id;
- unistr *server_name;
+ [string,charset(UTF16)] uint16 *server_name;
uint32 version_major;
uint32 version_minor;
svcctl_ServerType server_type;
- unistr *comment;
+ [string,charset(UTF16)] uint16 *comment;
} srvsvc_NetSrvInfo101;
typedef struct {
srvsvc_PlatformId platform_id;
- unistr *server_name;
+ [string,charset(UTF16)] uint16 *server_name;
uint32 ver_major;
uint32 ver_minor;
svcctl_ServerType server_type;
- unistr *comment;
+ [string,charset(UTF16)] uint16 *comment;
uint32 users;
uint32 disc;
uint32 hidden;
uint32 announce;
uint32 anndelta;
uint32 licences;
- unistr *userpath;
+ [string,charset(UTF16)] uint16 *userpath;
} srvsvc_NetSrvInfo102;
typedef struct {
uint32 ulist_mtime;
uint32 glist_mtime;
uint32 alist_mtime;
- unistr *alerts;
+ [string,charset(UTF16)] uint16 *alerts;
uint32 security;
uint32 numadmin;
uint32 lanmask;
- unistr *guestaccount;
+ [string,charset(UTF16)] uint16 *guestaccount;
uint32 chdevs;
uint32 chdevqs;
uint32 chdevjobs;
@@ -631,18 +631,18 @@
uint32 diskalert;
uint32 netioalert;
uint32 maxaudits;
- unistr *srvheuristics;
+ [string,charset(UTF16)] uint16 *srvheuristics;
} srvsvc_NetSrvInfo402;
typedef struct {
uint32 ulist_mtime;
uint32 glist_mtime;
uint32 alist_mtime;
- unistr *alerts;
+ [string,charset(UTF16)] uint16 *alerts;
uint32 security;
uint32 numadmin;
uint32 lanmask;
- unistr *guestaccount;
+ [string,charset(UTF16)] uint16 *guestaccount;
uint32 chdevs;
uint32 chdevqs;
uint32 chdevjobs;
@@ -664,10 +664,10 @@
uint32 diskalert;
uint32 netioalert;
uint32 maxaudits;
- unistr *srvheuristics;
+ [string,charset(UTF16)] uint16 *srvheuristics;
uint32 auditedevents;
uint32 auditprofile;
- unistr *autopath;
+ [string,charset(UTF16)] uint16 *autopath;
} srvsvc_NetSrvInfo403;
typedef struct {
@@ -710,7 +710,7 @@
uint32 timesource;
uint32 acceptdownlevelapis;
uint32 lmannounce;
- unistr *domain;
+ [string,charset(UTF16)] uint16 *domain;
uint32 maxcopyreadlen;
uint32 maxcopywritelen;
uint32 minkeepsearch;
@@ -1011,7 +1011,7 @@
/******************/
/* Function: 0x15 */
WERROR srvsvc_NetSrvGetInfo(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in] uint32 level,
[out,switch_is(level)] srvsvc_NetSrvInfo info
);
@@ -1019,7 +1019,7 @@
/******************/
/* Function: 0x16 */
WERROR srvsvc_NetSrvSetInfo(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in] uint32 level,
[in,switch_is(level)] srvsvc_NetSrvInfo info,
[in,out] uint32 *parm_error
@@ -1047,7 +1047,7 @@
/******************/
/* Function: 0x17 */
WERROR srvsvc_NetDiskEnum(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in] uint32 level,
[out] uint32 count,
[in,switch_is(level)] srvsvc_NetDiskCtr ctr,
@@ -1075,10 +1075,10 @@
typedef struct {
uint32 vcs;
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
srvsvc_NetTransportAddress *addr;
uint32 addr_len;
- unistr *net_addr;
+ [string,charset(UTF16)] uint16 *net_addr;
} srvsvc_NetTransportInfo0;
typedef struct {
@@ -1088,11 +1088,11 @@
typedef struct {
uint32 vcs;
- unistr *name;
+ [string,charset(UTF16)] uint16 *name;
srvsvc_NetTransportAddress *addr;
uint32 addr_len;
- unistr *net_addr;
- unistr *domain;
+ [string,charset(UTF16)] uint16 *net_addr;
+ [string,charset(UTF16)] uint16 *domain;
} srvsvc_NetTransportInfo1;
typedef struct {
@@ -1142,7 +1142,7 @@
/******************/
/* Function: 0x1a */
WERROR srvsvc_NetTransportEnum(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in,out] uint32 level,
[in,out,switch_is(level)] srvsvc_NetTransportCtr ctr,
[in] uint32 max_buffer,
@@ -1176,7 +1176,7 @@
/******************/
/* Function: 0x1c */
WERROR srvsvc_NetRemoteTOD(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[out] srvsvc_NetRemoteTODInfo *info
);
@@ -1232,7 +1232,7 @@
/* Note, there must be some way to return entries read vs
total entries ... */
WERROR srvsvc_NetShareEnum(
- [in] unistr *server_unc,
+ [in] [string,charset(UTF16)] uint16 *server_unc,
[in,out] uint32 level,
[in,out,switch_is(level)] srvsvc_NetShareCtr ctr,
[in] uint32 max_buffer,
diff --git a/source4/librpc/idl/svcctl.idl b/source4/librpc/idl/svcctl.idl
index 3ffe41c109..27172f85df 100644
--- a/source4/librpc/idl/svcctl.idl
+++ b/source4/librpc/idl/svcctl.idl
@@ -14,7 +14,7 @@
{
typedef struct {
uint32 is_locked;
- unistr *lock_owner;
+ [string,charset(UTF16)] uint16 *lock_owner;
uint32 lock_duration;
} SERVICE_LOCK_STATUS;
@@ -153,29 +153,29 @@
[in] uint32 type,
[in] uint32 start,
[in] uint32 error,
- [in] unistr *binary_path,
- [in] unistr *load_order_group,
+ [in] [string,charset(UTF16)] uint16 *binary_path,
+ [in] [string,charset(UTF16)] uint16 *load_order_group,
[out] uint32 tag_id,
- [in] unistr *dependencies,
- [in] unistr *service_start_name,
- [in] unistr *password,
- [in] unistr *display_name);
+ [in] [string,charset(UTF16)] uint16 *dependencies,
+ [in] [string,charset(UTF16)] uint16 *service_start_name,
+ [in] [string,charset(UTF16)] uint16 *password,
+ [in] [string,charset(UTF16)] uint16 *display_name);
/*****************/
/* Function 0x0c */
WERROR svcctl_CreateServiceW([in,ref] policy_handle *handle,
- [in] unistr *ServiceName,
- [in] unistr *DisplayName,
+ [in] [string,charset(UTF16)] uint16 *ServiceName,
+ [in] [string,charset(UTF16)] uint16 *DisplayName,
[in] uint32 desired_access,
[in] uint32 type,
[in] uint32 start_type,
[in] uint32 error_control,
- [in] unistr *binary_path,
- [in] unistr *LoadOrderGroupKey,
+ [in] [string,charset(UTF16)] uint16 *binary_path,
+ [in] [string,charset(UTF16)] uint16 *LoadOrderGroupKey,
[out] uint32 *TagId,
- [in] unistr *dependencies,
- [in] unistr *service_start_name,
- [in] unistr *password);
+ [in] [string,charset(UTF16)] uint16 *dependencies,
+ [in] [string,charset(UTF16)] uint16 *service_start_name,
+ [in] [string,charset(UTF16)] uint16 *password);
/*****************/
/* Function 0x0d */
@@ -201,15 +201,15 @@
/*****************/
/* Function 0x0f */
WERROR svcctl_OpenSCManagerW(
- [in] unistr *MachineName,
- [in] unistr *DatabaseName,
+ [in] [string,charset(UTF16)] uint16 *MachineName,
+ [in] [string,charset(UTF16)] uint16 *DatabaseName,
[in] uint32 access_mask,
[out,ref] policy_handle *handle);
/*****************/
/* Function 0x10 */
WERROR svcctl_OpenServiceW([in,ref] policy_handle *scmanager_handle,
- [in] unistr *ServiceName,
+ [in] [string,charset(UTF16)] uint16 *ServiceName,
[in] uint32 access_mask);
/*****************/
@@ -234,19 +234,19 @@
WERROR svcctl_StartServiceW(
[in,ref] policy_handle *handle,
[in] uint32 NumArgs,
- [in,length_is(NumArgs)] unistr *Arguments);
+ [in,length_is(NumArgs)] [string,charset(UTF16)] uint16 *Arguments);
/*****************/
/* Function 0x14 */
WERROR svcctl_GetServiceDisplayNameW([in,ref] policy_handle *handle,
- [in] unistr *service_name,
- [out] unistr *display_name,
+ [in] [string,charset(UTF16)] uint16 *service_name,
+ [out] [string,charset(UTF16)] uint16 *display_name,
[in,out] uint32 *display_name_length);
/*****************/
/* Function 0x15 */
WERROR svcctl_GetServiceKeyNameW([in,ref] policy_handle *handle,
- [in] unistr *service_name,
- [out] unistr *key_name,
+ [in] [string,charset(UTF16)] uint16 *service_name,
+ [out] [string,charset(UTF16)] uint16 *key_name,
[in,out] uint32 *display_name_length);
/*****************/
/* Function 0x16 */
@@ -262,29 +262,29 @@
[in] uint32 type,
[in] uint32 start,
[in] uint32 error,
- [in] unistr *binary_path,
- [in] unistr *load_order_group,
+ [in] [string,charset(UTF16)] uint16 *binary_path,
+ [in] [string,charset(UTF16)] uint16 *load_order_group,
[out] uint32 tag_id,
- [in] unistr *dependencies,
- [in] unistr *service_start_name,
- [in] unistr *password,
- [in] unistr *display_name);
+ [in] [string,charset(UTF16)] uint16 *dependencies,
+ [in] [string,charset(UTF16)] uint16 *service_start_name,
+ [in] [string,charset(UTF16)] uint16 *password,
+ [in] [string,charset(UTF16)] uint16 *display_name);
/*****************/
/* Function 0x18 */
WERROR svcctl_CreateServiceA([in,ref] policy_handle *handle,
- [in] unistr *ServiceName,
- [in] unistr *DisplayName,
+ [in] [string,charset(UTF16)] uint16 *ServiceName,
+ [in] [string,charset(UTF16)] uint16 *DisplayName,
[in] uint32 desired_access,
[in] uint32 type,
[in] uint32 start_type,
[in] uint32 error_control,
- [in] unistr *binary_path,
- [in] unistr *LoadOrderGroupKey,
+ [in] [string,charset(UTF16)] uint16 *binary_path,
+ [in] [string,charset(UTF16)] uint16 *LoadOrderGroupKey,
[out] uint32 *TagId,
- [in] unistr *dependencies,
- [in] unistr *service_start_name,
- [in] unistr *password);
+ [in] [string,charset(UTF16)] uint16 *dependencies,
+ [in] [string,charset(UTF16)] uint16 *service_start_name,
+ [in] [string,charset(UTF16)] uint16 *password);
/*****************/
/* Function 0x19 */
@@ -311,15 +311,15 @@
/*****************/
/* Function 0x1b */
WERROR svcctl_OpenSCManagerA(
- [in] unistr *MachineName,
- [in] unistr *DatabaseName,
+ [in] [string,charset(UTF16)] uint16 *MachineName,
+ [in] [string,charset(UTF16)] uint16 *DatabaseName,
[in] uint32 access_mask,
[out,ref] policy_handle *handle);
/*****************/
/* Function 0x1c */
WERROR svcctl_OpenServiceA([in,ref] policy_handle *scmanager_handle,
- [in] unistr *ServiceName,
+ [in] [string,charset(UTF16)] uint16 *ServiceName,
[in] uint32 access_mask);
/*****************/
@@ -344,19 +344,19 @@
WERROR svcctl_StartServiceA(
[in,ref] policy_handle *handle,
[in] uint32 NumArgs,
- [in,length_is(NumArgs)] unistr *Arguments);
+ [in,length_is(NumArgs)] [string,charset(UTF16)] uint16 *Arguments);
/*****************/
/* Function 0x20 */
WERROR svcctl_GetServiceDisplayNameA([in,ref] policy_handle *handle,
- [in] unistr *service_name,
- [out] unistr *display_name,
+ [in] [string,charset(UTF16)] uint16 *service_name,
+ [out] [string,charset(UTF16)] uint16 *display_name,
[in,out] uint32 *display_name_length);
/*****************/
/* Function 0x21 */
WERROR svcctl_GetServiceKeyNameA([in,ref] policy_handle *handle,
- [in] unistr *service_name,
- [out] unistr *key_name,
+ [in] [string,charset(UTF16)] uint16 *service_name,
+ [out] [string,charset(UTF16)] uint16 *key_name,
[in,out] uint32 *display_name_length);
/*****************/
@@ -419,7 +419,7 @@
[out] uint32 bytes_needed,
[out] uint32 service_returned,
[in,out] uint32 *resume_handle,
- [out] unistr *group_name);
+ [out] [string,charset(UTF16)] uint16 *group_name);
/*****************/
/* Function 0x2a */
@@ -433,7 +433,7 @@
[out] uint32 bytes_needed,
[out] uint32 service_returned,
[in,out] uint32 *resume_handle,
- [out] unistr *group_name);
+ [out] [string,charset(UTF16)] uint16 *group_name);
/*****************/
/* Function 0x2b */
diff --git a/source4/librpc/idl/wkssvc.idl b/source4/librpc/idl/wkssvc.idl
index 76ccd0fe48..71fd74297e 100644
--- a/source4/librpc/idl/wkssvc.idl
+++ b/source4/librpc/idl/wkssvc.idl
@@ -21,28 +21,28 @@
typedef struct {
srvsvc_PlatformId platform_id;
- unistr *server_name;
- unistr *domain_name;
+ [string,charset(UTF16)] uint16 *server_name;
+ [string,charset(UTF16)] uint16 *domain_name;
uint32 version_major;
uint32 version_minor;
} wkssvc_NetWkstaInfo100;
typedef struct {
srvsvc_PlatformId platform_id;
- unistr *server_name;
- unistr *domain_name;
+ [string,charset(UTF16)] uint16 *server_name;
+ [string,charset(UTF16)] uint16 *domain_name;
uint32 version_major;
uint32 version_minor;
- unistr *lan_root;
+ [string,charset(UTF16)] uint16 *lan_root;
} wkssvc_NetWkstaInfo101;
typedef struct {
srvsvc_PlatformId platform_id;
- unistr *server_name;
- unistr *domain_name;
+ [string,charset(UTF16)] uint16 *server_name;
+ [string,charset(UTF16)] uint16 *domain_name;
uint32 version_major;
uint32 version_minor;
- unistr *lan_root;
+ [string,charset(UTF16)] uint16 *lan_root;
uint32 logged_on_users;
} wkssvc_NetWkstaInfo102;
@@ -93,7 +93,7 @@
} wkssvc_NetWkstaInfo;
WERROR wkssvc_NetWkstaGetInfo(
- [in] unistr *server_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
[in] uint32 level,
[out,switch_is(level)] wkssvc_NetWkstaInfo info
);
@@ -102,7 +102,7 @@
/******************/
/* Function: 0x01 */
WERROR wkssvc_NetWkstaSetInfo(
- [in] unistr *server_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
[in] uint32 level,
[in,switch_is(level)] wkssvc_NetWkstaInfo info,
[in,out] uint32 *parm_error
@@ -127,8 +127,8 @@
typedef struct {
uint32 quality_of_service;
uint32 vc_count;
- unistr *name;
- unistr *address;
+ [string,charset(UTF16)] uint16 *name;
+ [string,charset(UTF16)] uint16 *address;
uint32 wan_link;
} wkssvc_NetWkstaTransportInfo0;
@@ -143,7 +143,7 @@
} wkssvc_NetWkstaTransportCtr;
WERROR wkssvc_NetWkstaTransportEnum (
- [in] unistr *server_name,
+ [in] [string,charset(UTF16)] uint16 *server_name,
[in,out] uint32 level,
[in,out,switch_is(level)] wkssvc_NetWkstaTransportCtr ctr,
[in] uint32 max_buffer,