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 59987bc9ecdd0dbafd768a95c21a14884bc77c07

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-04-18 14:54:07 +10:00
parent 8d4d0a840e
commit 029c249e78
8 changed files with 70 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 96702e031b7b541dab331e1cdaa965e0c8eb0cfe Mon Sep 17 00:00:00 2001
From 5f8071c1a278c96b1fd0a83b4b9924ed69520e5e 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,10 +14,10 @@ Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
create mode 100644 libs/port/xattr.c
diff --git a/configure.ac b/configure.ac
index 670056a86..437fe32af 100644
index af9175dfaad..4cbd823f5e0 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
@@ -89,6 +89,7 @@ AC_ARG_WITH(usb, AS_HELP_STRING([--without-usb],[do not use the libusb lib
AC_ARG_WITH(v4l2, AS_HELP_STRING([--without-v4l2],[do not use v4l2 (video capture)]))
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]))
@@ -25,7 +25,7 @@ index 670056a86..437fe32af 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]),
@@ -686,6 +687,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -699,6 +700,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@@ -44,10 +44,10 @@ index 670056a86..437fe32af 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 6900b9c85..bdf7faedb 100644
index 583da3a236e..f8227f10163 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -127,6 +127,22 @@ static const WCHAR ntfsW[] = {'N','T','F','S'};
@@ -126,6 +126,22 @@ mode_t FILE_umask = 0;
NTSTATUS FILE_DecodeSymlink(const char *unix_src, char *unix_dest, USHORT *unix_dest_len,
DWORD *tag, ULONG *flags, BOOL *is_dir);
@@ -71,10 +71,10 @@ index 6900b9c85..bdf7faedb 100644
static inline ULONG get_file_attributes( const struct stat *st )
{
diff --git a/include/wine/port.h b/include/wine/port.h
index a7ddd4a05..62d8112a9 100644
index 5a805c11993..c0efa12fbde 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -356,6 +356,14 @@ int usleep (unsigned int useconds);
@@ -361,6 +361,14 @@ int usleep (unsigned int useconds);
extern int mkstemps(char *template, int suffix_len);
@@ -90,11 +90,11 @@ index a7ddd4a05..62d8112a9 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index f6fbc2c26..40006a690 100644
index 695938ae434..9796bc40537 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -26,4 +26,5 @@ C_SRCS = \
stubs.c \
@@ -23,4 +23,5 @@ C_SRCS = \
strnlen.c \
symlink.c \
usleep.c \
- wctype.c
@@ -102,7 +102,7 @@ index f6fbc2c26..40006a690 100644
+ xattr.c
diff --git a/libs/port/xattr.c b/libs/port/xattr.c
new file mode 100644
index 000000000..94b77132b
index 00000000000..94b77132bbf
--- /dev/null
+++ b/libs/port/xattr.c
@@ -0,0 +1,39 @@
@@ -146,5 +146,5 @@ index 000000000..94b77132b
+#endif
+}
--
2.25.0
2.25.1