sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

remact: use HRESULT in RemoteActivation IDL and tests.

Browse Source 
Guenther

Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Günther Deschner 2015-07-21 22:23:22 +02:00 committed by Jeremy Allison
parent 04e1f2ea90
commit 195faed933
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
librpc/idl/remact.idl
View File

@ -40,8 +40,8 @@ interface IRemoteActivation
[out,ref] GUID *ipidRemUnknown, [out,ref] GUID *ipidRemUnknown,
[out,ref] uint32 *AuthnHint, [out,ref] uint32 *AuthnHint,
[out,ref] COMVERSION *ServerVersion, [out,ref] COMVERSION *ServerVersion,
[out,ref] WERROR *hr, [out,ref] HRESULT *hr,
[out,size_is(Interfaces)] MInterfacePointer **ifaces, [out,size_is(Interfaces)] MInterfacePointer **ifaces,
[out,size_is(Interfaces)] WERROR results[] [out,size_is(Interfaces)] HRESULT results[]
); );
} }

6
source4/torture/rpc/oxidresolve.c
View File

@ -43,7 +43,7 @@ static bool test_RemoteActivation(struct torture_context *tctx,
struct DUALSTRINGARRAY *pdsaOxidBindings; struct DUALSTRINGARRAY *pdsaOxidBindings;
uint32_t AuthnHint; uint32_t AuthnHint;
struct COMVERSION ServerVersion; struct COMVERSION ServerVersion;
WERROR hr; HRESULT hr;
struct MInterfacePointer *ifaces; struct MInterfacePointer *ifaces;
status = torture_rpc_connection(tctx, &p, 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); status = dcerpc_RemoteActivation_r(b, tctx, &r);
torture_assert_ntstatus_ok(tctx, status, "RemoteActivation failed"); 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.result, "RemoteActivation failed");
torture_assert_werr_ok(tctx, *r.out.hr, "RemoteActivation failed"); torture_assert_hresult_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.results[0], "RemoteActivation failed");
return true; return true;
} }

10
source4/torture/rpc/remact.c
View File

@ -41,7 +41,7 @@ static bool test_RemoteActivation(struct torture_context *tctx,
struct GUID ipidRemUnknown; struct GUID ipidRemUnknown;
uint32_t AuthnHint; uint32_t AuthnHint;
struct COMVERSION ServerVersion; struct COMVERSION ServerVersion;
WERROR hr; HRESULT hr;
struct MInterfacePointer *ifaces; struct MInterfacePointer *ifaces;
ZERO_STRUCT(r); 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.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]); GUID_from_string(DCERPC_ICLASSFACTORY_UUID, &iids[0]);
r.in.Interfaces = 1; 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.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; return true;
} }