wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 5ec6b8f807f61ee77b9a96d94798c8e3f3db7af4

Browse Source
This commit is contained in:
Zebediah Figura
2018-02-21 21:27:12 -06:00
parent 7332557b2a
commit cf19a5d6d6
11 changed files with 107 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,8 @@
From d37699c2b0eb6e5e74b9b040ee6a5791f4c9112c Mon Sep 17 00:00:00 2001
From 8cd8b854400ea2eb725de23bbd5b510a278c9635 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: ntdll: Implement retrieving DOS attributes in NtQueryInformationFile.
Subject: [PATCH 1/8] ntdll: Implement retrieving DOS attributes in
NtQueryInformationFile.
---
configure.ac | 12 ++++++++++++
@ -13,18 +14,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 8007469..2d6bd77 100644
index 0fb6863..9b88dfe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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]))
@@ -81,6 +81,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)]))
AC_ARG_WITH(sdl, AS_HELP_STRING([--without-sdl],[do not use SDL]))
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]),
@@ -669,6 +670,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -698,6 +699,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@ -41,9 +42,9 @@ index 8007469..2d6bd77 100644
+
dnl **** Check for working dll ****
AC_SUBST(dlldir,"\${libdir}/wine")
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 7fbde50..79fc363 100644
index b9d2425..dd03ae3 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -122,6 +122,22 @@ mode_t FILE_umask = 0;
@ -88,10 +89,10 @@ index 7fbde50..79fc363 100644
}
diff --git a/include/wine/port.h b/include/wine/port.h
index 2989b39..3219a8a 100644
index fb7251e..056c9ae 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -363,6 +363,14 @@ extern int mkstemps(char *template, int suffix_len);
@@ -391,6 +391,14 @@ extern int mkstemps(char *template, int suffix_len);
extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
#endif
@ -107,10 +108,10 @@ index 2989b39..3219a8a 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 9d7e44f..8b41050 100644
index c87b99d..111807a 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -104,4 +104,5 @@ C_SRCS = \
@@ -106,4 +106,5 @@ C_SRCS = \
symlink.c \
usleep.c \
utf8.c \
@ -163,5 +164,5 @@ index 0000000..94b7713
+#endif
+}
--
2.9.0
2.7.4