sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-03 13:47:25 +03:00
Code

w32err: WERR_CLASS_NOT_REGISTERED updated

Browse Source 
Error code move to COM/OLE group.
Error value changed to as REGDB_E_CLASSNOTREG in Windows

Signed-off-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Kamen Mazdrashki 2009-09-17 04:28:28 +03:00 committed by Günther Deschner
parent 277597de85
commit 1cfac63fa4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libcli/util/doserr.c
View File

@ -179,7 +179,6 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_INVALID_USER_BUFFER", WERR_INVALID_USER_BUFFER }, { "WERR_INVALID_USER_BUFFER", WERR_INVALID_USER_BUFFER },
{ "WERR_NO_TRUST_SAM_ACCOUNT", WERR_NO_TRUST_SAM_ACCOUNT }, { "WERR_NO_TRUST_SAM_ACCOUNT", WERR_NO_TRUST_SAM_ACCOUNT },
{ "WERR_INVALID_PRINTER_COMMAND", WERR_INVALID_PRINTER_COMMAND }, { "WERR_INVALID_PRINTER_COMMAND", WERR_INVALID_PRINTER_COMMAND },
{ "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED },
{ "WERR_NO_SHUTDOWN_IN_PROGRESS", WERR_NO_SHUTDOWN_IN_PROGRESS }, { "WERR_NO_SHUTDOWN_IN_PROGRESS", WERR_NO_SHUTDOWN_IN_PROGRESS },
{ "WERR_SHUTDOWN_ALREADY_IN_PROGRESS", WERR_SHUTDOWN_ALREADY_IN_PROGRESS }, { "WERR_SHUTDOWN_ALREADY_IN_PROGRESS", WERR_SHUTDOWN_ALREADY_IN_PROGRESS },
{ "WERR_SEC_E_ENCRYPT_FAILURE", WERR_SEC_E_ENCRYPT_FAILURE }, { "WERR_SEC_E_ENCRYPT_FAILURE", WERR_SEC_E_ENCRYPT_FAILURE },
@ -217,6 +216,7 @@ static const struct werror_code_struct dos_errs[] =
{ "WERR_UNKNOWN_PRINT_MONITOR", WERR_UNKNOWN_PRINT_MONITOR }, { "WERR_UNKNOWN_PRINT_MONITOR", WERR_UNKNOWN_PRINT_MONITOR },
{ "WERR_PASSWORD_RESTRICTION", WERR_PASSWORD_RESTRICTION }, { "WERR_PASSWORD_RESTRICTION", WERR_PASSWORD_RESTRICTION },
{ "WERR_WRONG_PASSWORD", WERR_WRONG_PASSWORD }, { "WERR_WRONG_PASSWORD", WERR_WRONG_PASSWORD },
{ "WERR_CLASS_NOT_REGISTERED", WERR_CLASS_NOT_REGISTERED },
{ NULL, W_ERROR(0) } { NULL, W_ERROR(0) }
}; };

7
libcli/util/werror.h
View File

@ -194,7 +194,6 @@ typedef uint32_t WERROR;
#define WERR_PRINT_MONITOR_IN_USE W_ERROR(ERRprintmonitorinuse) #define WERR_PRINT_MONITOR_IN_USE W_ERROR(ERRprintmonitorinuse)
#define WERR_PRINTER_HAS_JOBS_QUEUED W_ERROR(ERRprinterhasjobsqueued) #define WERR_PRINTER_HAS_JOBS_QUEUED W_ERROR(ERRprinterhasjobsqueued)
#define WERR_CLASS_NOT_REGISTERED W_ERROR(0x40154)
#define WERR_NO_SHUTDOWN_IN_PROGRESS W_ERROR(0x45c) #define WERR_NO_SHUTDOWN_IN_PROGRESS W_ERROR(0x45c)
#define WERR_SHUTDOWN_ALREADY_IN_PROGRESS W_ERROR(0x45b) #define WERR_SHUTDOWN_ALREADY_IN_PROGRESS W_ERROR(0x45b)
/* Configuration Manager Errors */ /* Configuration Manager Errors */
@ -293,6 +292,8 @@ typedef uint32_t WERROR;
#define WERR_DS_NO_MSDS_INTID W_ERROR(0x00002194) #define WERR_DS_NO_MSDS_INTID W_ERROR(0x00002194)
#define WERR_DS_DUP_MSDS_INTID W_ERROR(0x00002195) #define WERR_DS_DUP_MSDS_INTID W_ERROR(0x00002195)
/* RPC/COM/OLE HRESULT error codes */
/* FRS errors */ /* FRS errors */
#define WERR_FRS_INSUFFICIENT_PRIV W_ERROR(FRS_ERR_BASE+7) #define WERR_FRS_INSUFFICIENT_PRIV W_ERROR(FRS_ERR_BASE+7)
#define WERR_FRS_SYSVOL_IS_BUSY W_ERROR(FRS_ERR_BASE+15) #define WERR_FRS_SYSVOL_IS_BUSY W_ERROR(FRS_ERR_BASE+15)
@ -307,6 +308,10 @@ typedef uint32_t WERROR;
#define WERR_SEC_E_DECRYPT_FAILURE W_ERROR(0x80090330) #define WERR_SEC_E_DECRYPT_FAILURE W_ERROR(0x80090330)
#define WERR_SEC_E_ALGORITHM_MISMATCH W_ERROR(0x80090331) #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_GENERAL_FAILURE #define WERR_FOOBAR WERR_GENERAL_FAILURE
/***************************************************************************** /*****************************************************************************