>From 19b2f65487539ecaf6c1d7494633c33e466354ef Mon Sep 17 00:00:00 2001
From: Matthieu Patou <mat () matws net>
Date: Sun, 6 Oct 2013 17:07:00 -0700
Subject: [PATCH 04/21] Update the idl for dssetup

Signed-off-by: Matthieu Patou <mat () matws net>
---
 epan/dissectors/pidl/dssetup.idl | 35 ++++++++++++++++-------------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/epan/dissectors/pidl/dssetup.idl b/epan/dissectors/pidl/dssetup.idl
index 1164427..14de9f7 100644
--- a/epan/dissectors/pidl/dssetup.idl
+++ b/epan/dissectors/pidl/dssetup.idl
@@ -1,17 +1,14 @@
-#include "idl_types.h"
-
-#define unistr	[string] wchar_t *
-
 /*
   dssetup interface definition
 */
 
+import "misc.idl";
+
 [
 	uuid("3919286a-b10c-11d0-9ba8-00c04fd92ef5"),
 	version(0.0),
 	endpoint("ncacn_np:[\\pipe\\lsarpc]", "ncacn_np:[\\pipe\\lsass]", "ncacn_ip_tcp:", "ncalrpc:"),
 	pointer_default(unique),
-	pointer_default_top(unique),
 	helpstring("Active Directory Setup")
 ] interface dssetup
 {
@@ -37,9 +34,9 @@
 	typedef struct {
 		dssetup_DsRole		role;
 		dssetup_DsRoleFlags	flags;
-		unistr			*domain;
-		unistr			*dns_domain;
-		unistr			*forest;
+		[charset(UTF16),string] uint16			*domain;
+		[charset(UTF16),string] uint16			*dns_domain;
+		[charset(UTF16),string] uint16			*forest;
 		GUID			domain_guid;
 	} dssetup_DsRolePrimaryDomInfoBasic;
 
@@ -83,7 +80,7 @@
 
 	WERROR dssetup_DsRoleGetPrimaryDomainInformation(
 		[in] dssetup_DsRoleInfoLevel level,
-		[out,switch_is(level)] dssetup_DsRoleInfo *info
+		[out,switch_is(level),unique] dssetup_DsRoleInfo *info
 		);
 
 	/*
@@ -91,14 +88,14 @@
 	  These stubs are left here only as a way of documenting the names
 	  of the calls in case they ever turn up on the wire.
 	*/
-	WERROR dssetup_DsRoleDnsNameToFlatName();
-	WERROR dssetup_DsRoleDcAsDc();
-	WERROR dssetup_DsRoleDcAsReplica();
-	WERROR dssetup_DsRoleDemoteDc();
-	WERROR dssetup_DsRoleGetDcOperationProgress();
-	WERROR dssetup_DsRoleGetDcOperationResults();
-	WERROR dssetup_DsRoleCancel();
-	WERROR dssetup_DsRoleServerSaveStateForUpgrade();
-	WERROR dssetup_DsRoleUpgradeDownlevelServer();
-	WERROR dssetup_DsRoleAbortDownlevelServerUpgrade();
+	[todo] WERROR dssetup_DsRoleDnsNameToFlatName();
+	[todo] WERROR dssetup_DsRoleDcAsDc();
+	[todo] WERROR dssetup_DsRoleDcAsReplica();
+	[todo] WERROR dssetup_DsRoleDemoteDc();
+	[todo] WERROR dssetup_DsRoleGetDcOperationProgress();
+	[todo] WERROR dssetup_DsRoleGetDcOperationResults();
+	[todo] WERROR dssetup_DsRoleCancel();
+	[todo] WERROR dssetup_DsRoleServerSaveStateForUpgrade();
+	[todo] WERROR dssetup_DsRoleUpgradeDownlevelServer();
+	[todo] WERROR dssetup_DsRoleAbortDownlevelServerUpgrade();
 }
-- 
1.8.1.2

