wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 4c06d354b8093a8979316186474213bbc1c68904.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2025-02-25 10:37:42 +11:00
parent f5190ef988
commit 2439dab96c
4 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-creating-reparse-points.patch
View File

@@ -1,4 +1,4 @@
From 7b9165576a8ba0e317c280c9bedd2137fb745149 Mon Sep 17 00:00:00 2001
From 7a8f477fc1ceaa548dd8f4deef4225472e6bb749 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 16 Jan 2014 20:56:49 -0700
Subject: [PATCH] ntdll: Add support for creating reparse points.
@@ -13,10 +13,10 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
5 files changed, 451 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index 0368b661e61..eb7f8223b51 100644
index 0ad1393b34a..18933198d12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2082,6 +2082,8 @@ AC_CHECK_FUNCS(\
@@ -2079,6 +2079,8 @@ AC_CHECK_FUNCS(\
prctl \
sched_getcpu \
sched_yield \
@@ -26,12 +26,12 @@ index 0368b661e61..eb7f8223b51 100644
setprogname \
sigprocmask \
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 37bd6c86e31..f9a15d28ed2 100644
index de525ea29e3..72c89f92e3e 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -4,7 +4,7 @@ UNIXLIB = ntdll.so
IMPORTLIB = ntdll
IMPORTS = $(MUSL_PE_LIBS) winecrt0
@@ -5,7 +5,7 @@ IMPORTLIB = ntdll
IMPORTS = $(TOMCRYPT_PE_LIBS) $(MUSL_PE_LIBS) winecrt0
EXTRAINCL = $(TOMCRYPT_PE_CFLAGS)
UNIX_CFLAGS = $(UNWIND_CFLAGS)
-UNIX_LIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS)
+UNIX_LIBS = $(IOKIT_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(RT_LIBS) $(PTHREAD_LIBS) $(UNWIND_LIBS) $(I386_LIBS) $(PROCSTAT_LIBS) -lm
@@ -39,7 +39,7 @@ index 37bd6c86e31..f9a15d28ed2 100644
EXTRADLLFLAGS = -nodefaultlibs
i386_EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 02bdf67796d..63b5ebcab54 100644
index cc0afdbdb64..00f90552e84 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -38,6 +38,7 @@
@@ -50,7 +50,7 @@ index 02bdf67796d..63b5ebcab54 100644
#ifndef IO_COMPLETION_ALL_ACCESS
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
@@ -5952,32 +5953,154 @@ static void test_mailslot_name(void)
@@ -6028,32 +6029,154 @@ static void test_mailslot_name(void)
CloseHandle( device );
}
@@ -222,7 +222,7 @@ index 02bdf67796d..63b5ebcab54 100644
}
static void test_set_io_completion_ex(void)
@@ -6117,6 +6240,6 @@ START_TEST(file)
@@ -6193,6 +6316,6 @@ START_TEST(file)
test_ioctl();
test_query_ea();
test_flush_buffers_file();
@@ -231,7 +231,7 @@ index 02bdf67796d..63b5ebcab54 100644
+ test_mailslot_name();
}
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 8bc69557057..00ac7377dd4 100644
index faef06ae084..a47c3d90df4 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -36,6 +36,8 @@
@@ -389,7 +389,7 @@ index 8bc69557057..00ac7377dd4 100644
static BOOL fd_is_mount_point( int fd, const struct stat *st )
{
struct stat parent;
@@ -3416,6 +3536,181 @@ done:
@@ -3441,6 +3561,181 @@ done:
}
@@ -571,7 +571,7 @@ index 8bc69557057..00ac7377dd4 100644
/******************************************************************************
* lookup_unix_name
*
@@ -6246,6 +6541,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
@@ -6271,6 +6566,13 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
break;
}
@@ -602,5 +602,5 @@ index 980235abdc9..90248b4897c 100644
{
UCHAR DataBuffer[1];
--
2.45.2
2.47.2