André Hentschel : ntdll: Update error code mapping.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 877a4e61364a1b9c4cc0f2b21f6bdd2c5a38ef0f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=877a4e61364a1b9c4cc0f2b21f...

Author: André Hentschel 
Date:   Sun Mar 21 22:42:55 2010 +0100

ntdll: Update error code mapping.

---

dlls/ntdll/error.c       |    8 ++++----
 dlls/ntdll/tests/error.c |    8 +++++---
 include/winerror.h       |    1 +
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/dlls/ntdll/error.c b/dlls/ntdll/error.c
index 6d29329..86b7492 100644
--- a/dlls/ntdll/error.c
+++ b/dlls/ntdll/error.c
@@ -241,7 +241,7 @@ static const DWORD table_80000001[39] =
    0,                                      /* 80000007 (STATUS_WAKE_SYSTEM_DEBUGGER) */
    0,                                      /* 80000008 */
    0,                                      /* 80000009 */
-   0,                                      /* 8000000a (STATUS_HANDLES_CLOSED) */
+   ERROR_HANDLES_CLOSED,                   /* 8000000a (STATUS_HANDLES_CLOSED) */
    ERROR_NO_INHERITANCE,                   /* 8000000b (STATUS_NO_INHERITANCE) */
    0,                                      /* 8000000c (STATUS_GUID_SUBSTITUTION_MADE) */
    ERROR_PARTIAL_COPY,                     /* 8000000d (STATUS_PARTIAL_COPY) */
@@ -834,8 +834,8 @@ static const DWORD table_c0000202[396] =
    0,                                      /* c0000227 (STATUS_RECOVERY_FAILURE) */
    0,                                      /* c0000228 (STATUS_STACK_OVERFLOW_READ) */
    ERROR_INVALID_PARAMETER,                /* c0000229 (STATUS_FAIL_CHECK) */
-   STATUS_DUPLICATE_OBJECTID,              /* c000022a (STATUS_DUPLICATE_OBJECTID) */
-   STATUS_OBJECTID_EXISTS,                 /* c000022b (STATUS_OBJECTID_EXISTS) */
+   ERROR_OBJECT_ALREADY_EXISTS,            /* c000022a (STATUS_DUPLICATE_OBJECTID) */
+   ERROR_OBJECT_ALREADY_EXISTS,            /* c000022b (STATUS_OBJECTID_EXISTS) */
    0,                                      /* c000022c (STATUS_CONVERT_TO_LARGE) */
    ERROR_RETRY,                            /* c000022d (STATUS_RETRY) */
    0,                                      /* c000022e (STATUS_FOUND_OUT_OF_SCOPE) */
@@ -875,7 +875,7 @@ static const DWORD table_c0000202[396] =
    0,                                      /* c0000250 (STATUS_INSUFFICIENT_LOGON_INFO) */
    0,                                      /* c0000251 (STATUS_BAD_DLL_ENTRYPOINT) */
    0,                                      /* c0000252 (STATUS_BAD_SERVICE_ENTRYPOINT) */
-   ERROR_INTERNAL_ERROR,                   /* c0000253 (STATUS_LPC_REPLY_LOST) */
+   ERROR_CONNECTION_ABORTED,               /* c0000253 (STATUS_LPC_REPLY_LOST) */
    0,                                      /* c0000254 (STATUS_IP_ADDRESS_CONFLICT1) */
    0,                                      /* c0000255 (STATUS_IP_ADDRESS_CONFLICT2) */
    0,                                      /* c0000256 (STATUS_REGISTRY_QUOTA_LIMIT) */
diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c
index 0f52ecb..01c165d 100644
--- a/dlls/ntdll/tests/error.c
+++ b/dlls/ntdll/tests/error.c
@@ -33,15 +33,16 @@
 #include "winternl.h"

/* FIXME!!! this test checks only mappings, defined by MSDN
- * It is necessary to add other mappings and to test them up to Windows XP.
+ * It is necessary to add other mappings and to test them
+ * up to the latest Windows platform.
  *
  * Some Windows platforms don't know about all the mappings, and in such
  * cases they return somewhat strange results (Win98) or a generic error
  * like ERROR_MR_MID_NOT_FOUND (NT4). Our tests have to know about these to
  * not fail, but we would very much prefer Wine not to return such garbage.
- * To you can pass the 'strict' option to this test to force it to only check
+ * So you can pass the 'strict' option to this test to force it to only check
  * results against the first listed value. This test should pass in strict
- * mode on the latest Windows platform (currently XP) and in Wine.
+ * mode on the latest Windows platform and in Wine.
  * (of course older Windows platforms will fail to pass the strict mode)
  */

@@ -167,6 +168,7 @@ static void run_error_tests(void)
     cmp(STATUS_INTEGER_OVERFLOW,                 ERROR_ARITHMETIC_OVERFLOW);
     cmp(STATUS_BUFFER_OVERFLOW,                  ERROR_MORE_DATA);
     cmp(STATUS_NO_MORE_FILES,                    ERROR_NO_MORE_FILES);
+    cmp2(STATUS_HANDLES_CLOSED,                  ERROR_HANDLES_CLOSED);
     cmp(STATUS_NO_INHERITANCE,                   ERROR_NO_INHERITANCE);
     cmp(STATUS_NO_MORE_EAS,                      ERROR_NO_MORE_ITEMS);
     cmp(STATUS_NO_MORE_ENTRIES,                  ERROR_NO_MORE_ITEMS);
diff --git a/include/winerror.h b/include/winerror.h
index 6a56f74..f6c7b0f 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -306,6 +306,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
 #define ERROR_ARITHMETIC_OVERFLOW                          534
 #define ERROR_PIPE_CONNECTED                               535
 #define ERROR_PIPE_LISTENING                               536
+#define ERROR_HANDLES_CLOSED                               676
 #define ERROR_EA_ACCESS_DENIED                             994
 #define ERROR_OPERATION_ABORTED                            995
 #define ERROR_IO_INCOMPLETE                                996