ntdll: Add an common SXS errorcode
André Hentschel
nerv at dawncrow.de
Thu Jul 29 12:59:04 CDT 2010
---
dlls/ntdll/error.c | 12 +++++++++++-
dlls/ntdll/tests/error.c | 1 +
include/ntstatus.h | 18 ++++++++++++++++++
include/winerror.h | 4 ++++
4 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index 3cccf27..726c169 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -1435,6 +1435,16 @@ static const DWORD table_c0150001[14] =
0, /* c015000c (STATUS_SXS_ASSEMBLY_MISSING) */
0, /* c015000d */
ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET /* c015000e (STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET) */
+ 0, /* c015000f (STATUS_SXS_EARLY_DEACTIVATION) */
+ 0, /* c0150010 (STATUS_SXS_INVALID_DEACTIVATION) */
+ 0, /* c0150011 (STATUS_SXS_MULTIPLE_DEACTIVATION) */
+ 0, /* c0150012 (STATUS_SXS_SYSTEM_DEFAULT_ACTIVATION_CONTEXT_EMPTY) */
+ 0, /* c0150013 (STATUS_SXS_PROCESS_TERMINATION_REQUESTED) */
+ 0, /* c0150014 (STATUS_SXS_CORRUPT_ACTIVATION_STACK) */
+ 0, /* c0150015 (STATUS_SXS_CORRUPTION) */
+ 0, /* c0150016 (STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE) */
+ 0, /* c0150017 (STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME) */
+ ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE, /* c0150018 (STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE) */
};
static const struct error_table error_table[] =
@@ -1457,6 +1467,6 @@ static const struct error_table error_table[] =
{ 0xc0030059, 0xc0030062, table_c0030059 },
{ 0xc00a0001, 0xc00a0037, table_c00a0001 },
{ 0xc0130001, 0xc0130017, table_c0130001 },
- { 0xc0150001, 0xc015000f, table_c0150001 },
+ { 0xc0150001, 0xc0150018, table_c0150001 },
{ 0, 0, NULL } /* last entry */
};
diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c
index 7edc0ba..13eff8f 100644
--- a/dlls/ntdll/tests/error.c
+++ b/dlls/ntdll/tests/error.c
@@ -910,6 +910,7 @@ static void run_error_tests(void)
cmp2(STATUS_SXS_WRONG_SECTION_TYPE, ERROR_SXS_WRONG_SECTION_TYPE);
cmp2(STATUS_SXS_THREAD_QUERIES_DISABLED, ERROR_SXS_THREAD_QUERIES_DISABLED);
cmp2(STATUS_SXS_PROCESS_DEFAULT_ALREADY_SET, ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET);
+ cmp2(STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE,ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE);
cmp2(STATUS_REDIRECTOR_STARTED, ERROR_SERVICE_ALREADY_RUNNING);
cmp2(STATUS_AUDITING_DISABLED, ERROR_AUDITING_DISABLED);
cmp2(STATUS_CLUSTER_NODE_ALREADY_UP, ERROR_CLUSTER_NODE_ALREADY_UP);
diff --git a/include/ntstatus.h b/include/ntstatus.h
index 8f4bb18..1eaae2d 100644
--- a/include/ntstatus.h
+++ b/include/ntstatus.h
@@ -1187,6 +1187,24 @@
#define STATUS_SXS_PROCESS_TERMINATION_REQUESTED ((NTSTATUS) 0xC0150013)
#define STATUS_SXS_CORRUPT_ACTIVATION_STACK ((NTSTATUS) 0xC0150014)
#define STATUS_SXS_CORRUPTION ((NTSTATUS) 0xC0150015)
+#define STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE ((NTSTATUS) 0xC0150016)
+#define STATUS_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME ((NTSTATUS) 0xC0150017)
+#define STATUS_SXS_IDENTITY_DUPLICATE_ATTRIBUTE ((NTSTATUS) 0xC0150018)
+#define STATUS_SXS_IDENTITY_PARSE_ERROR ((NTSTATUS) 0xC0150019)
+#define STATUS_SXS_COMPONENT_STORE_CORRUPT ((NTSTATUS) 0xC015001A)
+#define STATUS_SXS_FILE_HASH_MISMATCH ((NTSTATUS) 0xC015001B)
+#define STATUS_SXS_MANIFEST_IDENTITY_SAME_BUT_CONTENTS_DIFFERENT ((NTSTATUS) 0xC015001C)
+#define STATUS_SXS_IDENTITIES_DIFFERENT ((NTSTATUS) 0xC015001D)
+#define STATUS_SXS_ASSEMBLY_IS_NOT_A_DEPLOYMENT ((NTSTATUS) 0xC015001E)
+#define STATUS_SXS_FILE_NOT_PART_OF_ASSEMBLY ((NTSTATUS) 0xC015001F)
+#define STATUS_ADVANCED_INSTALLER_FAILED ((NTSTATUS) 0xC0150020)
+#define STATUS_XML_ENCODING_MISMATCH ((NTSTATUS) 0xC0150021)
+#define STATUS_SXS_MANIFEST_TOO_BIG ((NTSTATUS) 0xC0150022)
+#define STATUS_SXS_SETTING_NOT_REGISTERED ((NTSTATUS) 0xC0150023)
+#define STATUS_SXS_TRANSACTION_CLOSURE_INCOMPLETE ((NTSTATUS) 0xC0150024)
+#define STATUS_SXS_PRIMITIVE_INSTALLER_FAILED ((NTSTATUS) 0xC0150025)
+#define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026)
+#define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027)
#define DBG_EXCEPTION_HANDLED ((NTSTATUS) 0x00010001)
#define DBG_CONTINUE ((NTSTATUS) 0x00010002)
diff --git a/include/winerror.h b/include/winerror.h
index a2089b6..0f2041d 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -1654,6 +1654,10 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
#define ERROR_SXS_THREAD_QUERIES_DISABLED 14010
#define ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET 14011
#define ERROR_SXS_CORRUPTION 14083
+#define ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_VALUE 14090
+#define ERROR_SXS_INVALID_IDENTITY_ATTRIBUTE_NAME 14091
+#define ERROR_SXS_IDENTITY_DUPLICATE_ATTRIBUTE 14092
+#define ERROR_SXS_IDENTITY_PARSE_ERROR 14093
#define ERROR_MUI_FILE_NOT_FOUND 15100
#define ERROR_MUI_INVALID_FILE 15101
#define ERROR_MUI_INVALID_RC_CONFIG 15102
--
Best Regards, André Hentschel
More information about the wine-patches
mailing list