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 ebcaddfc1212c59c53be40b075b6374add5876be..dcf99557544f813f8032d8d9e7cbcdc3cc888bb5 100644 (file)
--- 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 fa21177b1d0d27847dd7897a434bb7bc8fe4e965..3ddb049a1b201da2f0d8d5c2b9c8727b44b5150c 100644 (file)
--- 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 627b8dc159862390cec9ce6f373edb38bc9a4006..9e9642e40b9c4a3894ed98c57f7de3234634724a 100644 (file)
--- 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;
 }