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 91494ae6f2e47254d15a47e292ff569f3b400be6.

Browse Source
This commit is contained in:
Zebediah Figura
2021-08-11 22:25:44 -05:00
parent 16476ce303
commit 1bc4da9d59
8 changed files with 58 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/ntdll-Junction_Points/0017-ntdll-Allow-set_file_times_precise-to-work-on-repars.patch
View File

@@ -1,4 +1,4 @@
From 27c9c2851bb3629cb47134efe3a2162bca80aca6 Mon Sep 17 00:00:00 2001
From 9d760a7c86cff579f870d78d0d5b4a6624b22324 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Sun, 22 Nov 2020 22:37:33 -0700
Subject: [PATCH] ntdll: Allow set_file_times_precise to work on reparse
@@ -11,12 +11,12 @@ Subject: [PATCH] ntdll: Allow set_file_times_precise to work on reparse
3 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/configure.ac b/configure.ac
index f80fbd737ef..fb71556cfa3 100644
index 4b7d72063d8..0a15b7b92ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2223,7 +2223,8 @@ AC_CHECK_FUNCS(\
sigprocmask \
@@ -2224,7 +2224,8 @@ AC_CHECK_FUNCS(\
symlink \
sysinfo \
tcdrain \
- thr_kill2
+ thr_kill2 \
@@ -65,10 +65,10 @@ index 490d5160761..2449ee54799 100644
CloseHandle(handle);
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index a84062df272..185f7e3bbeb 100644
index 2ee9288f500..2f0ec520288 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -1731,6 +1731,14 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
@@ -1728,6 +1728,14 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
}
@@ -83,7 +83,7 @@ index a84062df272..185f7e3bbeb 100644
#if defined(__ANDROID__) && !defined(HAVE_FUTIMENS)
static int futimens( int fd, const struct timespec spec[2] )
{
@@ -1746,7 +1754,7 @@ static int futimens( int fd, const struct timespec spec[2] )
@@ -1743,7 +1751,7 @@ static int futimens( int fd, const struct timespec spec[2] )
static BOOL set_file_times_precise( int fd, const LARGE_INTEGER *mtime,
const LARGE_INTEGER *atime, NTSTATUS *status )
{
@@ -92,7 +92,7 @@ index a84062df272..185f7e3bbeb 100644
struct timespec tv[2];
tv[0].tv_sec = tv[1].tv_sec = 0;
@@ -1762,10 +1770,16 @@ static BOOL set_file_times_precise( int fd, const LARGE_INTEGER *mtime,
@@ -1759,10 +1767,16 @@ static BOOL set_file_times_precise( int fd, const LARGE_INTEGER *mtime,
tv[1].tv_nsec = (mtime->QuadPart % 10000000) * 100;
}
#ifdef __APPLE__