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 c7f323107b3b956d206d8d0ee28851d60f19841c

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2019-03-26 12:56:49 +11:00
parent d963a250c9
commit 0d4d90ee80
7 changed files with 77 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 51bdea50efa6951b86a91236c57fb8a95737d79d Mon Sep 17 00:00:00 2001
From fbf186429a62b1bd076322ce394cc6a6322ca825 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
@@ -8,13 +8,13 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
configure.ac | 12 ++++++++++++
dlls/ntdll/file.c | 22 +++++++++++++++++++++-
include/wine/port.h | 8 ++++++++
libs/port/Makefile.in | 3 ++-
libs/port/Makefile.in | 4 +++-
libs/port/xattr.c | 39 +++++++++++++++++++++++++++++++++++++++
5 files changed, 82 insertions(+), 2 deletions(-)
5 files changed, 83 insertions(+), 2 deletions(-)
create mode 100644 libs/port/xattr.c
diff --git a/configure.ac b/configure.ac
index 4967604..375d1d3 100644
index 55d3dd0..552a94d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -84,6 +84,7 @@ AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug an
@@ -25,7 +25,7 @@ index 4967604..375d1d3 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]),
@@ -695,6 +696,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -703,6 +704,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@@ -44,7 +44,7 @@ index 4967604..375d1d3 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index e8775a3..ed25182 100644
index d0aaadf..27d2ce0 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 e8775a3..ed25182 100644
}
diff --git a/include/wine/port.h b/include/wine/port.h
index d23e2b0..2be2afe 100644
index 2f6e9eb..b21d045 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -335,6 +335,14 @@ int usleep (unsigned int useconds);
@@ -108,16 +108,17 @@ index d23e2b0..2be2afe 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 86b9022..b09dc54 100644
index ef3b23f..1c09fb5 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -102,4 +102,5 @@ C_SRCS = \
symlink.c \
@@ -106,4 +106,6 @@ C_SRCS = \
usleep.c \
utf8.c \
- wctomb.c
+ wctomb.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 0000000..94b7713