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 73b75afe55144727775e8a865f82ed843c19b3bb.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2025-06-19 11:06:28 +10:00
parent a044166651
commit 5cc4d90333
5 changed files with 64 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/ntdll-NtDevicePath/0001-ntdll-Implement-opening-files-through-nt-device-path.patch
View File

@@ -1,4 +1,4 @@
From 18540f65cde320c499eb8bcb630ade9f9fa977fe Mon Sep 17 00:00:00 2001
From 41e1d1b92a179f00f391919b47732e7eab9f8337 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.
@@ -9,10 +9,10 @@ Subject: [PATCH] ntdll: Implement opening files through nt device paths.
2 files changed, 156 insertions(+), 3 deletions(-)
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index af67e8d75bf..608b64a32ad 100644
index 16489f4b29c..11769021b32 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -137,18 +137,22 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved )
@@ -139,18 +139,22 @@ static void WINAPI apc( void *arg, IO_STATUS_BLOCK *iosb, ULONG reserved )
static void create_file_test(void)
{
@@ -36,7 +36,7 @@ index af67e8d75bf..608b64a32ad 100644
OBJECT_ATTRIBUTES attr;
IO_STATUS_BLOCK io;
UNICODE_STRING nameW;
@@ -328,6 +332,25 @@ static void create_file_test(void)
@@ -320,6 +324,25 @@ static void create_file_test(void)
status = pNtQueryFullAttributesFile( &attr, &info );
ok( status == STATUS_OBJECT_NAME_INVALID,
"query %s failed %lx\n", wine_dbgstr_w(nameW.Buffer), status );
@@ -63,10 +63,10 @@ index af67e8d75bf..608b64a32ad 100644
static void open_file_test(void)
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index ba9cd8d9031..c3ddf72b44b 100644
index a39079efa97..c76d91cdf68 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -4494,7 +4494,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( FILE_OBJECT *fileobj, char **unix_
@@ -4688,7 +4688,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( FILE_OBJECT *fileobj, char **unix_
/******************************************************************************
@@ -75,16 +75,16 @@ index ba9cd8d9031..c3ddf72b44b 100644
*
* Convert a file name from NT namespace to Unix namespace.
*
@@ -4502,7 +4502,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( FILE_OBJECT *fileobj, char **unix_
@@ -4696,7 +4696,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.
*/
-NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, UINT disposition )
-static NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, UINT disposition )
+NTSTATUS nt_to_unix_file_name_internal( const OBJECT_ATTRIBUTES *attr, char **name_ret, UINT disposition )
{
HANDLE rootdir = attr->RootDirectory;
enum server_fd_type type;
@@ -4581,6 +4581,136 @@ reparse:
@@ -4775,6 +4775,136 @@ reparse:
}
@@ -222,5 +222,5 @@ index ba9cd8d9031..c3ddf72b44b 100644
* wine_nt_to_unix_file_name
*
--
2.39.1
2.47.2