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 7be72ce2a708ec88aa2362352f37db30529251c4.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-11-02 10:28:15 +11:00
parent acb054627a
commit bd2608b12c
4 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 5a529bea97ee22d51f07f9d3cd77c00ea5292878 Mon Sep 17 00:00:00 2001
From 0dfebc8cb8ed9804c6616fe7eec519b7c3e7ea13 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, 447 insertions(+), 19 deletions(-)
diff --git a/configure.ac b/configure.ac
index 628cce28815..2adf40c0ef1 100644
index 16c4c33d816..e492a707a48 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2018,6 +2018,8 @@ AC_CHECK_FUNCS(\
@@ -2061,6 +2061,8 @@ AC_CHECK_FUNCS(\
prctl \
proc_pidinfo \
sched_yield \
@@ -26,7 +26,7 @@ index 628cce28815..2adf40c0ef1 100644
setprogname \
sigprocmask \
diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in
index 3b1cdb54f9f..6eb4690f8e0 100644
index 89e4d5bb579..07688a5fcf6 100644
--- a/dlls/ntdll/Makefile.in
+++ b/dlls/ntdll/Makefile.in
@@ -4,7 +4,7 @@ UNIXLIB = ntdll.so
@@ -36,8 +36,8 @@ index 3b1cdb54f9f..6eb4690f8e0 100644
-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
EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x7bc00000
x86_64_EXTRADLLFLAGS = -nodefaultlibs -Wl,--image-base,0x170000000
EXTRADLLFLAGS = -nodefaultlibs
i386_EXTRADLLFLAGS = -Wl,--image-base,0x7bc00000
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 98d9e6b3b0a..93e50bd6952 100644
--- a/dlls/ntdll/tests/file.c
@@ -586,10 +586,10 @@ index 6b73d9dc7e8..52b85cfc6d1 100644
TRACE("FSCTL_SET_SPARSE: Ignoring request\n");
io->Information = 0;
diff --git a/include/Makefile.in b/include/Makefile.in
index 1c04f9a298b..7a2c9f96c1b 100644
index 28ac4b3f2dc..7c69ddbfddf 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -563,6 +563,7 @@ SOURCES = \
@@ -564,6 +564,7 @@ SOURCES = \
ntdef.h \
ntdsapi.h \
ntgdi.h \
@@ -598,5 +598,5 @@ index 1c04f9a298b..7a2c9f96c1b 100644
ntquery.h \
ntsecapi.h \
--
2.37.2
2.38.1