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 52ba1b498a9694daf804c9aea99c788bb4e753a3.

Browse Source
This commit is contained in:
Zebediah Figura
2021-07-01 16:56:20 -05:00
parent 8988a92bee
commit a7ae280480
15 changed files with 70 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch
View File

@@ -1,4 +1,4 @@
From a83181801d5248f7e228810bfe0a829a81be345f Mon Sep 17 00:00:00 2001
From 1370cc026e08ebc0f9eb0314b86cc38220c22041 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 junction point creation.
@@ -14,10 +14,10 @@ Signed-off-by: Erich E. Hoover <erich.e.hoover@gmail.com>
create mode 100644 include/ntifs.h
diff --git a/configure.ac b/configure.ac
index 71991bd3938..7553b22e76d 100644
index 596809f9f6a..e9a7c2d6088 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2219,6 +2219,8 @@ AC_CHECK_FUNCS(\
@@ -2209,6 +2209,8 @@ AC_CHECK_FUNCS(\
proc_pidinfo \
pwrite \
readlink \
@@ -27,7 +27,7 @@ index 71991bd3938..7553b22e76d 100644
setproctitle \
setprogname \
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 2c1835e3ff0..54e06a3f126 100644
index 46037546e6e..7a01e947e13 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -38,6 +38,7 @@
@@ -38,7 +38,7 @@ index 2c1835e3ff0..54e06a3f126 100644
#ifndef IO_COMPLETION_ALL_ACCESS
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
@@ -5233,6 +5234,105 @@ static void test_mailslot_name(void)
@@ -5322,6 +5323,105 @@ static void test_mailslot_name(void)
CloseHandle( device );
}
@@ -144,7 +144,7 @@ index 2c1835e3ff0..54e06a3f126 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -5305,5 +5405,6 @@ START_TEST(file)
@@ -5394,5 +5494,6 @@ START_TEST(file)
test_ioctl();
test_query_ea();
test_flush_buffers_file();
@@ -152,7 +152,7 @@ index 2c1835e3ff0..54e06a3f126 100644
test_mailslot_name();
}
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index 700ee717294..492838d9031 100644
index 94140d1cfbc..3699934caf8 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -36,6 +36,7 @@
@@ -215,7 +215,7 @@ index 700ee717294..492838d9031 100644
/* get space from the current directory data buffer, allocating a new one if necessary */
static void *get_dir_data_space( struct dir_data *data, unsigned int size )
{
@@ -5950,6 +5982,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
@@ -5931,6 +5963,116 @@ static void ignore_server_ioctl_struct_holes( ULONG code, const void *in_buffer,
}
@@ -332,7 +332,7 @@ index 700ee717294..492838d9031 100644
/******************************************************************************
* NtFsControlFile (NTDLL.@)
*/
@@ -6032,6 +6174,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
@@ -6013,6 +6155,23 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap
break;
}
@@ -357,13 +357,13 @@ index 700ee717294..492838d9031 100644
TRACE("FSCTL_SET_SPARSE: Ignoring request\n");
io->Information = 0;
diff --git a/include/Makefile.in b/include/Makefile.in
index 9822bce6bdd..00a1be0b74e 100644
index 61a74a210c9..e4a3a83ecc8 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -538,6 +538,7 @@ SOURCES = \
ntddvdeo.h \
@@ -541,6 +541,7 @@ SOURCES = \
ntdef.h \
ntdsapi.h \
ntgdi.h \
+ ntifs.h \
ntlsa.h \
ntquery.h \