Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
877a4e61
Commit
877a4e61
authored
15 years ago
by
André Zwing
Committed by
Alexandre Julliard
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
ntdll: Update error code mapping.
parent
8a6d1df8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/ntdll/error.c
+4
-4
4 additions, 4 deletions
dlls/ntdll/error.c
dlls/ntdll/tests/error.c
+5
-3
5 additions, 3 deletions
dlls/ntdll/tests/error.c
include/winerror.h
+1
-0
1 addition, 0 deletions
include/winerror.h
with
10 additions
and
7 deletions
dlls/ntdll/error.c
+
4
−
4
View file @
877a4e61
...
...
@@ -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
_OBJECT
ID
_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) */
...
...
This diff is collapsed.
Click to expand it.
dlls/ntdll/tests/error.c
+
5
−
3
View file @
877a4e61
...
...
@@ -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.
*
T
o you can pass the 'strict' option to this test to force it to only check
*
S
o 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
);
...
...
This diff is collapsed.
Click to expand it.
include/winerror.h
+
1
−
0
View file @
877a4e61
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment