Rebase against 182e2887b7c01d464f296bd7aa1335f147d8e514.

This commit is contained in:
Elizabeth Figura
2025-07-18 17:38:40 -05:00
parent 54295e8aaa
commit 5e73b4fe8b
4 changed files with 21 additions and 47 deletions

View File

@@ -1,15 +1,15 @@
From 41e1d1b92a179f00f391919b47732e7eab9f8337 Mon Sep 17 00:00:00 2001
From efd73d7778d8c083337bda1ad162618841c368e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 30 Nov 2021 16:32:34 +0300
Subject: [PATCH] ntdll: Implement opening files through nt device paths.
---
dlls/ntdll/tests/file.c | 25 +++++++-
dlls/ntdll/unix/file.c | 134 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 156 insertions(+), 3 deletions(-)
dlls/ntdll/unix/file.c | 135 +++++++++++++++++++++++++++++++++++++++-
2 files changed, 157 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 16489f4b29c..11769021b32 100644
index 25381caf313..7f048572e03 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -139,18 +139,22 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved )
@@ -63,10 +63,10 @@ index 16489f4b29c..11769021b32 100644
static void open_file_test(void)
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index a39079efa97..c76d91cdf68 100644
index 542a314ea81..68587cbef11 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -4688,7 +4688,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( FILE_OBJECT *fileobj, char **unix_
@@ -4593,7 +4593,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( FILE_OBJECT *fileobj, char **unix_
/******************************************************************************
@@ -75,7 +75,7 @@ index a39079efa97..c76d91cdf68 100644
*
* Convert a file name from NT namespace to Unix namespace.
*
@@ -4696,7 +4696,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( FILE_OBJECT *fileobj, char **unix_
@@ -4601,7 +4601,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( FILE_OBJECT *fileobj, char **unix_
* element doesn't have to exist; in that case STATUS_NO_SUCH_FILE is
* returned, but the unix name is still filled in properly.
*/
@@ -84,7 +84,7 @@ index a39079efa97..c76d91cdf68 100644
{
HANDLE rootdir = attr->RootDirectory;
enum server_fd_type type;
@@ -4775,6 +4775,136 @@ reparse:
@@ -4680,6 +4680,137 @@ reparse:
}
@@ -218,8 +218,9 @@ index a39079efa97..c76d91cdf68 100644
+ return status;
+}
+
/******************************************************************************
* wine_nt_to_unix_file_name
+
/******************************************************************
* collapse_path
*
--
2.47.2

View File

@@ -1,2 +1,3 @@
Fixes: [37487] Resolve \\SystemRoot\\ prefix when opening files
Fixes: Implement opening files through nt device paths
Depends: ntdll-Junction_Points