From 6b1c5b485cbac27438623353dfa2d0c521fb93e0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?G=C3=BCnther=20Deschner?= Date: Wed, 9 Dec 2015 15:12:49 +0100 Subject: [PATCH] werror: replace WERR_CLASS_NOT_REGISTERED with HRES_REGDB_E_CLASSNOTREG Guenther Signed-off-by: Guenther Deschner Reviewed-by: Jeremy Allison --- libcli/util/doserr.c | 1 - libcli/util/werror.h | 3 --- source4/lib/com/main.c | 2 +- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c index 64efbb63f362..05e6fe90e85e 100644 --- a/libcli/util/doserr.c +++ b/libcli/util/doserr.c @@ -129,7 +129,6 @@ static const struct werror_code_struct dos_errs[] = { "WERR_SEC_E_DECRYPT_FAILURE", WERR_SEC_E_DECRYPT_FAILURE }, { "WERR_SEC_E_ALGORITHM_MISMATCH", WERR_SEC_E_ALGORITHM_MISMATCH }, { "WERR_RPC_E_REMOTE_DISABLED", WERR_RPC_E_REMOTE_DISABLED }, - { "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED }, /***************************************************************************** Auto-generated Win32 error from: http://msdn.microsoft.com/en-us/library/cc231199%28PROT.10%29.aspx diff --git a/libcli/util/werror.h b/libcli/util/werror.h index 1fc2afbd15f2..0b70dafa0b8d 100644 --- a/libcli/util/werror.h +++ b/libcli/util/werror.h @@ -111,9 +111,6 @@ typedef uint32_t WERROR; #define WERR_SEC_E_DECRYPT_FAILURE W_ERROR(0x80090330) #define WERR_SEC_E_ALGORITHM_MISMATCH W_ERROR(0x80090331) -/* COM REGDB error codes */ -#define WERR_CLASS_NOT_REGISTERED W_ERROR(0x80040154) /* REGDB_E_CLASSNOTREG */ - /* Generic error code aliases */ #define WERR_FOOBAR WERR_GEN_FAILURE diff --git a/source4/lib/com/main.c b/source4/lib/com/main.c index e7f4458f08d8..68a3bc6d3d36 100644 --- a/source4/lib/com/main.c +++ b/source4/lib/com/main.c @@ -83,7 +83,7 @@ WERROR com_get_class_object(struct com_context *ctx, struct GUID *clsid, struct iu = com_class_by_clsid(ctx, clsid); if (!iu) { - return WERR_CLASS_NOT_REGISTERED; + return W_ERROR(HRES_ERROR_V(HRES_REGDB_E_CLASSNOTREG)); } return IUnknown_QueryInterface(iu, ctx, iid, ip); -- 2.34.1