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 b70f0d723a768b9fdc89cd835b23718f6cd61f31

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-05-25 08:47:46 +10:00
parent 51557bbf6e
commit 06caa35518
6 changed files with 17 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/ntdll-DOS_Attributes/0001-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch
View File

@@ -1,7 +1,7 @@
From 0cd366658b21ef8afbc34daea08cacacf04039d4 Mon Sep 17 00:00:00 2001
From 81cc694e55e5febfc063f6b323fea0546c75984a Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Tue, 19 Aug 2014 22:10:49 -0600
Subject: [PATCH 1/8] ntdll: Implement retrieving DOS attributes in
Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
NtQueryInformationFile.
---
@@ -14,18 +14,18 @@ Subject: [PATCH 1/8] ntdll: Implement retrieving DOS attributes in
create mode 100644 libs/port/xattr.c
diff --git a/configure.ac b/configure.ac
index 2e99320..a912870 100644
index dfa130e..affa3f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,7 @@ 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 (plug and play support)]))
@@ -83,6 +83,7 @@ AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug an
AC_ARG_WITH(v4l, AS_HELP_STRING([--without-v4l],[do not use v4l1 (v4l support)]))
AC_ARG_WITH(vkd3d, AS_HELP_STRING([--without-vkd3d],[do not use vkd3d (Direct3D 12 support)]))
AC_ARG_WITH(vulkan, AS_HELP_STRING([--without-vulkan],[do not use Vulkan]))
+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]),
@@ -700,6 +701,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -716,6 +717,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@@ -44,7 +44,7 @@ index 2e99320..a912870 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index b9d2425..dd03ae3 100644
index 8e4f52c..af6f6a4 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -122,6 +122,22 @@ mode_t FILE_umask = 0;
@@ -89,7 +89,7 @@ index b9d2425..dd03ae3 100644
}
diff --git a/include/wine/port.h b/include/wine/port.h
index fb7251e..056c9ae 100644
index a3b6c6f..f3b6eb5 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -391,6 +391,14 @@ extern int mkstemps(char *template, int suffix_len);
@@ -108,7 +108,7 @@ index fb7251e..056c9ae 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index c87b99d..111807a 100644
index c87b99de..111807a 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -106,4 +106,5 @@ C_SRCS = \
@@ -164,5 +164,5 @@ index 0000000..94b7713
+#endif
+}
--
2.7.4
1.9.1