From: Günther Deschner <gd@samba.org>
Date: Tue, 21 Jul 2015 20:23:22 +0000 (+0200)
Subject: remact: use HRESULT in RemoteActivation IDL and tests.
X-Git-Tag: talloc-2.1.4~558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=195faed933cccfc6ef63aeda67948084d9e6490b;p=thirdparty%2Fsamba.git

remact: use HRESULT in RemoteActivation IDL and tests.

Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/librpc/idl/remact.idl b/librpc/idl/remact.idl
index ebcaddfc121..dcf99557544 100644
--- a/librpc/idl/remact.idl
+++ b/librpc/idl/remact.idl
@@ -40,8 +40,8 @@ interface IRemoteActivation
 		[out,ref] GUID *ipidRemUnknown,
 		[out,ref] uint32 *AuthnHint,
 		[out,ref] COMVERSION *ServerVersion,
-		[out,ref] WERROR *hr,
+		[out,ref] HRESULT *hr,
 		[out,size_is(Interfaces)] MInterfacePointer **ifaces,
-		[out,size_is(Interfaces)] WERROR results[]
+		[out,size_is(Interfaces)] HRESULT results[]
 		);
 }
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index fa21177b1d0..3ddb049a1b2 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -43,7 +43,7 @@ static bool test_RemoteActivation(struct torture_context *tctx,
 	struct DUALSTRINGARRAY *pdsaOxidBindings;
 	uint32_t AuthnHint;
 	struct COMVERSION ServerVersion;
-	WERROR hr;
+	HRESULT hr;
 	struct MInterfacePointer *ifaces;
 
 	status = torture_rpc_connection(tctx, &p,
@@ -79,8 +79,8 @@ static bool test_RemoteActivation(struct torture_context *tctx,
 	status = dcerpc_RemoteActivation_r(b, tctx, &r);
 	torture_assert_ntstatus_ok(tctx, status, "RemoteActivation failed");
 	torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation failed");
-	torture_assert_werr_ok(tctx, *r.out.hr, "RemoteActivation failed");
-	torture_assert_werr_ok(tctx, r.out.results[0], "RemoteActivation failed");
+	torture_assert_hresult_ok(tctx, *r.out.hr, "RemoteActivation failed");
+	torture_assert_hresult_ok(tctx, r.out.results[0], "RemoteActivation failed");
 
 	return true;
 }
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 627b8dc1598..9e9642e40b9 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -41,7 +41,7 @@ static bool test_RemoteActivation(struct torture_context *tctx,
 	struct GUID ipidRemUnknown;
 	uint32_t AuthnHint;
 	struct COMVERSION ServerVersion;
-	WERROR hr;
+	HRESULT hr;
 	struct MInterfacePointer *ifaces;
 
 	ZERO_STRUCT(r);
@@ -71,9 +71,9 @@ static bool test_RemoteActivation(struct torture_context *tctx,
 
 	torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation");
 
-	torture_assert_werr_ok(tctx, *r.out.hr, "RemoteActivation");
+	torture_assert_hresult_ok(tctx, *r.out.hr, "RemoteActivation");
 
-	torture_assert_werr_ok(tctx, r.out.results[0], "RemoteActivation");
+	torture_assert_hresult_ok(tctx, r.out.results[0], "RemoteActivation");
 
 	GUID_from_string(DCERPC_ICLASSFACTORY_UUID, &iids[0]);
 	r.in.Interfaces = 1;
@@ -84,9 +84,9 @@ static bool test_RemoteActivation(struct torture_context *tctx,
 
 	torture_assert_werr_ok(tctx, r.out.result, "RemoteActivation(GetClassObject)");
 
-	torture_assert_werr_ok(tctx, *r.out.hr, "RemoteActivation(GetClassObject)");
+	torture_assert_hresult_ok(tctx, *r.out.hr, "RemoteActivation(GetClassObject)");
 
-	torture_assert_werr_ok(tctx, r.out.results[0], "RemoteActivation(GetClassObject)");
+	torture_assert_hresult_ok(tctx, r.out.results[0], "RemoteActivation(GetClassObject)");
 
 	return true;
 }