Re-run make idl.

Guenther
(This used to be commit 2a86e2f2d26886cfe87149dfc4f17049b21cb109)

6 files changed, 1201 insertions, 390 deletions

diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.c b/source3/librpc/gen_ndr/cli_ntsvcs.c
index 7795962c3f..da43d451e6 100644
--- a/source3/librpc/gen_ndr/cli_ntsvcs.c
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.c
@@ -7,7 +7,8 @@
 #include "librpc/gen_ndr/cli_ntsvcs.h"
 
 NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
-			       TALLOC_CTX *mem_ctx)
+			       TALLOC_CTX *mem_ctx,
+			       WERROR *werror)
 {
 	struct PNP_Disconnect r;
 	NTSTATUS status;
@@ -40,11 +41,16 @@ NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
-			    TALLOC_CTX *mem_ctx)
+			    TALLOC_CTX *mem_ctx,
+			    WERROR *werror)
 {
 	struct PNP_Connect r;
 	NTSTATUS status;
@@ -77,11 +83,17 @@ NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
-			       TALLOC_CTX *mem_ctx)
+			       TALLOC_CTX *mem_ctx,
+			       uint16_t *version,
+			       WERROR *werror)
 {
 	struct PNP_GetVersion r;
 	NTSTATUS status;
@@ -112,13 +124,19 @@ NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
 	}
 
 	/* Return variables */
+	*version = *r.out.version;
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx)
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror)
 {
 	struct PNP_GetGlobalState r;
 	NTSTATUS status;
@@ -151,11 +169,16 @@ NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_InitDetection(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx)
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror)
 {
 	struct PNP_InitDetection r;
 	NTSTATUS status;
@@ -188,11 +211,16 @@ NTSTATUS rpccli_PNP_InitDetection(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx)
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror)
 {
 	struct PNP_ReportLogOn r;
 	NTSTATUS status;
@@ -225,11 +253,16 @@ NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
-					   TALLOC_CTX *mem_ctx)
+					   TALLOC_CTX *mem_ctx,
+					   WERROR *werror)
 {
 	struct PNP_ValidateDeviceInstance r;
 	NTSTATUS status;
@@ -262,11 +295,16 @@ NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
-					  TALLOC_CTX *mem_ctx)
+					  TALLOC_CTX *mem_ctx,
+					  WERROR *werror)
 {
 	struct PNP_GetRootDeviceInstance r;
 	NTSTATUS status;
@@ -299,11 +337,16 @@ NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetRelatedDeviceInstance(struct rpc_pipe_client *cli,
-					     TALLOC_CTX *mem_ctx)
+					     TALLOC_CTX *mem_ctx,
+					     WERROR *werror)
 {
 	struct PNP_GetRelatedDeviceInstance r;
 	NTSTATUS status;
@@ -336,11 +379,16 @@ NTSTATUS rpccli_PNP_GetRelatedDeviceInstance(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_EnumerateSubKeys(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_EnumerateSubKeys r;
 	NTSTATUS status;
@@ -373,11 +421,16 @@ NTSTATUS rpccli_PNP_EnumerateSubKeys(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx)
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror)
 {
 	struct PNP_GetDeviceList r;
 	NTSTATUS status;
@@ -410,11 +463,16 @@ NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
-				      TALLOC_CTX *mem_ctx)
+				      TALLOC_CTX *mem_ctx,
+				      WERROR *werror)
 {
 	struct PNP_GetDeviceListSize r;
 	NTSTATUS status;
@@ -447,11 +505,16 @@ NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
-			     TALLOC_CTX *mem_ctx)
+			     TALLOC_CTX *mem_ctx,
+			     WERROR *werror)
 {
 	struct PNP_GetDepth r;
 	NTSTATUS status;
@@ -484,11 +547,16 @@ NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_GetDeviceRegProp r;
 	NTSTATUS status;
@@ -521,11 +589,16 @@ NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_SetDeviceRegProp r;
 	NTSTATUS status;
@@ -558,11 +631,16 @@ NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetClassInstance(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_GetClassInstance r;
 	NTSTATUS status;
@@ -595,11 +673,16 @@ NTSTATUS rpccli_PNP_GetClassInstance(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_CreateKey(struct rpc_pipe_client *cli,
-			      TALLOC_CTX *mem_ctx)
+			      TALLOC_CTX *mem_ctx,
+			      WERROR *werror)
 {
 	struct PNP_CreateKey r;
 	NTSTATUS status;
@@ -632,11 +715,16 @@ NTSTATUS rpccli_PNP_CreateKey(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_DeleteRegistryKey(struct rpc_pipe_client *cli,
-				      TALLOC_CTX *mem_ctx)
+				      TALLOC_CTX *mem_ctx,
+				      WERROR *werror)
 {
 	struct PNP_DeleteRegistryKey r;
 	NTSTATUS status;
@@ -669,11 +757,16 @@ NTSTATUS rpccli_PNP_DeleteRegistryKey(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetClassCount(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx)
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror)
 {
 	struct PNP_GetClassCount r;
 	NTSTATUS status;
@@ -706,11 +799,16 @@ NTSTATUS rpccli_PNP_GetClassCount(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetClassName(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx)
+				 TALLOC_CTX *mem_ctx,
+				 WERROR *werror)
 {
 	struct PNP_GetClassName r;
 	NTSTATUS status;
@@ -743,11 +841,16 @@ NTSTATUS rpccli_PNP_GetClassName(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_DeleteClassKey(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx)
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror)
 {
 	struct PNP_DeleteClassKey r;
 	NTSTATUS status;
@@ -780,11 +883,16 @@ NTSTATUS rpccli_PNP_DeleteClassKey(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetInterfaceDeviceAlias(struct rpc_pipe_client *cli,
-					    TALLOC_CTX *mem_ctx)
+					    TALLOC_CTX *mem_ctx,
+					    WERROR *werror)
 {
 	struct PNP_GetInterfaceDeviceAlias r;
 	NTSTATUS status;
@@ -817,11 +925,16 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceAlias(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetInterfaceDeviceList(struct rpc_pipe_client *cli,
-					   TALLOC_CTX *mem_ctx)
+					   TALLOC_CTX *mem_ctx,
+					   WERROR *werror)
 {
 	struct PNP_GetInterfaceDeviceList r;
 	NTSTATUS status;
@@ -854,11 +967,16 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceList(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetInterfaceDeviceListSize(struct rpc_pipe_client *cli,
-					       TALLOC_CTX *mem_ctx)
+					       TALLOC_CTX *mem_ctx,
+					       WERROR *werror)
 {
 	struct PNP_GetInterfaceDeviceListSize r;
 	NTSTATUS status;
@@ -891,11 +1009,16 @@ NTSTATUS rpccli_PNP_GetInterfaceDeviceListSize(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_RegisterDeviceClassAssociation(struct rpc_pipe_client *cli,
-						   TALLOC_CTX *mem_ctx)
+						   TALLOC_CTX *mem_ctx,
+						   WERROR *werror)
 {
 	struct PNP_RegisterDeviceClassAssociation r;
 	NTSTATUS status;
@@ -928,11 +1051,16 @@ NTSTATUS rpccli_PNP_RegisterDeviceClassAssociation(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_UnregisterDeviceClassAssociation(struct rpc_pipe_client *cli,
-						     TALLOC_CTX *mem_ctx)
+						     TALLOC_CTX *mem_ctx,
+						     WERROR *werror)
 {
 	struct PNP_UnregisterDeviceClassAssociation r;
 	NTSTATUS status;
@@ -965,11 +1093,16 @@ NTSTATUS rpccli_PNP_UnregisterDeviceClassAssociation(struct rpc_pipe_client *cli
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetClassRegProp(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx)
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror)
 {
 	struct PNP_GetClassRegProp r;
 	NTSTATUS status;
@@ -1002,11 +1135,16 @@ NTSTATUS rpccli_PNP_GetClassRegProp(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_SetClassRegProp(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx)
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror)
 {
 	struct PNP_SetClassRegProp r;
 	NTSTATUS status;
@@ -1039,11 +1177,16 @@ NTSTATUS rpccli_PNP_SetClassRegProp(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_CreateDevInst(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx)
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror)
 {
 	struct PNP_CreateDevInst r;
 	NTSTATUS status;
@@ -1076,11 +1219,16 @@ NTSTATUS rpccli_PNP_CreateDevInst(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_DeviceInstanceAction(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx)
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror)
 {
 	struct PNP_DeviceInstanceAction r;
 	NTSTATUS status;
@@ -1113,11 +1261,16 @@ NTSTATUS rpccli_PNP_DeviceInstanceAction(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetDeviceStatus(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx)
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror)
 {
 	struct PNP_GetDeviceStatus r;
 	NTSTATUS status;
@@ -1150,11 +1303,16 @@ NTSTATUS rpccli_PNP_GetDeviceStatus(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_SetDeviceProblem(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_SetDeviceProblem r;
 	NTSTATUS status;
@@ -1187,11 +1345,16 @@ NTSTATUS rpccli_PNP_SetDeviceProblem(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_DisableDevInst(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx)
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror)
 {
 	struct PNP_DisableDevInst r;
 	NTSTATUS status;
@@ -1224,11 +1387,16 @@ NTSTATUS rpccli_PNP_DisableDevInst(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_UninstallDevInst(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_UninstallDevInst r;
 	NTSTATUS status;
@@ -1261,11 +1429,16 @@ NTSTATUS rpccli_PNP_UninstallDevInst(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_AddID(struct rpc_pipe_client *cli,
-			  TALLOC_CTX *mem_ctx)
+			  TALLOC_CTX *mem_ctx,
+			  WERROR *werror)
 {
 	struct PNP_AddID r;
 	NTSTATUS status;
@@ -1298,11 +1471,16 @@ NTSTATUS rpccli_PNP_AddID(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_RegisterDriver(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx)
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror)
 {
 	struct PNP_RegisterDriver r;
 	NTSTATUS status;
@@ -1335,11 +1513,16 @@ NTSTATUS rpccli_PNP_RegisterDriver(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_QueryRemove(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx)
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror)
 {
 	struct PNP_QueryRemove r;
 	NTSTATUS status;
@@ -1372,11 +1555,16 @@ NTSTATUS rpccli_PNP_QueryRemove(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_RequestDeviceEject(struct rpc_pipe_client *cli,
-				       TALLOC_CTX *mem_ctx)
+				       TALLOC_CTX *mem_ctx,
+				       WERROR *werror)
 {
 	struct PNP_RequestDeviceEject r;
 	NTSTATUS status;
@@ -1409,11 +1597,16 @@ NTSTATUS rpccli_PNP_RequestDeviceEject(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_IsDockStationPresent(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx)
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror)
 {
 	struct PNP_IsDockStationPresent r;
 	NTSTATUS status;
@@ -1446,11 +1639,16 @@ NTSTATUS rpccli_PNP_IsDockStationPresent(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx)
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror)
 {
 	struct PNP_RequestEjectPC r;
 	NTSTATUS status;
@@ -1483,11 +1681,16 @@ NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx)
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror)
 {
 	struct PNP_HwProfFlags r;
 	NTSTATUS status;
@@ -1520,11 +1723,16 @@ NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx)
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror)
 {
 	struct PNP_GetHwProfInfo r;
 	NTSTATUS status;
@@ -1557,11 +1765,16 @@ NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx)
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror)
 {
 	struct PNP_AddEmptyLogConf r;
 	NTSTATUS status;
@@ -1594,11 +1807,16 @@ NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_FreeLogConf(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx)
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror)
 {
 	struct PNP_FreeLogConf r;
 	NTSTATUS status;
@@ -1631,11 +1849,16 @@ NTSTATUS rpccli_PNP_FreeLogConf(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetFirstLogConf(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx)
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror)
 {
 	struct PNP_GetFirstLogConf r;
 	NTSTATUS status;
@@ -1668,11 +1891,16 @@ NTSTATUS rpccli_PNP_GetFirstLogConf(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetNextLogConf(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx)
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror)
 {
 	struct PNP_GetNextLogConf r;
 	NTSTATUS status;
@@ -1705,11 +1933,16 @@ NTSTATUS rpccli_PNP_GetNextLogConf(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetLogConfPriority(struct rpc_pipe_client *cli,
-				       TALLOC_CTX *mem_ctx)
+				       TALLOC_CTX *mem_ctx,
+				       WERROR *werror)
 {
 	struct PNP_GetLogConfPriority r;
 	NTSTATUS status;
@@ -1742,11 +1975,16 @@ NTSTATUS rpccli_PNP_GetLogConfPriority(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_AddResDes(struct rpc_pipe_client *cli,
-			      TALLOC_CTX *mem_ctx)
+			      TALLOC_CTX *mem_ctx,
+			      WERROR *werror)
 {
 	struct PNP_AddResDes r;
 	NTSTATUS status;
@@ -1779,11 +2017,16 @@ NTSTATUS rpccli_PNP_AddResDes(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_FreeResDes(struct rpc_pipe_client *cli,
-			       TALLOC_CTX *mem_ctx)
+			       TALLOC_CTX *mem_ctx,
+			       WERROR *werror)
 {
 	struct PNP_FreeResDes r;
 	NTSTATUS status;
@@ -1816,11 +2059,16 @@ NTSTATUS rpccli_PNP_FreeResDes(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetNextResDes(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx)
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror)
 {
 	struct PNP_GetNextResDes r;
 	NTSTATUS status;
@@ -1853,11 +2101,16 @@ NTSTATUS rpccli_PNP_GetNextResDes(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetResDesData(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx)
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror)
 {
 	struct PNP_GetResDesData r;
 	NTSTATUS status;
@@ -1890,11 +2143,16 @@ NTSTATUS rpccli_PNP_GetResDesData(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetResDesDataSize(struct rpc_pipe_client *cli,
-				      TALLOC_CTX *mem_ctx)
+				      TALLOC_CTX *mem_ctx,
+				      WERROR *werror)
 {
 	struct PNP_GetResDesDataSize r;
 	NTSTATUS status;
@@ -1927,11 +2185,16 @@ NTSTATUS rpccli_PNP_GetResDesDataSize(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_ModifyResDes(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx)
+				 TALLOC_CTX *mem_ctx,
+				 WERROR *werror)
 {
 	struct PNP_ModifyResDes r;
 	NTSTATUS status;
@@ -1964,11 +2227,16 @@ NTSTATUS rpccli_PNP_ModifyResDes(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_DetectResourceLimit(struct rpc_pipe_client *cli,
-					TALLOC_CTX *mem_ctx)
+					TALLOC_CTX *mem_ctx,
+					WERROR *werror)
 {
 	struct PNP_DetectResourceLimit r;
 	NTSTATUS status;
@@ -2001,11 +2269,16 @@ NTSTATUS rpccli_PNP_DetectResourceLimit(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_QueryResConfList(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_QueryResConfList r;
 	NTSTATUS status;
@@ -2038,11 +2311,16 @@ NTSTATUS rpccli_PNP_QueryResConfList(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_SetHwProf(struct rpc_pipe_client *cli,
-			      TALLOC_CTX *mem_ctx)
+			      TALLOC_CTX *mem_ctx,
+			      WERROR *werror)
 {
 	struct PNP_SetHwProf r;
 	NTSTATUS status;
@@ -2075,11 +2353,16 @@ NTSTATUS rpccli_PNP_SetHwProf(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_QueryArbitratorFreeData(struct rpc_pipe_client *cli,
-					    TALLOC_CTX *mem_ctx)
+					    TALLOC_CTX *mem_ctx,
+					    WERROR *werror)
 {
 	struct PNP_QueryArbitratorFreeData r;
 	NTSTATUS status;
@@ -2112,11 +2395,16 @@ NTSTATUS rpccli_PNP_QueryArbitratorFreeData(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_QueryArbitratorFreeSize(struct rpc_pipe_client *cli,
-					    TALLOC_CTX *mem_ctx)
+					    TALLOC_CTX *mem_ctx,
+					    WERROR *werror)
 {
 	struct PNP_QueryArbitratorFreeSize r;
 	NTSTATUS status;
@@ -2149,11 +2437,16 @@ NTSTATUS rpccli_PNP_QueryArbitratorFreeSize(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_RunDetection(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx)
+				 TALLOC_CTX *mem_ctx,
+				 WERROR *werror)
 {
 	struct PNP_RunDetection r;
 	NTSTATUS status;
@@ -2186,11 +2479,16 @@ NTSTATUS rpccli_PNP_RunDetection(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_RegisterNotification(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx)
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror)
 {
 	struct PNP_RegisterNotification r;
 	NTSTATUS status;
@@ -2223,11 +2521,16 @@ NTSTATUS rpccli_PNP_RegisterNotification(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_UnregisterNotification(struct rpc_pipe_client *cli,
-					   TALLOC_CTX *mem_ctx)
+					   TALLOC_CTX *mem_ctx,
+					   WERROR *werror)
 {
 	struct PNP_UnregisterNotification r;
 	NTSTATUS status;
@@ -2260,11 +2563,16 @@ NTSTATUS rpccli_PNP_UnregisterNotification(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetCustomDevProp(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx)
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror)
 {
 	struct PNP_GetCustomDevProp r;
 	NTSTATUS status;
@@ -2297,11 +2605,16 @@ NTSTATUS rpccli_PNP_GetCustomDevProp(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetVersionInternal(struct rpc_pipe_client *cli,
-				       TALLOC_CTX *mem_ctx)
+				       TALLOC_CTX *mem_ctx,
+				       WERROR *werror)
 {
 	struct PNP_GetVersionInternal r;
 	NTSTATUS status;
@@ -2334,11 +2647,16 @@ NTSTATUS rpccli_PNP_GetVersionInternal(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetBlockedDriverInfo(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx)
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror)
 {
 	struct PNP_GetBlockedDriverInfo r;
 	NTSTATUS status;
@@ -2371,11 +2689,16 @@ NTSTATUS rpccli_PNP_GetBlockedDriverInfo(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
 NTSTATUS rpccli_PNP_GetServerSideDeviceInstallFlags(struct rpc_pipe_client *cli,
-						    TALLOC_CTX *mem_ctx)
+						    TALLOC_CTX *mem_ctx,
+						    WERROR *werror)
 {
 	struct PNP_GetServerSideDeviceInstallFlags r;
 	NTSTATUS status;
@@ -2408,6 +2731,10 @@ NTSTATUS rpccli_PNP_GetServerSideDeviceInstallFlags(struct rpc_pipe_client *cli,
 	/* Return variables */
 
 	/* Return result */
-	return NT_STATUS_OK;
+	if (werror) {
+		*werror = r.out.result;
+	}
+
+	return werror_to_ntstatus(r.out.result);
 }
 
diff --git a/source3/librpc/gen_ndr/cli_ntsvcs.h b/source3/librpc/gen_ndr/cli_ntsvcs.h
index ab2aead1ea..852cc812e9 100644
--- a/source3/librpc/gen_ndr/cli_ntsvcs.h
+++ b/source3/librpc/gen_ndr/cli_ntsvcs.h
@@ -2,133 +2,199 @@
 #ifndef __CLI_NTSVCS__
 #define __CLI_NTSVCS__
 NTSTATUS rpccli_PNP_Disconnect(struct rpc_pipe_client *cli,
-			       TALLOC_CTX *mem_ctx);
+			       TALLOC_CTX *mem_ctx,
+			       WERROR *werror);
 NTSTATUS rpccli_PNP_Connect(struct rpc_pipe_client *cli,
-			    TALLOC_CTX *mem_ctx);
+			    TALLOC_CTX *mem_ctx,
+			    WERROR *werror);
 NTSTATUS rpccli_PNP_GetVersion(struct rpc_pipe_client *cli,
-			       TALLOC_CTX *mem_ctx);
+			       TALLOC_CTX *mem_ctx,
+			       uint16_t *version,
+			       WERROR *werror);
 NTSTATUS rpccli_PNP_GetGlobalState(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx);
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror);
 NTSTATUS rpccli_PNP_InitDetection(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx);
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror);
 NTSTATUS rpccli_PNP_ReportLogOn(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx);
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror);
 NTSTATUS rpccli_PNP_ValidateDeviceInstance(struct rpc_pipe_client *cli,
-					   TALLOC_CTX *mem_ctx);
+					   TALLOC_CTX *mem_ctx,
+					   WERROR *werror);
 NTSTATUS rpccli_PNP_GetRootDeviceInstance(struct rpc_pipe_client *cli,
-					  TALLOC_CTX *mem_ctx);
+					  TALLOC_CTX *mem_ctx,
+					  WERROR *werror);
 NTSTATUS rpccli_PNP_GetRelatedDeviceInstance(struct rpc_pipe_client *cli,
-					     TALLOC_CTX *mem_ctx);
+					     TALLOC_CTX *mem_ctx,
+					     WERROR *werror);
 NTSTATUS rpccli_PNP_EnumerateSubKeys(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_GetDeviceList(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx);
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror);
 NTSTATUS rpccli_PNP_GetDeviceListSize(struct rpc_pipe_client *cli,
-				      TALLOC_CTX *mem_ctx);
+				      TALLOC_CTX *mem_ctx,
+				      WERROR *werror);
 NTSTATUS rpccli_PNP_GetDepth(struct rpc_pipe_client *cli,
-			     TALLOC_CTX *mem_ctx);
+			     TALLOC_CTX *mem_ctx,
+			     WERROR *werror);
 NTSTATUS rpccli_PNP_GetDeviceRegProp(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_SetDeviceRegProp(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_GetClassInstance(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_CreateKey(struct rpc_pipe_client *cli,
-			      TALLOC_CTX *mem_ctx);
+			      TALLOC_CTX *mem_ctx,
+			      WERROR *werror);
 NTSTATUS rpccli_PNP_DeleteRegistryKey(struct rpc_pipe_client *cli,
-				      TALLOC_CTX *mem_ctx);
+				      TALLOC_CTX *mem_ctx,
+				      WERROR *werror);
 NTSTATUS rpccli_PNP_GetClassCount(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx);
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror);
 NTSTATUS rpccli_PNP_GetClassName(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx);
+				 TALLOC_CTX *mem_ctx,
+				 WERROR *werror);
 NTSTATUS rpccli_PNP_DeleteClassKey(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx);
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror);
 NTSTATUS rpccli_PNP_GetInterfaceDeviceAlias(struct rpc_pipe_client *cli,
-					    TALLOC_CTX *mem_ctx);
+					    TALLOC_CTX *mem_ctx,
+					    WERROR *werror);
 NTSTATUS rpccli_PNP_GetInterfaceDeviceList(struct rpc_pipe_client *cli,
-					   TALLOC_CTX *mem_ctx);
+					   TALLOC_CTX *mem_ctx,
+					   WERROR *werror);
 NTSTATUS rpccli_PNP_GetInterfaceDeviceListSize(struct rpc_pipe_client *cli,
-					       TALLOC_CTX *mem_ctx);
+					       TALLOC_CTX *mem_ctx,
+					       WERROR *werror);
 NTSTATUS rpccli_PNP_RegisterDeviceClassAssociation(struct rpc_pipe_client *cli,
-						   TALLOC_CTX *mem_ctx);
+						   TALLOC_CTX *mem_ctx,
+						   WERROR *werror);
 NTSTATUS rpccli_PNP_UnregisterDeviceClassAssociation(struct rpc_pipe_client *cli,
-						     TALLOC_CTX *mem_ctx);
+						     TALLOC_CTX *mem_ctx,
+						     WERROR *werror);
 NTSTATUS rpccli_PNP_GetClassRegProp(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx);
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror);
 NTSTATUS rpccli_PNP_SetClassRegProp(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx);
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror);
 NTSTATUS rpccli_PNP_CreateDevInst(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx);
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror);
 NTSTATUS rpccli_PNP_DeviceInstanceAction(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx);
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror);
 NTSTATUS rpccli_PNP_GetDeviceStatus(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx);
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror);
 NTSTATUS rpccli_PNP_SetDeviceProblem(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_DisableDevInst(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx);
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror);
 NTSTATUS rpccli_PNP_UninstallDevInst(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_AddID(struct rpc_pipe_client *cli,
-			  TALLOC_CTX *mem_ctx);
+			  TALLOC_CTX *mem_ctx,
+			  WERROR *werror);
 NTSTATUS rpccli_PNP_RegisterDriver(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx);
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror);
 NTSTATUS rpccli_PNP_QueryRemove(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx);
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror);
 NTSTATUS rpccli_PNP_RequestDeviceEject(struct rpc_pipe_client *cli,
-				       TALLOC_CTX *mem_ctx);
+				       TALLOC_CTX *mem_ctx,
+				       WERROR *werror);
 NTSTATUS rpccli_PNP_IsDockStationPresent(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx);
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror);
 NTSTATUS rpccli_PNP_RequestEjectPC(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx);
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror);
 NTSTATUS rpccli_PNP_HwProfFlags(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx);
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror);
 NTSTATUS rpccli_PNP_GetHwProfInfo(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx);
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror);
 NTSTATUS rpccli_PNP_AddEmptyLogConf(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx);
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror);
 NTSTATUS rpccli_PNP_FreeLogConf(struct rpc_pipe_client *cli,
-				TALLOC_CTX *mem_ctx);
+				TALLOC_CTX *mem_ctx,
+				WERROR *werror);
 NTSTATUS rpccli_PNP_GetFirstLogConf(struct rpc_pipe_client *cli,
-				    TALLOC_CTX *mem_ctx);
+				    TALLOC_CTX *mem_ctx,
+				    WERROR *werror);
 NTSTATUS rpccli_PNP_GetNextLogConf(struct rpc_pipe_client *cli,
-				   TALLOC_CTX *mem_ctx);
+				   TALLOC_CTX *mem_ctx,
+				   WERROR *werror);
 NTSTATUS rpccli_PNP_GetLogConfPriority(struct rpc_pipe_client *cli,
-				       TALLOC_CTX *mem_ctx);
+				       TALLOC_CTX *mem_ctx,
+				       WERROR *werror);
 NTSTATUS rpccli_PNP_AddResDes(struct rpc_pipe_client *cli,
-			      TALLOC_CTX *mem_ctx);
+			      TALLOC_CTX *mem_ctx,
+			      WERROR *werror);
 NTSTATUS rpccli_PNP_FreeResDes(struct rpc_pipe_client *cli,
-			       TALLOC_CTX *mem_ctx);
+			       TALLOC_CTX *mem_ctx,
+			       WERROR *werror);
 NTSTATUS rpccli_PNP_GetNextResDes(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx);
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror);
 NTSTATUS rpccli_PNP_GetResDesData(struct rpc_pipe_client *cli,
-				  TALLOC_CTX *mem_ctx);
+				  TALLOC_CTX *mem_ctx,
+				  WERROR *werror);
 NTSTATUS rpccli_PNP_GetResDesDataSize(struct rpc_pipe_client *cli,
-				      TALLOC_CTX *mem_ctx);
+				      TALLOC_CTX *mem_ctx,
+				      WERROR *werror);
 NTSTATUS rpccli_PNP_ModifyResDes(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx);
+				 TALLOC_CTX *mem_ctx,
+				 WERROR *werror);
 NTSTATUS rpccli_PNP_DetectResourceLimit(struct rpc_pipe_client *cli,
-					TALLOC_CTX *mem_ctx);
+					TALLOC_CTX *mem_ctx,
+					WERROR *werror);
 NTSTATUS rpccli_PNP_QueryResConfList(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_SetHwProf(struct rpc_pipe_client *cli,
-			      TALLOC_CTX *mem_ctx);
+			      TALLOC_CTX *mem_ctx,
+			      WERROR *werror);
 NTSTATUS rpccli_PNP_QueryArbitratorFreeData(struct rpc_pipe_client *cli,
-					    TALLOC_CTX *mem_ctx);
+					    TALLOC_CTX *mem_ctx,
+					    WERROR *werror);
 NTSTATUS rpccli_PNP_QueryArbitratorFreeSize(struct rpc_pipe_client *cli,
-					    TALLOC_CTX *mem_ctx);
+					    TALLOC_CTX *mem_ctx,
+					    WERROR *werror);
 NTSTATUS rpccli_PNP_RunDetection(struct rpc_pipe_client *cli,
-				 TALLOC_CTX *mem_ctx);
+				 TALLOC_CTX *mem_ctx,
+				 WERROR *werror);
 NTSTATUS rpccli_PNP_RegisterNotification(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx);
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror);
 NTSTATUS rpccli_PNP_UnregisterNotification(struct rpc_pipe_client *cli,
-					   TALLOC_CTX *mem_ctx);
+					   TALLOC_CTX *mem_ctx,
+					   WERROR *werror);
 NTSTATUS rpccli_PNP_GetCustomDevProp(struct rpc_pipe_client *cli,
-				     TALLOC_CTX *mem_ctx);
+				     TALLOC_CTX *mem_ctx,
+				     WERROR *werror);
 NTSTATUS rpccli_PNP_GetVersionInternal(struct rpc_pipe_client *cli,
-				       TALLOC_CTX *mem_ctx);
+				       TALLOC_CTX *mem_ctx,
+				       WERROR *werror);
 NTSTATUS rpccli_PNP_GetBlockedDriverInfo(struct rpc_pipe_client *cli,
-					 TALLOC_CTX *mem_ctx);
+					 TALLOC_CTX *mem_ctx,
+					 WERROR *werror);
 NTSTATUS rpccli_PNP_GetServerSideDeviceInstallFlags(struct rpc_pipe_client *cli,
-						    TALLOC_CTX *mem_ctx);
+						    TALLOC_CTX *mem_ctx,
+						    WERROR *werror);
 #endif /* __CLI_NTSVCS__ */
diff --git a/source3/librpc/gen_ndr/ndr_ntsvcs.c b/source3/librpc/gen_ndr/ndr_ntsvcs.c
index 8e6176c56c..73dd4d346c 100644
--- a/source3/librpc/gen_ndr/ndr_ntsvcs.c
+++ b/source3/librpc/gen_ndr/ndr_ntsvcs.c
@@ -8,6 +8,7 @@ static enum ndr_err_code ndr_push_PNP_Disconnect(struct ndr_push *ndr, int flags
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -17,6 +18,7 @@ static enum ndr_err_code ndr_pull_PNP_Disconnect(struct ndr_pull *ndr, int flags
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -36,6 +38,7 @@ _PUBLIC_ void ndr_print_PNP_Disconnect(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_Disconnect");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -46,6 +49,7 @@ static enum ndr_err_code ndr_push_PNP_Connect(struct ndr_push *ndr, int flags, c
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -55,6 +59,7 @@ static enum ndr_err_code ndr_pull_PNP_Connect(struct ndr_pull *ndr, int flags, s
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -74,6 +79,7 @@ _PUBLIC_ void ndr_print_PNP_Connect(struct ndr_print *ndr, const char *name, int
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_Connect");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -84,15 +90,33 @@ static enum ndr_err_code ndr_push_PNP_GetVersion(struct ndr_push *ndr, int flags
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		if (r->out.version == NULL) {
+			return ndr_push_error(ndr, NDR_ERR_INVALID_POINTER, "NULL [ref] pointer");
+		}
+		NDR_CHECK(ndr_push_uint16(ndr, NDR_SCALARS, *r->out.version));
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
 
 static enum ndr_err_code ndr_pull_PNP_GetVersion(struct ndr_pull *ndr, int flags, struct PNP_GetVersion *r)
 {
+	TALLOC_CTX *_mem_save_version_0;
 	if (flags & NDR_IN) {
+		ZERO_STRUCT(r->out);
+
+		NDR_PULL_ALLOC(ndr, r->out.version);
+		ZERO_STRUCTP(r->out.version);
 	}
 	if (flags & NDR_OUT) {
+		if (ndr->flags & LIBNDR_FLAG_REF_ALLOC) {
+			NDR_PULL_ALLOC(ndr, r->out.version);
+		}
+		_mem_save_version_0 = NDR_PULL_GET_MEM_CTX(ndr);
+		NDR_PULL_SET_MEM_CTX(ndr, r->out.version, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_uint16(ndr, NDR_SCALARS, r->out.version));
+		NDR_PULL_SET_MEM_CTX(ndr, _mem_save_version_0, LIBNDR_FLAG_REF_ALLOC);
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -112,6 +136,11 @@ _PUBLIC_ void ndr_print_PNP_GetVersion(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetVersion");
 		ndr->depth++;
+		ndr_print_ptr(ndr, "version", r->out.version);
+		ndr->depth++;
+		ndr_print_uint16(ndr, "version", *r->out.version);
+		ndr->depth--;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -122,6 +151,7 @@ static enum ndr_err_code ndr_push_PNP_GetGlobalState(struct ndr_push *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -131,6 +161,7 @@ static enum ndr_err_code ndr_pull_PNP_GetGlobalState(struct ndr_pull *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -150,6 +181,7 @@ _PUBLIC_ void ndr_print_PNP_GetGlobalState(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetGlobalState");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -160,6 +192,7 @@ static enum ndr_err_code ndr_push_PNP_InitDetection(struct ndr_push *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -169,6 +202,7 @@ static enum ndr_err_code ndr_pull_PNP_InitDetection(struct ndr_pull *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -188,6 +222,7 @@ _PUBLIC_ void ndr_print_PNP_InitDetection(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_InitDetection");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -198,6 +233,7 @@ static enum ndr_err_code ndr_push_PNP_ReportLogOn(struct ndr_push *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -207,6 +243,7 @@ static enum ndr_err_code ndr_pull_PNP_ReportLogOn(struct ndr_pull *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -226,6 +263,7 @@ _PUBLIC_ void ndr_print_PNP_ReportLogOn(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_ReportLogOn");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -236,6 +274,7 @@ static enum ndr_err_code ndr_push_PNP_ValidateDeviceInstance(struct ndr_push *nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -245,6 +284,7 @@ static enum ndr_err_code ndr_pull_PNP_ValidateDeviceInstance(struct ndr_pull *nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -264,6 +304,7 @@ _PUBLIC_ void ndr_print_PNP_ValidateDeviceInstance(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_ValidateDeviceInstance");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -274,6 +315,7 @@ static enum ndr_err_code ndr_push_PNP_GetRootDeviceInstance(struct ndr_push *ndr
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -283,6 +325,7 @@ static enum ndr_err_code ndr_pull_PNP_GetRootDeviceInstance(struct ndr_pull *ndr
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -302,6 +345,7 @@ _PUBLIC_ void ndr_print_PNP_GetRootDeviceInstance(struct ndr_print *ndr, const c
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetRootDeviceInstance");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -312,6 +356,7 @@ static enum ndr_err_code ndr_push_PNP_GetRelatedDeviceInstance(struct ndr_push *
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -321,6 +366,7 @@ static enum ndr_err_code ndr_pull_PNP_GetRelatedDeviceInstance(struct ndr_pull *
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -340,6 +386,7 @@ _PUBLIC_ void ndr_print_PNP_GetRelatedDeviceInstance(struct ndr_print *ndr, cons
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetRelatedDeviceInstance");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -350,6 +397,7 @@ static enum ndr_err_code ndr_push_PNP_EnumerateSubKeys(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -359,6 +407,7 @@ static enum ndr_err_code ndr_pull_PNP_EnumerateSubKeys(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -378,6 +427,7 @@ _PUBLIC_ void ndr_print_PNP_EnumerateSubKeys(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_EnumerateSubKeys");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -388,6 +438,7 @@ static enum ndr_err_code ndr_push_PNP_GetDeviceList(struct ndr_push *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -397,6 +448,7 @@ static enum ndr_err_code ndr_pull_PNP_GetDeviceList(struct ndr_pull *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -416,6 +468,7 @@ _PUBLIC_ void ndr_print_PNP_GetDeviceList(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetDeviceList");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -426,6 +479,7 @@ static enum ndr_err_code ndr_push_PNP_GetDeviceListSize(struct ndr_push *ndr, in
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -435,6 +489,7 @@ static enum ndr_err_code ndr_pull_PNP_GetDeviceListSize(struct ndr_pull *ndr, in
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -454,6 +509,7 @@ _PUBLIC_ void ndr_print_PNP_GetDeviceListSize(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetDeviceListSize");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -464,6 +520,7 @@ static enum ndr_err_code ndr_push_PNP_GetDepth(struct ndr_push *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -473,6 +530,7 @@ static enum ndr_err_code ndr_pull_PNP_GetDepth(struct ndr_pull *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -492,6 +550,7 @@ _PUBLIC_ void ndr_print_PNP_GetDepth(struct ndr_print *ndr, const char *name, in
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetDepth");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -502,6 +561,7 @@ static enum ndr_err_code ndr_push_PNP_GetDeviceRegProp(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -511,6 +571,7 @@ static enum ndr_err_code ndr_pull_PNP_GetDeviceRegProp(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -530,6 +591,7 @@ _PUBLIC_ void ndr_print_PNP_GetDeviceRegProp(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetDeviceRegProp");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -540,6 +602,7 @@ static enum ndr_err_code ndr_push_PNP_SetDeviceRegProp(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -549,6 +612,7 @@ static enum ndr_err_code ndr_pull_PNP_SetDeviceRegProp(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -568,6 +632,7 @@ _PUBLIC_ void ndr_print_PNP_SetDeviceRegProp(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_SetDeviceRegProp");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -578,6 +643,7 @@ static enum ndr_err_code ndr_push_PNP_GetClassInstance(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -587,6 +653,7 @@ static enum ndr_err_code ndr_pull_PNP_GetClassInstance(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -606,6 +673,7 @@ _PUBLIC_ void ndr_print_PNP_GetClassInstance(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetClassInstance");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -616,6 +684,7 @@ static enum ndr_err_code ndr_push_PNP_CreateKey(struct ndr_push *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -625,6 +694,7 @@ static enum ndr_err_code ndr_pull_PNP_CreateKey(struct ndr_pull *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -644,6 +714,7 @@ _PUBLIC_ void ndr_print_PNP_CreateKey(struct ndr_print *ndr, const char *name, i
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_CreateKey");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -654,6 +725,7 @@ static enum ndr_err_code ndr_push_PNP_DeleteRegistryKey(struct ndr_push *ndr, in
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -663,6 +735,7 @@ static enum ndr_err_code ndr_pull_PNP_DeleteRegistryKey(struct ndr_pull *ndr, in
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -682,6 +755,7 @@ _PUBLIC_ void ndr_print_PNP_DeleteRegistryKey(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_DeleteRegistryKey");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -692,6 +766,7 @@ static enum ndr_err_code ndr_push_PNP_GetClassCount(struct ndr_push *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -701,6 +776,7 @@ static enum ndr_err_code ndr_pull_PNP_GetClassCount(struct ndr_pull *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -720,6 +796,7 @@ _PUBLIC_ void ndr_print_PNP_GetClassCount(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetClassCount");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -730,6 +807,7 @@ static enum ndr_err_code ndr_push_PNP_GetClassName(struct ndr_push *ndr, int fla
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -739,6 +817,7 @@ static enum ndr_err_code ndr_pull_PNP_GetClassName(struct ndr_pull *ndr, int fla
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -758,6 +837,7 @@ _PUBLIC_ void ndr_print_PNP_GetClassName(struct ndr_print *ndr, const char *name
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetClassName");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -768,6 +848,7 @@ static enum ndr_err_code ndr_push_PNP_DeleteClassKey(struct ndr_push *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -777,6 +858,7 @@ static enum ndr_err_code ndr_pull_PNP_DeleteClassKey(struct ndr_pull *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -796,6 +878,7 @@ _PUBLIC_ void ndr_print_PNP_DeleteClassKey(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_DeleteClassKey");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -806,6 +889,7 @@ static enum ndr_err_code ndr_push_PNP_GetInterfaceDeviceAlias(struct ndr_push *n
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -815,6 +899,7 @@ static enum ndr_err_code ndr_pull_PNP_GetInterfaceDeviceAlias(struct ndr_pull *n
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -834,6 +919,7 @@ _PUBLIC_ void ndr_print_PNP_GetInterfaceDeviceAlias(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetInterfaceDeviceAlias");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -844,6 +930,7 @@ static enum ndr_err_code ndr_push_PNP_GetInterfaceDeviceList(struct ndr_push *nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -853,6 +940,7 @@ static enum ndr_err_code ndr_pull_PNP_GetInterfaceDeviceList(struct ndr_pull *nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -872,6 +960,7 @@ _PUBLIC_ void ndr_print_PNP_GetInterfaceDeviceList(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetInterfaceDeviceList");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -882,6 +971,7 @@ static enum ndr_err_code ndr_push_PNP_GetInterfaceDeviceListSize(struct ndr_push
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -891,6 +981,7 @@ static enum ndr_err_code ndr_pull_PNP_GetInterfaceDeviceListSize(struct ndr_pull
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -910,6 +1001,7 @@ _PUBLIC_ void ndr_print_PNP_GetInterfaceDeviceListSize(struct ndr_print *ndr, co
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetInterfaceDeviceListSize");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -920,6 +1012,7 @@ static enum ndr_err_code ndr_push_PNP_RegisterDeviceClassAssociation(struct ndr_
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -929,6 +1022,7 @@ static enum ndr_err_code ndr_pull_PNP_RegisterDeviceClassAssociation(struct ndr_
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -948,6 +1042,7 @@ _PUBLIC_ void ndr_print_PNP_RegisterDeviceClassAssociation(struct ndr_print *ndr
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_RegisterDeviceClassAssociation");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -958,6 +1053,7 @@ static enum ndr_err_code ndr_push_PNP_UnregisterDeviceClassAssociation(struct nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -967,6 +1063,7 @@ static enum ndr_err_code ndr_pull_PNP_UnregisterDeviceClassAssociation(struct nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -986,6 +1083,7 @@ _PUBLIC_ void ndr_print_PNP_UnregisterDeviceClassAssociation(struct ndr_print *n
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_UnregisterDeviceClassAssociation");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -996,6 +1094,7 @@ static enum ndr_err_code ndr_push_PNP_GetClassRegProp(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1005,6 +1104,7 @@ static enum ndr_err_code ndr_pull_PNP_GetClassRegProp(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1024,6 +1124,7 @@ _PUBLIC_ void ndr_print_PNP_GetClassRegProp(struct ndr_print *ndr, const char *n
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetClassRegProp");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1034,6 +1135,7 @@ static enum ndr_err_code ndr_push_PNP_SetClassRegProp(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1043,6 +1145,7 @@ static enum ndr_err_code ndr_pull_PNP_SetClassRegProp(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1062,6 +1165,7 @@ _PUBLIC_ void ndr_print_PNP_SetClassRegProp(struct ndr_print *ndr, const char *n
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_SetClassRegProp");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1072,6 +1176,7 @@ static enum ndr_err_code ndr_push_PNP_CreateDevInst(struct ndr_push *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1081,6 +1186,7 @@ static enum ndr_err_code ndr_pull_PNP_CreateDevInst(struct ndr_pull *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1100,6 +1206,7 @@ _PUBLIC_ void ndr_print_PNP_CreateDevInst(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_CreateDevInst");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1110,6 +1217,7 @@ static enum ndr_err_code ndr_push_PNP_DeviceInstanceAction(struct ndr_push *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1119,6 +1227,7 @@ static enum ndr_err_code ndr_pull_PNP_DeviceInstanceAction(struct ndr_pull *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1138,6 +1247,7 @@ _PUBLIC_ void ndr_print_PNP_DeviceInstanceAction(struct ndr_print *ndr, const ch
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_DeviceInstanceAction");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1148,6 +1258,7 @@ static enum ndr_err_code ndr_push_PNP_GetDeviceStatus(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1157,6 +1268,7 @@ static enum ndr_err_code ndr_pull_PNP_GetDeviceStatus(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1176,6 +1288,7 @@ _PUBLIC_ void ndr_print_PNP_GetDeviceStatus(struct ndr_print *ndr, const char *n
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetDeviceStatus");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1186,6 +1299,7 @@ static enum ndr_err_code ndr_push_PNP_SetDeviceProblem(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1195,6 +1309,7 @@ static enum ndr_err_code ndr_pull_PNP_SetDeviceProblem(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1214,6 +1329,7 @@ _PUBLIC_ void ndr_print_PNP_SetDeviceProblem(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_SetDeviceProblem");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1224,6 +1340,7 @@ static enum ndr_err_code ndr_push_PNP_DisableDevInst(struct ndr_push *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1233,6 +1350,7 @@ static enum ndr_err_code ndr_pull_PNP_DisableDevInst(struct ndr_pull *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1252,6 +1370,7 @@ _PUBLIC_ void ndr_print_PNP_DisableDevInst(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_DisableDevInst");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1262,6 +1381,7 @@ static enum ndr_err_code ndr_push_PNP_UninstallDevInst(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1271,6 +1391,7 @@ static enum ndr_err_code ndr_pull_PNP_UninstallDevInst(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1290,6 +1411,7 @@ _PUBLIC_ void ndr_print_PNP_UninstallDevInst(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_UninstallDevInst");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1300,6 +1422,7 @@ static enum ndr_err_code ndr_push_PNP_AddID(struct ndr_push *ndr, int flags, con
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1309,6 +1432,7 @@ static enum ndr_err_code ndr_pull_PNP_AddID(struct ndr_pull *ndr, int flags, str
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1328,6 +1452,7 @@ _PUBLIC_ void ndr_print_PNP_AddID(struct ndr_print *ndr, const char *name, int f
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_AddID");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1338,6 +1463,7 @@ static enum ndr_err_code ndr_push_PNP_RegisterDriver(struct ndr_push *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1347,6 +1473,7 @@ static enum ndr_err_code ndr_pull_PNP_RegisterDriver(struct ndr_pull *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1366,6 +1493,7 @@ _PUBLIC_ void ndr_print_PNP_RegisterDriver(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_RegisterDriver");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1376,6 +1504,7 @@ static enum ndr_err_code ndr_push_PNP_QueryRemove(struct ndr_push *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1385,6 +1514,7 @@ static enum ndr_err_code ndr_pull_PNP_QueryRemove(struct ndr_pull *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1404,6 +1534,7 @@ _PUBLIC_ void ndr_print_PNP_QueryRemove(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_QueryRemove");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1414,6 +1545,7 @@ static enum ndr_err_code ndr_push_PNP_RequestDeviceEject(struct ndr_push *ndr, i
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1423,6 +1555,7 @@ static enum ndr_err_code ndr_pull_PNP_RequestDeviceEject(struct ndr_pull *ndr, i
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1442,6 +1575,7 @@ _PUBLIC_ void ndr_print_PNP_RequestDeviceEject(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_RequestDeviceEject");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1452,6 +1586,7 @@ static enum ndr_err_code ndr_push_PNP_IsDockStationPresent(struct ndr_push *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1461,6 +1596,7 @@ static enum ndr_err_code ndr_pull_PNP_IsDockStationPresent(struct ndr_pull *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1480,6 +1616,7 @@ _PUBLIC_ void ndr_print_PNP_IsDockStationPresent(struct ndr_print *ndr, const ch
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_IsDockStationPresent");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1490,6 +1627,7 @@ static enum ndr_err_code ndr_push_PNP_RequestEjectPC(struct ndr_push *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1499,6 +1637,7 @@ static enum ndr_err_code ndr_pull_PNP_RequestEjectPC(struct ndr_pull *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1518,6 +1657,7 @@ _PUBLIC_ void ndr_print_PNP_RequestEjectPC(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_RequestEjectPC");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1528,6 +1668,7 @@ static enum ndr_err_code ndr_push_PNP_HwProfFlags(struct ndr_push *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1537,6 +1678,7 @@ static enum ndr_err_code ndr_pull_PNP_HwProfFlags(struct ndr_pull *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1556,6 +1698,7 @@ _PUBLIC_ void ndr_print_PNP_HwProfFlags(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_HwProfFlags");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1566,6 +1709,7 @@ static enum ndr_err_code ndr_push_PNP_GetHwProfInfo(struct ndr_push *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1575,6 +1719,7 @@ static enum ndr_err_code ndr_pull_PNP_GetHwProfInfo(struct ndr_pull *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1594,6 +1739,7 @@ _PUBLIC_ void ndr_print_PNP_GetHwProfInfo(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetHwProfInfo");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1604,6 +1750,7 @@ static enum ndr_err_code ndr_push_PNP_AddEmptyLogConf(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1613,6 +1760,7 @@ static enum ndr_err_code ndr_pull_PNP_AddEmptyLogConf(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1632,6 +1780,7 @@ _PUBLIC_ void ndr_print_PNP_AddEmptyLogConf(struct ndr_print *ndr, const char *n
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_AddEmptyLogConf");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1642,6 +1791,7 @@ static enum ndr_err_code ndr_push_PNP_FreeLogConf(struct ndr_push *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1651,6 +1801,7 @@ static enum ndr_err_code ndr_pull_PNP_FreeLogConf(struct ndr_pull *ndr, int flag
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1670,6 +1821,7 @@ _PUBLIC_ void ndr_print_PNP_FreeLogConf(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_FreeLogConf");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1680,6 +1832,7 @@ static enum ndr_err_code ndr_push_PNP_GetFirstLogConf(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1689,6 +1842,7 @@ static enum ndr_err_code ndr_pull_PNP_GetFirstLogConf(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1708,6 +1862,7 @@ _PUBLIC_ void ndr_print_PNP_GetFirstLogConf(struct ndr_print *ndr, const char *n
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetFirstLogConf");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1718,6 +1873,7 @@ static enum ndr_err_code ndr_push_PNP_GetNextLogConf(struct ndr_push *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1727,6 +1883,7 @@ static enum ndr_err_code ndr_pull_PNP_GetNextLogConf(struct ndr_pull *ndr, int f
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1746,6 +1903,7 @@ _PUBLIC_ void ndr_print_PNP_GetNextLogConf(struct ndr_print *ndr, const char *na
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetNextLogConf");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1756,6 +1914,7 @@ static enum ndr_err_code ndr_push_PNP_GetLogConfPriority(struct ndr_push *ndr, i
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1765,6 +1924,7 @@ static enum ndr_err_code ndr_pull_PNP_GetLogConfPriority(struct ndr_pull *ndr, i
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1784,6 +1944,7 @@ _PUBLIC_ void ndr_print_PNP_GetLogConfPriority(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetLogConfPriority");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1794,6 +1955,7 @@ static enum ndr_err_code ndr_push_PNP_AddResDes(struct ndr_push *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1803,6 +1965,7 @@ static enum ndr_err_code ndr_pull_PNP_AddResDes(struct ndr_pull *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1822,6 +1985,7 @@ _PUBLIC_ void ndr_print_PNP_AddResDes(struct ndr_print *ndr, const char *name, i
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_AddResDes");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1832,6 +1996,7 @@ static enum ndr_err_code ndr_push_PNP_FreeResDes(struct ndr_push *ndr, int flags
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1841,6 +2006,7 @@ static enum ndr_err_code ndr_pull_PNP_FreeResDes(struct ndr_pull *ndr, int flags
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1860,6 +2026,7 @@ _PUBLIC_ void ndr_print_PNP_FreeResDes(struct ndr_print *ndr, const char *name,
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_FreeResDes");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1870,6 +2037,7 @@ static enum ndr_err_code ndr_push_PNP_GetNextResDes(struct ndr_push *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1879,6 +2047,7 @@ static enum ndr_err_code ndr_pull_PNP_GetNextResDes(struct ndr_pull *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1898,6 +2067,7 @@ _PUBLIC_ void ndr_print_PNP_GetNextResDes(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetNextResDes");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1908,6 +2078,7 @@ static enum ndr_err_code ndr_push_PNP_GetResDesData(struct ndr_push *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1917,6 +2088,7 @@ static enum ndr_err_code ndr_pull_PNP_GetResDesData(struct ndr_pull *ndr, int fl
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1936,6 +2108,7 @@ _PUBLIC_ void ndr_print_PNP_GetResDesData(struct ndr_print *ndr, const char *nam
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetResDesData");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1946,6 +2119,7 @@ static enum ndr_err_code ndr_push_PNP_GetResDesDataSize(struct ndr_push *ndr, in
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1955,6 +2129,7 @@ static enum ndr_err_code ndr_pull_PNP_GetResDesDataSize(struct ndr_pull *ndr, in
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1974,6 +2149,7 @@ _PUBLIC_ void ndr_print_PNP_GetResDesDataSize(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetResDesDataSize");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -1984,6 +2160,7 @@ static enum ndr_err_code ndr_push_PNP_ModifyResDes(struct ndr_push *ndr, int fla
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -1993,6 +2170,7 @@ static enum ndr_err_code ndr_pull_PNP_ModifyResDes(struct ndr_pull *ndr, int fla
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2012,6 +2190,7 @@ _PUBLIC_ void ndr_print_PNP_ModifyResDes(struct ndr_print *ndr, const char *name
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_ModifyResDes");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2022,6 +2201,7 @@ static enum ndr_err_code ndr_push_PNP_DetectResourceLimit(struct ndr_push *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2031,6 +2211,7 @@ static enum ndr_err_code ndr_pull_PNP_DetectResourceLimit(struct ndr_pull *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2050,6 +2231,7 @@ _PUBLIC_ void ndr_print_PNP_DetectResourceLimit(struct ndr_print *ndr, const cha
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_DetectResourceLimit");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2060,6 +2242,7 @@ static enum ndr_err_code ndr_push_PNP_QueryResConfList(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2069,6 +2252,7 @@ static enum ndr_err_code ndr_pull_PNP_QueryResConfList(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2088,6 +2272,7 @@ _PUBLIC_ void ndr_print_PNP_QueryResConfList(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_QueryResConfList");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2098,6 +2283,7 @@ static enum ndr_err_code ndr_push_PNP_SetHwProf(struct ndr_push *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2107,6 +2293,7 @@ static enum ndr_err_code ndr_pull_PNP_SetHwProf(struct ndr_pull *ndr, int flags,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2126,6 +2313,7 @@ _PUBLIC_ void ndr_print_PNP_SetHwProf(struct ndr_print *ndr, const char *name, i
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_SetHwProf");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2136,6 +2324,7 @@ static enum ndr_err_code ndr_push_PNP_QueryArbitratorFreeData(struct ndr_push *n
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2145,6 +2334,7 @@ static enum ndr_err_code ndr_pull_PNP_QueryArbitratorFreeData(struct ndr_pull *n
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2164,6 +2354,7 @@ _PUBLIC_ void ndr_print_PNP_QueryArbitratorFreeData(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_QueryArbitratorFreeData");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2174,6 +2365,7 @@ static enum ndr_err_code ndr_push_PNP_QueryArbitratorFreeSize(struct ndr_push *n
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2183,6 +2375,7 @@ static enum ndr_err_code ndr_pull_PNP_QueryArbitratorFreeSize(struct ndr_pull *n
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2202,6 +2395,7 @@ _PUBLIC_ void ndr_print_PNP_QueryArbitratorFreeSize(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_QueryArbitratorFreeSize");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2212,6 +2406,7 @@ static enum ndr_err_code ndr_push_PNP_RunDetection(struct ndr_push *ndr, int fla
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2221,6 +2416,7 @@ static enum ndr_err_code ndr_pull_PNP_RunDetection(struct ndr_pull *ndr, int fla
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2240,6 +2436,7 @@ _PUBLIC_ void ndr_print_PNP_RunDetection(struct ndr_print *ndr, const char *name
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_RunDetection");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2250,6 +2447,7 @@ static enum ndr_err_code ndr_push_PNP_RegisterNotification(struct ndr_push *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2259,6 +2457,7 @@ static enum ndr_err_code ndr_pull_PNP_RegisterNotification(struct ndr_pull *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2278,6 +2477,7 @@ _PUBLIC_ void ndr_print_PNP_RegisterNotification(struct ndr_print *ndr, const ch
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_RegisterNotification");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2288,6 +2488,7 @@ static enum ndr_err_code ndr_push_PNP_UnregisterNotification(struct ndr_push *nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2297,6 +2498,7 @@ static enum ndr_err_code ndr_pull_PNP_UnregisterNotification(struct ndr_pull *nd
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2316,6 +2518,7 @@ _PUBLIC_ void ndr_print_PNP_UnregisterNotification(struct ndr_print *ndr, const
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_UnregisterNotification");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2326,6 +2529,7 @@ static enum ndr_err_code ndr_push_PNP_GetCustomDevProp(struct ndr_push *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2335,6 +2539,7 @@ static enum ndr_err_code ndr_pull_PNP_GetCustomDevProp(struct ndr_pull *ndr, int
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2354,6 +2559,7 @@ _PUBLIC_ void ndr_print_PNP_GetCustomDevProp(struct ndr_print *ndr, const char *
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetCustomDevProp");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2364,6 +2570,7 @@ static enum ndr_err_code ndr_push_PNP_GetVersionInternal(struct ndr_push *ndr, i
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2373,6 +2580,7 @@ static enum ndr_err_code ndr_pull_PNP_GetVersionInternal(struct ndr_pull *ndr, i
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2392,6 +2600,7 @@ _PUBLIC_ void ndr_print_PNP_GetVersionInternal(struct ndr_print *ndr, const char
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetVersionInternal");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2402,6 +2611,7 @@ static enum ndr_err_code ndr_push_PNP_GetBlockedDriverInfo(struct ndr_push *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2411,6 +2621,7 @@ static enum ndr_err_code ndr_pull_PNP_GetBlockedDriverInfo(struct ndr_pull *ndr,
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2430,6 +2641,7 @@ _PUBLIC_ void ndr_print_PNP_GetBlockedDriverInfo(struct ndr_print *ndr, const ch
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetBlockedDriverInfo");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
@@ -2440,6 +2652,7 @@ static enum ndr_err_code ndr_push_PNP_GetServerSideDeviceInstallFlags(struct ndr
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2449,6 +2662,7 @@ static enum ndr_err_code ndr_pull_PNP_GetServerSideDeviceInstallFlags(struct ndr
 	if (flags & NDR_IN) {
 	}
 	if (flags & NDR_OUT) {
+		NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
 	}
 	return NDR_ERR_SUCCESS;
 }
@@ -2468,6 +2682,7 @@ _PUBLIC_ void ndr_print_PNP_GetServerSideDeviceInstallFlags(struct ndr_print *nd
 	if (flags & NDR_OUT) {
 		ndr_print_struct(ndr, "out", "PNP_GetServerSideDeviceInstallFlags");
 		ndr->depth++;
+		ndr_print_WERROR(ndr, "result", r->out.result);
 		ndr->depth--;
 	}
 	ndr->depth--;
diff --git a/source3/librpc/gen_ndr/ntsvcs.h b/source3/librpc/gen_ndr/ntsvcs.h
index 43867c1bea..571b7466c2 100644
--- a/source3/librpc/gen_ndr/ntsvcs.h
+++ b/source3/librpc/gen_ndr/ntsvcs.h
@@ -7,327 +7,523 @@
 
 
 struct PNP_Disconnect {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_Connect {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetVersion {
-	int _dummy_element;
+	struct {
+		uint16_t *version;/* [ref] */
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetGlobalState {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_InitDetection {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_ReportLogOn {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_ValidateDeviceInstance {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetRootDeviceInstance {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetRelatedDeviceInstance {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_EnumerateSubKeys {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetDeviceList {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetDeviceListSize {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetDepth {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetDeviceRegProp {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_SetDeviceRegProp {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetClassInstance {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_CreateKey {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_DeleteRegistryKey {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetClassCount {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetClassName {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_DeleteClassKey {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetInterfaceDeviceAlias {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetInterfaceDeviceList {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetInterfaceDeviceListSize {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_RegisterDeviceClassAssociation {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_UnregisterDeviceClassAssociation {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetClassRegProp {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_SetClassRegProp {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_CreateDevInst {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_DeviceInstanceAction {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetDeviceStatus {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_SetDeviceProblem {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_DisableDevInst {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_UninstallDevInst {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_AddID {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_RegisterDriver {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_QueryRemove {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_RequestDeviceEject {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_IsDockStationPresent {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_RequestEjectPC {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_HwProfFlags {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetHwProfInfo {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_AddEmptyLogConf {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_FreeLogConf {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetFirstLogConf {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetNextLogConf {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetLogConfPriority {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_AddResDes {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_FreeResDes {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetNextResDes {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetResDesData {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetResDesDataSize {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_ModifyResDes {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_DetectResourceLimit {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_QueryResConfList {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_SetHwProf {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_QueryArbitratorFreeData {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_QueryArbitratorFreeSize {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_RunDetection {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_RegisterNotification {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_UnregisterNotification {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetCustomDevProp {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetVersionInternal {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetBlockedDriverInfo {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 
 struct PNP_GetServerSideDeviceInstallFlags {
-	int _dummy_element;
+	struct {
+		WERROR result;
+	} out;
+
 };
 
 #endif /* _HEADER_ntsvcs */
diff --git a/source3/librpc/gen_ndr/srv_ntsvcs.c b/source3/librpc/gen_ndr/srv_ntsvcs.c
index f4689e0bbb..7bbf9d1bfa 100644
--- a/source3/librpc/gen_ndr/srv_ntsvcs.c
+++ b/source3/librpc/gen_ndr/srv_ntsvcs.c
@@ -44,7 +44,7 @@ static bool api_PNP_Disconnect(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_Disconnect, r);
 	}
 
-	_PNP_Disconnect(p, r);
+	r->out.result = _PNP_Disconnect(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -117,7 +117,7 @@ static bool api_PNP_Connect(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_Connect, r);
 	}
 
-	_PNP_Connect(p, r);
+	r->out.result = _PNP_Connect(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -190,7 +190,14 @@ static bool api_PNP_GetVersion(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetVersion, r);
 	}
 
-	_PNP_GetVersion(p, r);
+	ZERO_STRUCT(r->out);
+	r->out.version = talloc_zero(r, uint16_t);
+	if (r->out.version == NULL) {
+		talloc_free(r);
+		return false;
+	}
+
+	r->out.result = _PNP_GetVersion(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -263,7 +270,7 @@ static bool api_PNP_GetGlobalState(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetGlobalState, r);
 	}
 
-	_PNP_GetGlobalState(p, r);
+	r->out.result = _PNP_GetGlobalState(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -336,7 +343,7 @@ static bool api_PNP_InitDetection(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_InitDetection, r);
 	}
 
-	_PNP_InitDetection(p, r);
+	r->out.result = _PNP_InitDetection(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -409,7 +416,7 @@ static bool api_PNP_ReportLogOn(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_ReportLogOn, r);
 	}
 
-	_PNP_ReportLogOn(p, r);
+	r->out.result = _PNP_ReportLogOn(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -482,7 +489,7 @@ static bool api_PNP_ValidateDeviceInstance(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_ValidateDeviceInstance, r);
 	}
 
-	_PNP_ValidateDeviceInstance(p, r);
+	r->out.result = _PNP_ValidateDeviceInstance(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -555,7 +562,7 @@ static bool api_PNP_GetRootDeviceInstance(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetRootDeviceInstance, r);
 	}
 
-	_PNP_GetRootDeviceInstance(p, r);
+	r->out.result = _PNP_GetRootDeviceInstance(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -628,7 +635,7 @@ static bool api_PNP_GetRelatedDeviceInstance(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetRelatedDeviceInstance, r);
 	}
 
-	_PNP_GetRelatedDeviceInstance(p, r);
+	r->out.result = _PNP_GetRelatedDeviceInstance(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -701,7 +708,7 @@ static bool api_PNP_EnumerateSubKeys(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_EnumerateSubKeys, r);
 	}
 
-	_PNP_EnumerateSubKeys(p, r);
+	r->out.result = _PNP_EnumerateSubKeys(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -774,7 +781,7 @@ static bool api_PNP_GetDeviceList(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetDeviceList, r);
 	}
 
-	_PNP_GetDeviceList(p, r);
+	r->out.result = _PNP_GetDeviceList(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -847,7 +854,7 @@ static bool api_PNP_GetDeviceListSize(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetDeviceListSize, r);
 	}
 
-	_PNP_GetDeviceListSize(p, r);
+	r->out.result = _PNP_GetDeviceListSize(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -920,7 +927,7 @@ static bool api_PNP_GetDepth(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetDepth, r);
 	}
 
-	_PNP_GetDepth(p, r);
+	r->out.result = _PNP_GetDepth(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -993,7 +1000,7 @@ static bool api_PNP_GetDeviceRegProp(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetDeviceRegProp, r);
 	}
 
-	_PNP_GetDeviceRegProp(p, r);
+	r->out.result = _PNP_GetDeviceRegProp(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1066,7 +1073,7 @@ static bool api_PNP_SetDeviceRegProp(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_SetDeviceRegProp, r);
 	}
 
-	_PNP_SetDeviceRegProp(p, r);
+	r->out.result = _PNP_SetDeviceRegProp(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1139,7 +1146,7 @@ static bool api_PNP_GetClassInstance(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetClassInstance, r);
 	}
 
-	_PNP_GetClassInstance(p, r);
+	r->out.result = _PNP_GetClassInstance(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1212,7 +1219,7 @@ static bool api_PNP_CreateKey(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_CreateKey, r);
 	}
 
-	_PNP_CreateKey(p, r);
+	r->out.result = _PNP_CreateKey(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1285,7 +1292,7 @@ static bool api_PNP_DeleteRegistryKey(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_DeleteRegistryKey, r);
 	}
 
-	_PNP_DeleteRegistryKey(p, r);
+	r->out.result = _PNP_DeleteRegistryKey(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1358,7 +1365,7 @@ static bool api_PNP_GetClassCount(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetClassCount, r);
 	}
 
-	_PNP_GetClassCount(p, r);
+	r->out.result = _PNP_GetClassCount(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1431,7 +1438,7 @@ static bool api_PNP_GetClassName(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetClassName, r);
 	}
 
-	_PNP_GetClassName(p, r);
+	r->out.result = _PNP_GetClassName(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1504,7 +1511,7 @@ static bool api_PNP_DeleteClassKey(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_DeleteClassKey, r);
 	}
 
-	_PNP_DeleteClassKey(p, r);
+	r->out.result = _PNP_DeleteClassKey(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1577,7 +1584,7 @@ static bool api_PNP_GetInterfaceDeviceAlias(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetInterfaceDeviceAlias, r);
 	}
 
-	_PNP_GetInterfaceDeviceAlias(p, r);
+	r->out.result = _PNP_GetInterfaceDeviceAlias(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1650,7 +1657,7 @@ static bool api_PNP_GetInterfaceDeviceList(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetInterfaceDeviceList, r);
 	}
 
-	_PNP_GetInterfaceDeviceList(p, r);
+	r->out.result = _PNP_GetInterfaceDeviceList(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1723,7 +1730,7 @@ static bool api_PNP_GetInterfaceDeviceListSize(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetInterfaceDeviceListSize, r);
 	}
 
-	_PNP_GetInterfaceDeviceListSize(p, r);
+	r->out.result = _PNP_GetInterfaceDeviceListSize(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1796,7 +1803,7 @@ static bool api_PNP_RegisterDeviceClassAssociation(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_RegisterDeviceClassAssociation, r);
 	}
 
-	_PNP_RegisterDeviceClassAssociation(p, r);
+	r->out.result = _PNP_RegisterDeviceClassAssociation(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1869,7 +1876,7 @@ static bool api_PNP_UnregisterDeviceClassAssociation(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_UnregisterDeviceClassAssociation, r);
 	}
 
-	_PNP_UnregisterDeviceClassAssociation(p, r);
+	r->out.result = _PNP_UnregisterDeviceClassAssociation(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -1942,7 +1949,7 @@ static bool api_PNP_GetClassRegProp(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetClassRegProp, r);
 	}
 
-	_PNP_GetClassRegProp(p, r);
+	r->out.result = _PNP_GetClassRegProp(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2015,7 +2022,7 @@ static bool api_PNP_SetClassRegProp(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_SetClassRegProp, r);
 	}
 
-	_PNP_SetClassRegProp(p, r);
+	r->out.result = _PNP_SetClassRegProp(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2088,7 +2095,7 @@ static bool api_PNP_CreateDevInst(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_CreateDevInst, r);
 	}
 
-	_PNP_CreateDevInst(p, r);
+	r->out.result = _PNP_CreateDevInst(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2161,7 +2168,7 @@ static bool api_PNP_DeviceInstanceAction(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_DeviceInstanceAction, r);
 	}
 
-	_PNP_DeviceInstanceAction(p, r);
+	r->out.result = _PNP_DeviceInstanceAction(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2234,7 +2241,7 @@ static bool api_PNP_GetDeviceStatus(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetDeviceStatus, r);
 	}
 
-	_PNP_GetDeviceStatus(p, r);
+	r->out.result = _PNP_GetDeviceStatus(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2307,7 +2314,7 @@ static bool api_PNP_SetDeviceProblem(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_SetDeviceProblem, r);
 	}
 
-	_PNP_SetDeviceProblem(p, r);
+	r->out.result = _PNP_SetDeviceProblem(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2380,7 +2387,7 @@ static bool api_PNP_DisableDevInst(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_DisableDevInst, r);
 	}
 
-	_PNP_DisableDevInst(p, r);
+	r->out.result = _PNP_DisableDevInst(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2453,7 +2460,7 @@ static bool api_PNP_UninstallDevInst(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_UninstallDevInst, r);
 	}
 
-	_PNP_UninstallDevInst(p, r);
+	r->out.result = _PNP_UninstallDevInst(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2526,7 +2533,7 @@ static bool api_PNP_AddID(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_AddID, r);
 	}
 
-	_PNP_AddID(p, r);
+	r->out.result = _PNP_AddID(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2599,7 +2606,7 @@ static bool api_PNP_RegisterDriver(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_RegisterDriver, r);
 	}
 
-	_PNP_RegisterDriver(p, r);
+	r->out.result = _PNP_RegisterDriver(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2672,7 +2679,7 @@ static bool api_PNP_QueryRemove(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_QueryRemove, r);
 	}
 
-	_PNP_QueryRemove(p, r);
+	r->out.result = _PNP_QueryRemove(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2745,7 +2752,7 @@ static bool api_PNP_RequestDeviceEject(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_RequestDeviceEject, r);
 	}
 
-	_PNP_RequestDeviceEject(p, r);
+	r->out.result = _PNP_RequestDeviceEject(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2818,7 +2825,7 @@ static bool api_PNP_IsDockStationPresent(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_IsDockStationPresent, r);
 	}
 
-	_PNP_IsDockStationPresent(p, r);
+	r->out.result = _PNP_IsDockStationPresent(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2891,7 +2898,7 @@ static bool api_PNP_RequestEjectPC(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_RequestEjectPC, r);
 	}
 
-	_PNP_RequestEjectPC(p, r);
+	r->out.result = _PNP_RequestEjectPC(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -2964,7 +2971,7 @@ static bool api_PNP_HwProfFlags(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_HwProfFlags, r);
 	}
 
-	_PNP_HwProfFlags(p, r);
+	r->out.result = _PNP_HwProfFlags(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3037,7 +3044,7 @@ static bool api_PNP_GetHwProfInfo(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetHwProfInfo, r);
 	}
 
-	_PNP_GetHwProfInfo(p, r);
+	r->out.result = _PNP_GetHwProfInfo(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3110,7 +3117,7 @@ static bool api_PNP_AddEmptyLogConf(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_AddEmptyLogConf, r);
 	}
 
-	_PNP_AddEmptyLogConf(p, r);
+	r->out.result = _PNP_AddEmptyLogConf(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3183,7 +3190,7 @@ static bool api_PNP_FreeLogConf(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_FreeLogConf, r);
 	}
 
-	_PNP_FreeLogConf(p, r);
+	r->out.result = _PNP_FreeLogConf(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3256,7 +3263,7 @@ static bool api_PNP_GetFirstLogConf(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetFirstLogConf, r);
 	}
 
-	_PNP_GetFirstLogConf(p, r);
+	r->out.result = _PNP_GetFirstLogConf(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3329,7 +3336,7 @@ static bool api_PNP_GetNextLogConf(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetNextLogConf, r);
 	}
 
-	_PNP_GetNextLogConf(p, r);
+	r->out.result = _PNP_GetNextLogConf(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3402,7 +3409,7 @@ static bool api_PNP_GetLogConfPriority(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetLogConfPriority, r);
 	}
 
-	_PNP_GetLogConfPriority(p, r);
+	r->out.result = _PNP_GetLogConfPriority(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3475,7 +3482,7 @@ static bool api_PNP_AddResDes(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_AddResDes, r);
 	}
 
-	_PNP_AddResDes(p, r);
+	r->out.result = _PNP_AddResDes(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3548,7 +3555,7 @@ static bool api_PNP_FreeResDes(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_FreeResDes, r);
 	}
 
-	_PNP_FreeResDes(p, r);
+	r->out.result = _PNP_FreeResDes(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3621,7 +3628,7 @@ static bool api_PNP_GetNextResDes(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetNextResDes, r);
 	}
 
-	_PNP_GetNextResDes(p, r);
+	r->out.result = _PNP_GetNextResDes(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3694,7 +3701,7 @@ static bool api_PNP_GetResDesData(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetResDesData, r);
 	}
 
-	_PNP_GetResDesData(p, r);
+	r->out.result = _PNP_GetResDesData(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3767,7 +3774,7 @@ static bool api_PNP_GetResDesDataSize(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetResDesDataSize, r);
 	}
 
-	_PNP_GetResDesDataSize(p, r);
+	r->out.result = _PNP_GetResDesDataSize(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3840,7 +3847,7 @@ static bool api_PNP_ModifyResDes(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_ModifyResDes, r);
 	}
 
-	_PNP_ModifyResDes(p, r);
+	r->out.result = _PNP_ModifyResDes(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3913,7 +3920,7 @@ static bool api_PNP_DetectResourceLimit(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_DetectResourceLimit, r);
 	}
 
-	_PNP_DetectResourceLimit(p, r);
+	r->out.result = _PNP_DetectResourceLimit(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -3986,7 +3993,7 @@ static bool api_PNP_QueryResConfList(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_QueryResConfList, r);
 	}
 
-	_PNP_QueryResConfList(p, r);
+	r->out.result = _PNP_QueryResConfList(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4059,7 +4066,7 @@ static bool api_PNP_SetHwProf(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_SetHwProf, r);
 	}
 
-	_PNP_SetHwProf(p, r);
+	r->out.result = _PNP_SetHwProf(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4132,7 +4139,7 @@ static bool api_PNP_QueryArbitratorFreeData(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_QueryArbitratorFreeData, r);
 	}
 
-	_PNP_QueryArbitratorFreeData(p, r);
+	r->out.result = _PNP_QueryArbitratorFreeData(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4205,7 +4212,7 @@ static bool api_PNP_QueryArbitratorFreeSize(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_QueryArbitratorFreeSize, r);
 	}
 
-	_PNP_QueryArbitratorFreeSize(p, r);
+	r->out.result = _PNP_QueryArbitratorFreeSize(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4278,7 +4285,7 @@ static bool api_PNP_RunDetection(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_RunDetection, r);
 	}
 
-	_PNP_RunDetection(p, r);
+	r->out.result = _PNP_RunDetection(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4351,7 +4358,7 @@ static bool api_PNP_RegisterNotification(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_RegisterNotification, r);
 	}
 
-	_PNP_RegisterNotification(p, r);
+	r->out.result = _PNP_RegisterNotification(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4424,7 +4431,7 @@ static bool api_PNP_UnregisterNotification(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_UnregisterNotification, r);
 	}
 
-	_PNP_UnregisterNotification(p, r);
+	r->out.result = _PNP_UnregisterNotification(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4497,7 +4504,7 @@ static bool api_PNP_GetCustomDevProp(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetCustomDevProp, r);
 	}
 
-	_PNP_GetCustomDevProp(p, r);
+	r->out.result = _PNP_GetCustomDevProp(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4570,7 +4577,7 @@ static bool api_PNP_GetVersionInternal(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetVersionInternal, r);
 	}
 
-	_PNP_GetVersionInternal(p, r);
+	r->out.result = _PNP_GetVersionInternal(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4643,7 +4650,7 @@ static bool api_PNP_GetBlockedDriverInfo(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetBlockedDriverInfo, r);
 	}
 
-	_PNP_GetBlockedDriverInfo(p, r);
+	r->out.result = _PNP_GetBlockedDriverInfo(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
@@ -4716,7 +4723,7 @@ static bool api_PNP_GetServerSideDeviceInstallFlags(pipes_struct *p)
 		NDR_PRINT_IN_DEBUG(PNP_GetServerSideDeviceInstallFlags, r);
 	}
 
-	_PNP_GetServerSideDeviceInstallFlags(p, r);
+	r->out.result = _PNP_GetServerSideDeviceInstallFlags(p, r);
 
 	if (p->rng_fault_state) {
 		talloc_free(r);
diff --git a/source3/librpc/gen_ndr/srv_ntsvcs.h b/source3/librpc/gen_ndr/srv_ntsvcs.h
index 0bcd09183e..c3969b11da 100644
--- a/source3/librpc/gen_ndr/srv_ntsvcs.h
+++ b/source3/librpc/gen_ndr/srv_ntsvcs.h
@@ -1,71 +1,71 @@
 #include "librpc/gen_ndr/ndr_ntsvcs.h"
 #ifndef __SRV_NTSVCS__
 #define __SRV_NTSVCS__
-void _PNP_Disconnect(pipes_struct *p, struct PNP_Disconnect *r);
-void _PNP_Connect(pipes_struct *p, struct PNP_Connect *r);
-void _PNP_GetVersion(pipes_struct *p, struct PNP_GetVersion *r);
-void _PNP_GetGlobalState(pipes_struct *p, struct PNP_GetGlobalState *r);
-void _PNP_InitDetection(pipes_struct *p, struct PNP_InitDetection *r);
-void _PNP_ReportLogOn(pipes_struct *p, struct PNP_ReportLogOn *r);
-void _PNP_ValidateDeviceInstance(pipes_struct *p, struct PNP_ValidateDeviceInstance *r);
-void _PNP_GetRootDeviceInstance(pipes_struct *p, struct PNP_GetRootDeviceInstance *r);
-void _PNP_GetRelatedDeviceInstance(pipes_struct *p, struct PNP_GetRelatedDeviceInstance *r);
-void _PNP_EnumerateSubKeys(pipes_struct *p, struct PNP_EnumerateSubKeys *r);
-void _PNP_GetDeviceList(pipes_struct *p, struct PNP_GetDeviceList *r);
-void _PNP_GetDeviceListSize(pipes_struct *p, struct PNP_GetDeviceListSize *r);
-void _PNP_GetDepth(pipes_struct *p, struct PNP_GetDepth *r);
-void _PNP_GetDeviceRegProp(pipes_struct *p, struct PNP_GetDeviceRegProp *r);
-void _PNP_SetDeviceRegProp(pipes_struct *p, struct PNP_SetDeviceRegProp *r);
-void _PNP_GetClassInstance(pipes_struct *p, struct PNP_GetClassInstance *r);
-void _PNP_CreateKey(pipes_struct *p, struct PNP_CreateKey *r);
-void _PNP_DeleteRegistryKey(pipes_struct *p, struct PNP_DeleteRegistryKey *r);
-void _PNP_GetClassCount(pipes_struct *p, struct PNP_GetClassCount *r);
-void _PNP_GetClassName(pipes_struct *p, struct PNP_GetClassName *r);
-void _PNP_DeleteClassKey(pipes_struct *p, struct PNP_DeleteClassKey *r);
-void _PNP_GetInterfaceDeviceAlias(pipes_struct *p, struct PNP_GetInterfaceDeviceAlias *r);
-void _PNP_GetInterfaceDeviceList(pipes_struct *p, struct PNP_GetInterfaceDeviceList *r);
-void _PNP_GetInterfaceDeviceListSize(pipes_struct *p, struct PNP_GetInterfaceDeviceListSize *r);
-void _PNP_RegisterDeviceClassAssociation(pipes_struct *p, struct PNP_RegisterDeviceClassAssociation *r);
-void _PNP_UnregisterDeviceClassAssociation(pipes_struct *p, struct PNP_UnregisterDeviceClassAssociation *r);
-void _PNP_GetClassRegProp(pipes_struct *p, struct PNP_GetClassRegProp *r);
-void _PNP_SetClassRegProp(pipes_struct *p, struct PNP_SetClassRegProp *r);
-void _PNP_CreateDevInst(pipes_struct *p, struct PNP_CreateDevInst *r);
-void _PNP_DeviceInstanceAction(pipes_struct *p, struct PNP_DeviceInstanceAction *r);
-void _PNP_GetDeviceStatus(pipes_struct *p, struct PNP_GetDeviceStatus *r);
-void _PNP_SetDeviceProblem(pipes_struct *p, struct PNP_SetDeviceProblem *r);
-void _PNP_DisableDevInst(pipes_struct *p, struct PNP_DisableDevInst *r);
-void _PNP_UninstallDevInst(pipes_struct *p, struct PNP_UninstallDevInst *r);
-void _PNP_AddID(pipes_struct *p, struct PNP_AddID *r);
-void _PNP_RegisterDriver(pipes_struct *p, struct PNP_RegisterDriver *r);
-void _PNP_QueryRemove(pipes_struct *p, struct PNP_QueryRemove *r);
-void _PNP_RequestDeviceEject(pipes_struct *p, struct PNP_RequestDeviceEject *r);
-void _PNP_IsDockStationPresent(pipes_struct *p, struct PNP_IsDockStationPresent *r);
-void _PNP_RequestEjectPC(pipes_struct *p, struct PNP_RequestEjectPC *r);
-void _PNP_HwProfFlags(pipes_struct *p, struct PNP_HwProfFlags *r);
-void _PNP_GetHwProfInfo(pipes_struct *p, struct PNP_GetHwProfInfo *r);
-void _PNP_AddEmptyLogConf(pipes_struct *p, struct PNP_AddEmptyLogConf *r);
-void _PNP_FreeLogConf(pipes_struct *p, struct PNP_FreeLogConf *r);
-void _PNP_GetFirstLogConf(pipes_struct *p, struct PNP_GetFirstLogConf *r);
-void _PNP_GetNextLogConf(pipes_struct *p, struct PNP_GetNextLogConf *r);
-void _PNP_GetLogConfPriority(pipes_struct *p, struct PNP_GetLogConfPriority *r);
-void _PNP_AddResDes(pipes_struct *p, struct PNP_AddResDes *r);
-void _PNP_FreeResDes(pipes_struct *p, struct PNP_FreeResDes *r);
-void _PNP_GetNextResDes(pipes_struct *p, struct PNP_GetNextResDes *r);
-void _PNP_GetResDesData(pipes_struct *p, struct PNP_GetResDesData *r);
-void _PNP_GetResDesDataSize(pipes_struct *p, struct PNP_GetResDesDataSize *r);
-void _PNP_ModifyResDes(pipes_struct *p, struct PNP_ModifyResDes *r);
-void _PNP_DetectResourceLimit(pipes_struct *p, struct PNP_DetectResourceLimit *r);
-void _PNP_QueryResConfList(pipes_struct *p, struct PNP_QueryResConfList *r);
-void _PNP_SetHwProf(pipes_struct *p, struct PNP_SetHwProf *r);
-void _PNP_QueryArbitratorFreeData(pipes_struct *p, struct PNP_QueryArbitratorFreeData *r);
-void _PNP_QueryArbitratorFreeSize(pipes_struct *p, struct PNP_QueryArbitratorFreeSize *r);
-void _PNP_RunDetection(pipes_struct *p, struct PNP_RunDetection *r);
-void _PNP_RegisterNotification(pipes_struct *p, struct PNP_RegisterNotification *r);
-void _PNP_UnregisterNotification(pipes_struct *p, struct PNP_UnregisterNotification *r);
-void _PNP_GetCustomDevProp(pipes_struct *p, struct PNP_GetCustomDevProp *r);
-void _PNP_GetVersionInternal(pipes_struct *p, struct PNP_GetVersionInternal *r);
-void _PNP_GetBlockedDriverInfo(pipes_struct *p, struct PNP_GetBlockedDriverInfo *r);
-void _PNP_GetServerSideDeviceInstallFlags(pipes_struct *p, struct PNP_GetServerSideDeviceInstallFlags *r);
+WERROR _PNP_Disconnect(pipes_struct *p, struct PNP_Disconnect *r);
+WERROR _PNP_Connect(pipes_struct *p, struct PNP_Connect *r);
+WERROR _PNP_GetVersion(pipes_struct *p, struct PNP_GetVersion *r);
+WERROR _PNP_GetGlobalState(pipes_struct *p, struct PNP_GetGlobalState *r);
+WERROR _PNP_InitDetection(pipes_struct *p, struct PNP_InitDetection *r);
+WERROR _PNP_ReportLogOn(pipes_struct *p, struct PNP_ReportLogOn *r);
+WERROR _PNP_ValidateDeviceInstance(pipes_struct *p, struct PNP_ValidateDeviceInstance *r);
+WERROR _PNP_GetRootDeviceInstance(pipes_struct *p, struct PNP_GetRootDeviceInstance *r);
+WERROR _PNP_GetRelatedDeviceInstance(pipes_struct *p, struct PNP_GetRelatedDeviceInstance *r);
+WERROR _PNP_EnumerateSubKeys(pipes_struct *p, struct PNP_EnumerateSubKeys *r);
+WERROR _PNP_GetDeviceList(pipes_struct *p, struct PNP_GetDeviceList *r);
+WERROR _PNP_GetDeviceListSize(pipes_struct *p, struct PNP_GetDeviceListSize *r);
+WERROR _PNP_GetDepth(pipes_struct *p, struct PNP_GetDepth *r);
+WERROR _PNP_GetDeviceRegProp(pipes_struct *p, struct PNP_GetDeviceRegProp *r);
+WERROR _PNP_SetDeviceRegProp(pipes_struct *p, struct PNP_SetDeviceRegProp *r);
+WERROR _PNP_GetClassInstance(pipes_struct *p, struct PNP_GetClassInstance *r);
+WERROR _PNP_CreateKey(pipes_struct *p, struct PNP_CreateKey *r);
+WERROR _PNP_DeleteRegistryKey(pipes_struct *p, struct PNP_DeleteRegistryKey *r);
+WERROR _PNP_GetClassCount(pipes_struct *p, struct PNP_GetClassCount *r);
+WERROR _PNP_GetClassName(pipes_struct *p, struct PNP_GetClassName *r);
+WERROR _PNP_DeleteClassKey(pipes_struct *p, struct PNP_DeleteClassKey *r);
+WERROR _PNP_GetInterfaceDeviceAlias(pipes_struct *p, struct PNP_GetInterfaceDeviceAlias *r);
+WERROR _PNP_GetInterfaceDeviceList(pipes_struct *p, struct PNP_GetInterfaceDeviceList *r);
+WERROR _PNP_GetInterfaceDeviceListSize(pipes_struct *p, struct PNP_GetInterfaceDeviceListSize *r);
+WERROR _PNP_RegisterDeviceClassAssociation(pipes_struct *p, struct PNP_RegisterDeviceClassAssociation *r);
+WERROR _PNP_UnregisterDeviceClassAssociation(pipes_struct *p, struct PNP_UnregisterDeviceClassAssociation *r);
+WERROR _PNP_GetClassRegProp(pipes_struct *p, struct PNP_GetClassRegProp *r);
+WERROR _PNP_SetClassRegProp(pipes_struct *p, struct PNP_SetClassRegProp *r);
+WERROR _PNP_CreateDevInst(pipes_struct *p, struct PNP_CreateDevInst *r);
+WERROR _PNP_DeviceInstanceAction(pipes_struct *p, struct PNP_DeviceInstanceAction *r);
+WERROR _PNP_GetDeviceStatus(pipes_struct *p, struct PNP_GetDeviceStatus *r);
+WERROR _PNP_SetDeviceProblem(pipes_struct *p, struct PNP_SetDeviceProblem *r);
+WERROR _PNP_DisableDevInst(pipes_struct *p, struct PNP_DisableDevInst *r);
+WERROR _PNP_UninstallDevInst(pipes_struct *p, struct PNP_UninstallDevInst *r);
+WERROR _PNP_AddID(pipes_struct *p, struct PNP_AddID *r);
+WERROR _PNP_RegisterDriver(pipes_struct *p, struct PNP_RegisterDriver *r);
+WERROR _PNP_QueryRemove(pipes_struct *p, struct PNP_QueryRemove *r);
+WERROR _PNP_RequestDeviceEject(pipes_struct *p, struct PNP_RequestDeviceEject *r);
+WERROR _PNP_IsDockStationPresent(pipes_struct *p, struct PNP_IsDockStationPresent *r);
+WERROR _PNP_RequestEjectPC(pipes_struct *p, struct PNP_RequestEjectPC *r);
+WERROR _PNP_HwProfFlags(pipes_struct *p, struct PNP_HwProfFlags *r);
+WERROR _PNP_GetHwProfInfo(pipes_struct *p, struct PNP_GetHwProfInfo *r);
+WERROR _PNP_AddEmptyLogConf(pipes_struct *p, struct PNP_AddEmptyLogConf *r);
+WERROR _PNP_FreeLogConf(pipes_struct *p, struct PNP_FreeLogConf *r);
+WERROR _PNP_GetFirstLogConf(pipes_struct *p, struct PNP_GetFirstLogConf *r);
+WERROR _PNP_GetNextLogConf(pipes_struct *p, struct PNP_GetNextLogConf *r);
+WERROR _PNP_GetLogConfPriority(pipes_struct *p, struct PNP_GetLogConfPriority *r);
+WERROR _PNP_AddResDes(pipes_struct *p, struct PNP_AddResDes *r);
+WERROR _PNP_FreeResDes(pipes_struct *p, struct PNP_FreeResDes *r);
+WERROR _PNP_GetNextResDes(pipes_struct *p, struct PNP_GetNextResDes *r);
+WERROR _PNP_GetResDesData(pipes_struct *p, struct PNP_GetResDesData *r);
+WERROR _PNP_GetResDesDataSize(pipes_struct *p, struct PNP_GetResDesDataSize *r);
+WERROR _PNP_ModifyResDes(pipes_struct *p, struct PNP_ModifyResDes *r);
+WERROR _PNP_DetectResourceLimit(pipes_struct *p, struct PNP_DetectResourceLimit *r);
+WERROR _PNP_QueryResConfList(pipes_struct *p, struct PNP_QueryResConfList *r);
+WERROR _PNP_SetHwProf(pipes_struct *p, struct PNP_SetHwProf *r);
+WERROR _PNP_QueryArbitratorFreeData(pipes_struct *p, struct PNP_QueryArbitratorFreeData *r);
+WERROR _PNP_QueryArbitratorFreeSize(pipes_struct *p, struct PNP_QueryArbitratorFreeSize *r);
+WERROR _PNP_RunDetection(pipes_struct *p, struct PNP_RunDetection *r);
+WERROR _PNP_RegisterNotification(pipes_struct *p, struct PNP_RegisterNotification *r);
+WERROR _PNP_UnregisterNotification(pipes_struct *p, struct PNP_UnregisterNotification *r);
+WERROR _PNP_GetCustomDevProp(pipes_struct *p, struct PNP_GetCustomDevProp *r);
+WERROR _PNP_GetVersionInternal(pipes_struct *p, struct PNP_GetVersionInternal *r);
+WERROR _PNP_GetBlockedDriverInfo(pipes_struct *p, struct PNP_GetBlockedDriverInfo *r);
+WERROR _PNP_GetServerSideDeviceInstallFlags(pipes_struct *p, struct PNP_GetServerSideDeviceInstallFlags *r);
 void ntsvcs_get_pipe_fns(struct api_struct **fns, int *n_fns);
 NTSTATUS rpc_ntsvcs_init(void);
 #endif /* __SRV_NTSVCS__ */