sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00
Code

lib/dcom: use HRESULT in dcom_create_object.

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-22 00:17:51 +02:00 committed by Jeremy Allison
parent 4e5ee7146b
commit 7e60050194
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/lib/com/dcom/dcom.h
View File

@ -50,7 +50,7 @@ typedef enum ndr_err_code (*unmarshal_fn)(TALLOC_CTX *mem_ctx, struct OBJREF *o,
struct dcom_client_context *dcom_client_init(struct com_context *ctx, struct cli_credentials *credentials);
struct dcom_object_exporter *object_exporter_by_oxid(struct com_context *ctx, uint64_t oxid);
struct dcom_object_exporter *object_exporter_by_ip(struct com_context *ctx, struct IUnknown *ip);
WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, WERROR *results);
WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, HRESULT *results);
WERROR dcom_get_class_object(struct com_context *ctx, struct GUID *clsid, const char *server, struct GUID *iid, struct IUnknown **ip);
NTSTATUS dcom_get_pipe(struct IUnknown *iface, struct dcerpc_pipe **pp);
NTSTATUS dcom_OBJREF_from_IUnknown(struct OBJREF *o, struct IUnknown *p);

8
source4/lib/com/dcom/main.c
View File

@ -240,7 +240,7 @@ struct dcom_object_exporter *object_exporter_by_ip(struct com_context *ctx, stru
return object_exporter_by_oxid(ctx, ip->obj.u_objref.u_standard.std.oxid);
}
WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, WERROR *results)
WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct IUnknown ***ip, HRESULT *results)
{
uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
struct dcerpc_pipe *p;
@ -249,7 +249,7 @@ WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const cha
struct RemoteActivation r;
struct DUALSTRINGARRAY *pds;
int i;
WERROR hr;
HRESULT hr;
uint64_t oxid;
struct GUID ipidRemUnknown;
struct IUnknown *ru_template;
@ -301,8 +301,8 @@ WERROR dcom_create_object(struct com_context *ctx, struct GUID *clsid, const cha
hr = r.out.result;
goto end;
}
if(!W_ERROR_IS_OK(hr)) {
if(!HRES_IS_OK(hr)) {
goto end;
}

3
source4/lib/wmi/tools/wmis.c
View File

@ -102,7 +102,8 @@ WERROR WBEM_ConnectServer(struct com_context *ctx, const char *server, const cha
{
struct GUID clsid;
struct GUID iid;
WERROR result, coresult;
WERROR result;
HRESULT coresult;
struct IUnknown **mqi;
struct IWbemLevel1Login *pL;

3
source4/lib/wmi/wmicore.c
View File

@ -57,7 +57,8 @@ WERROR WBEM_ConnectServer(struct com_context *ctx, const char *server, const uin
{
struct GUID clsid;
struct GUID iid;
WERROR result, coresult;
WERROR result;
HRESULT coresult;
struct IUnknown **mqi;
struct IWbemLevel1Login *pL;