r7644: - remove some dublicate structures SetForm and AddForm uses the same struct

- fix some typos in EnumPrintServerForms()/GetPrintServerForms()
- add AddPrintServerForms()/SetPrintServerForms() and DeletePrintServerForms

metze
(This used to be commit 73906388421beebb34f2a00c9e0d1fc8b400a42a)

1 files changed, 14 insertions, 25 deletions

diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 33ae96caf5..87a909b22f 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -817,7 +817,19 @@
 
 	typedef struct {
 		spoolss_FormFlags flags;
-		[relative] unistr *form_name;
+		[relative] nstring *form_name;
+		spoolss_FormSize size;
+		spoolss_FormArea area;
+	} spoolss_FormInfo1;
+
+	typedef [nodiscriminant,relative_base,public,gensize] union {
+		[case(1)] spoolss_FormInfo1 info1;
+		[default];
+	} spoolss_FormInfo;
+
+	typedef struct {
+		spoolss_FormFlags flags;
+		unistr *form_name;
 		spoolss_FormSize size;
 		spoolss_FormArea area;
 	} spoolss_AddFormInfo1;
@@ -841,13 +853,6 @@
 
 	/******************/
 	/* Function: 0x20 */
-	typedef struct {
-		spoolss_FormFlags flags;
-		[relative] nstring *form_name;
-		spoolss_FormSize size;
-		spoolss_FormArea area;
-	} spoolss_FormInfo1;
-
 	WERROR spoolss_GetForm(
 		[in,ref] policy_handle *handle,
 		[in] unistr form_name,
@@ -858,31 +863,15 @@
 		[out] uint32 needed
 	);
 
-	typedef struct {
-		spoolss_FormFlags flags;
-		unistr *form_name;
-		spoolss_FormSize size;
-		spoolss_FormArea area;
-	} spoolss_SetFormInfo1;
-
-	typedef [switch_type(uint32)] union {
-		[case(1)] spoolss_SetFormInfo1 *info1;
-	} spoolss_SetFormInfo;
-
 	/******************/
 	/* Function: 0x21 */
 	WERROR spoolss_SetForm(
 		[in,ref] policy_handle *handle,
 		[in] unistr form_name,
 		[in] uint32 level,
-		[in,switch_is(level)] spoolss_SetFormInfo info
+		[in,switch_is(level)] spoolss_AddFormInfo info
 	);
 
-	typedef [nodiscriminant,relative_base,public,gensize] union {
-		[case(1)] spoolss_FormInfo1 info1;
-		[default];
-	} spoolss_FormInfo;
-
 	/******************/
 	/* Function: 0x22 */
 	[public,noopnum,noprint] WERROR _spoolss_EnumForms(