wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against e80df2d2d54a3f16389bea77f6863cc1c05d6251.

Browse Source
This commit is contained in:
Zebediah Figura
2020-06-18 19:12:14 -05:00
parent 02913f754f
commit d799e8fd82
24 changed files with 293 additions and 1011 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patches/ntdll-Status_Mapping/0001-ntdll-Return-STATUS_INVALID_DEVICE_REQUEST-when-tryi.patch
View File

@@ -1,19 +1,31 @@
From 3e4e21b4e66f85143a029374c58a66ae54f792e8 Mon Sep 17 00:00:00 2001
From fda39199958fc169372b7dfee2077e2d8ecfa350 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 13 Sep 2015 17:16:07 +0200
Subject: ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to call
NtReadFile on directory.
Subject: [PATCH] ntdll: Return STATUS_INVALID_DEVICE_REQUEST when trying to
call NtReadFile on directory.
---
dlls/ntdll/file.c | 2 +-
dlls/ntdll/tests/file.c | 1 -
dlls/ntdll/unix/file.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 8f89ba5..67a13b2 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -459,7 +459,7 @@ NTSTATUS FILE_GetNtStatus(void)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 184b7cdad59..6f830da85a2 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -171,7 +171,6 @@ static void create_file_test(void)
U(io).Status = 0xdeadbeef;
offset.QuadPart = 0;
status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL );
- todo_wine
ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status );
if (status == STATUS_PENDING)
{
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index ca6899b50f5..d160f1a050e 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -348,7 +348,7 @@ NTSTATUS errno_to_status( int err )
case EACCES: return STATUS_ACCESS_DENIED;
case ENOTDIR: return STATUS_OBJECT_PATH_NOT_FOUND;
case ENOENT: return STATUS_OBJECT_NAME_NOT_FOUND;
@@ -22,18 +34,6 @@ index 8f89ba5..67a13b2 100644
case EMFILE:
case ENFILE: return STATUS_TOO_MANY_OPENED_FILES;
case EINVAL: return STATUS_INVALID_PARAMETER;
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index b8f1847..63dd4f9 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -206,7 +206,6 @@ static void create_file_test(void)
U(io).Status = 0xdeadbeef;
offset.QuadPart = 0;
status = pNtReadFile( dir, NULL, NULL, NULL, &io, buf, sizeof(buf), &offset, NULL );
- todo_wine
ok( status == STATUS_INVALID_DEVICE_REQUEST || status == STATUS_PENDING, "NtReadFile error %08x\n", status );
if (status == STATUS_PENDING)
{
--
2.6.0
2.27.0