From 141b05e4ff1e5f6a0c28ac3277b3c666180aafed Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Fri, 9 Sep 2016 22:59:00 +0200 Subject: [PATCH] Rebase against 01581bfc48161c3c55027334b1ecb9e909873a6b. --- ...-retrieving-DOS-attributes-in-NtQuery.patch | 18 +++++++++--------- patches/patchinstall.sh | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch b/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch index 602cb818..f28de160 100644 --- a/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch +++ b/patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch @@ -1,4 +1,4 @@ -From ed679be63daa15df932fa6aae550af4c11a4a66d Mon Sep 17 00:00:00 2001 +From f01429e9c1944abbd2930a3c9567d5a702f47853 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Tue, 19 Aug 2014 22:10:49 -0600 Subject: ntdll: Implement retrieving DOS attributes in NtQueryInformationFile. @@ -13,18 +13,18 @@ Subject: ntdll: Implement retrieving DOS attributes in NtQueryInformationFile. create mode 100644 libs/port/xattr.c diff --git a/configure.ac b/configure.ac -index c9445e7..e118600 100644 +index 6f1516a..b2fcee3 100644 --- a/configure.ac +++ b/configure.ac -@@ -76,6 +76,7 @@ AC_ARG_WITH(pulse, AS_HELP_STRING([--without-pulse],[do not use PulseAudio s - AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner support)])) +@@ -77,6 +77,7 @@ AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (scanner AC_ARG_WITH(tiff, AS_HELP_STRING([--without-tiff],[do not use TIFF])) + AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (play and play support)])) AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)])) +AC_ARG_WITH(xattr, AS_HELP_STRING([--without-xattr],[do not use xattr (security attributes support)])) AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use the Xcomposite extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xcomposite_h=no; fi]) AC_ARG_WITH(xcursor, AS_HELP_STRING([--without-xcursor],[do not use the Xcursor extension]), -@@ -674,6 +675,17 @@ AC_CHECK_HEADERS([libprocstat.h],,, +@@ -669,6 +670,17 @@ AC_CHECK_HEADERS([libprocstat.h],,, #include #endif]) @@ -43,10 +43,10 @@ index c9445e7..e118600 100644 AC_SUBST(dlldir,"\${libdir}/wine") diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index a17151d..1f132ee 100644 +index 7fbde50..79fc363 100644 --- a/dlls/ntdll/file.c +++ b/dlls/ntdll/file.c -@@ -117,6 +117,22 @@ mode_t FILE_umask = 0; +@@ -122,6 +122,22 @@ mode_t FILE_umask = 0; static const WCHAR ntfsW[] = {'N','T','F','S'}; @@ -69,7 +69,7 @@ index a17151d..1f132ee 100644 /* fetch the attributes of a file */ static inline ULONG get_file_attributes( const struct stat *st ) { -@@ -134,12 +150,16 @@ static inline ULONG get_file_attributes( const struct stat *st ) +@@ -139,12 +155,16 @@ static inline ULONG get_file_attributes( const struct stat *st ) /* get the stat info and file attributes for a file (by file descriptor) */ int fd_get_file_info( int fd, struct stat *st, ULONG *attr ) { @@ -163,5 +163,5 @@ index 0000000..94b7713 +#endif +} -- -2.7.0 +2.9.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 32d06e31..f55f0106 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "7c06f1c218a2ecb1f2dda2cfb97b3a2c5b7f01e8" + echo "01581bfc48161c3c55027334b1ecb9e909873a6b" } # Show version information