[PATCH] ntdll: Update the STATUS_NO_SUCH_DEVICE error mapping.
Francois Gouget
fgouget at codeweavers.com
Fri May 28 07:28:32 CDT 2021
Windows 10 >= 1909 returns ERROR_NO_SUCH_DEVICE.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
---
This should clear out:
https://test.winehq.org/data/patterns.html#ntdll:error
---
dlls/ntdll/make_errors | 2 +-
dlls/ntdll/tests/error.c | 2 +-
include/winerror.h | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/make_errors b/dlls/ntdll/make_errors
index 5b7885e0427..a994808c2ef 100755
--- a/dlls/ntdll/make_errors
+++ b/dlls/ntdll/make_errors
@@ -246,7 +246,7 @@ my %error_map = qw(
STATUS_INVALID_CID ERROR_INVALID_PARAMETER
STATUS_TIMER_NOT_CANCELED ERROR_TIMER_NOT_CANCELED
STATUS_INVALID_PARAMETER ERROR_INVALID_PARAMETER
- STATUS_NO_SUCH_DEVICE ERROR_FILE_NOT_FOUND
+ STATUS_NO_SUCH_DEVICE ERROR_NO_SUCH_DEVICE
STATUS_NO_SUCH_FILE ERROR_FILE_NOT_FOUND
STATUS_INVALID_DEVICE_REQUEST ERROR_INVALID_FUNCTION
STATUS_END_OF_FILE ERROR_HANDLE_EOF
diff --git a/dlls/ntdll/tests/error.c b/dlls/ntdll/tests/error.c
index c812aa779cc..8f099e6903a 100644
--- a/dlls/ntdll/tests/error.c
+++ b/dlls/ntdll/tests/error.c
@@ -247,7 +247,7 @@ static void run_error_tests(void)
cmp(STATUS_RESOURCE_TYPE_NOT_FOUND, ERROR_RESOURCE_TYPE_NOT_FOUND);
cmp(STATUS_RESOURCE_NAME_NOT_FOUND, ERROR_RESOURCE_NAME_NOT_FOUND);
cmp(STATUS_RESOURCE_LANG_NOT_FOUND, ERROR_RESOURCE_LANG_NOT_FOUND);
- cmp(STATUS_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND);
+ cmp3(STATUS_NO_SUCH_DEVICE, ERROR_NO_SUCH_DEVICE, ERROR_FILE_NOT_FOUND);
cmp(STATUS_NO_SUCH_FILE, ERROR_FILE_NOT_FOUND);
cmp(STATUS_INVALID_DEVICE_REQUEST, ERROR_INVALID_FUNCTION);
cmp2(STATUS_VOLUME_NOT_UPGRADED, ERROR_INVALID_FUNCTION);
diff --git a/include/winerror.h b/include/winerror.h
index 86f7aace68e..8765e177029 100644
--- a/include/winerror.h
+++ b/include/winerror.h
@@ -410,6 +410,7 @@ static inline HRESULT HRESULT_FROM_WIN32(unsigned int x)
#define ERROR_THREAD_MODE_NOT_BACKGROUND 401
#define ERROR_PROCESS_MODE_ALREADY_BACKGROUND 402
#define ERROR_PROCESS_MODE_NOT_BACKGROUND 403
+#define ERROR_NO_SUCH_DEVICE 433
#define ERROR_PNP_QUERY_REMOVE_DEVICE_TIMEOUT 480
#define ERROR_PNP_QUERY_REMOVE_RELATED_DEVICE_TIMEOUT 481
#define ERROR_PNP_QUERY_REMOVE_UNRELATED_DEVICE_TIMEOUT 482
--
2.20.1
More information about the wine-devel
mailing list