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 9642f35922b79cebacdc774eb54619e389ccd531.

Browse Source
This commit is contained in:
Zebediah Figura
2020-02-05 17:42:46 -06:00
parent 0d7a4f0c73
commit 991bebfee7
9 changed files with 83 additions and 274 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,4 +1,4 @@
From 77a43be1f24d8fbbdb500b6ee89b20673f9704e7 Mon Sep 17 00:00:00 2001
From f9369606cc5094d85f35a5d27f0bcaab4ebd7d68 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] ntdll: Implement retrieving DOS attributes in
@@ -14,7 +14,7 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
create mode 100644 libs/port/xattr.c
diff --git a/configure.ac b/configure.ac
index f6d520c59ef..19dadd2063c 100644
index cc77413d2..a4742777b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,7 @@ AC_ARG_WITH(unwind, AS_HELP_STRING([--without-unwind],[do not use the libunwi
@@ -25,7 +25,7 @@ index f6d520c59ef..19dadd2063c 100644
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]),
@@ -704,6 +705,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -686,6 +687,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@@ -44,7 +44,7 @@ index f6d520c59ef..19dadd2063c 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 8aaf7b982ba..ae8fd77bea8 100644
index cce5811c9..046a05859 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -127,6 +127,22 @@ static const WCHAR ntfsW[] = {'N','T','F','S'};
@@ -71,7 +71,7 @@ index 8aaf7b982ba..ae8fd77bea8 100644
static inline ULONG get_file_attributes( const struct stat *st )
{
diff --git a/include/wine/port.h b/include/wine/port.h
index 92a3a362ddb..8fec3a34591 100644
index a7ddd4a05..62d8112a9 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -356,6 +356,14 @@ int usleep (unsigned int useconds);
@@ -90,19 +90,19 @@ index 92a3a362ddb..8fec3a34591 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index b050686ba0f..447c1939078 100644
index 33445fa76..021c36b34 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -110,4 +110,5 @@ C_SRCS = \
@@ -102,4 +102,5 @@ C_SRCS = \
symlink.c \
usleep.c \
utf8.c \
wctomb.c \
- wctype.c
+ wctype.c \
+ xattr.c
diff --git a/libs/port/xattr.c b/libs/port/xattr.c
new file mode 100644
index 00000000000..94b77132bbf
index 000000000..94b77132b
--- /dev/null
+++ b/libs/port/xattr.c
@@ -0,0 +1,39 @@
@@ -146,5 +146,5 @@ index 00000000000..94b77132bbf
+#endif
+}
--
2.24.1
2.25.0