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

Updated ntdll-Junction_Points patchset

Browse Source 
Changed dependencies to allow ntdll-Junction_Points to be applied
on top of wine.
This commit is contained in:
Alistair Leslie-Hughes
2019-04-23 10:42:19 +10:00
parent 9e53a45319
commit a0708adf42
26 changed files with 319 additions and 222 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 da5af62afac8508b3323098bb004b87ffde77701 Mon Sep 17 00:00:00 2001
From 935694ac40ed4b264ef0ede519bd8b9b2f1f28de 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 c80d9b1..745bf2b 100644
index 1905733..6f0429e 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
@@ -85,6 +85,7 @@ AC_ARG_WITH(udev, AS_HELP_STRING([--without-udev],[do not use udev (plug an
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 c80d9b1..745bf2b 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]),
@@ -703,6 +704,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
@@ -698,6 +699,17 @@ AC_CHECK_HEADERS([libprocstat.h],,,
#include <sys/socket.h>
#endif])
@ -44,12 +44,12 @@ index c80d9b1..745bf2b 100644
AC_SUBST(DLLFLAGS,"-D_REENTRANT")
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 4960e91..5957c44 100644
index 919eaea..1ffa675 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -122,6 +122,22 @@ mode_t FILE_umask = 0;
static const WCHAR ntfsW[] = {'N','T','F','S'};
@@ -127,6 +127,22 @@ static const WCHAR ntfsW[] = {'N','T','F','S'};
NTSTATUS FILE_DecodeSymlink(const char *unix_src, char *unix_dest, USHORT *unix_dest_len,
DWORD *tag, ULONG *flags, BOOL *is_dir);
+/* Match the Samba conventions for storing DOS file attributes */
+#define SAMBA_XATTR_DOS_ATTRIB XATTR_USER_PREFIX "DOSATTRIB"
@ -70,7 +70,7 @@ index 4960e91..5957c44 100644
/* fetch the attributes of a file */
static inline ULONG get_file_attributes( const struct stat *st )
{
@@ -139,12 +155,16 @@ static inline ULONG get_file_attributes( const struct stat *st )
@@ -144,12 +160,16 @@ static inline ULONG get_file_attributes( const struct stat *st )
/* get the stat info and file attributes for a file (by file descriptor) */
int fd_get_file_info( int fd, struct stat *st, ULONG *attr )
{
@ -89,10 +89,10 @@ index 4960e91..5957c44 100644
}
diff --git a/include/wine/port.h b/include/wine/port.h
index 2f6e9eb..b21d045 100644
index 19c8682..eaa23bc 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -335,6 +335,14 @@ int usleep (unsigned int useconds);
@@ -344,6 +344,14 @@ int usleep (unsigned int useconds);
extern int mkstemps(char *template, int suffix_len);
@ -108,10 +108,10 @@ index 2f6e9eb..b21d045 100644
#if defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__))
diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index a2e96d1..b975418 100644
index db27249..790fd96 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -108,4 +108,6 @@ C_SRCS = \
@@ -109,4 +109,6 @@ C_SRCS = \
usleep.c \
utf8.c \
wctomb.c \

16
patches/ntdll-DOS_Attributes/0002-ntdll-Implement-retrieving-DOS-attributes-in-NtQuery.patch
View File

@ -1,7 +1,7 @@
From f6b156b5bccac55814eeee4fd10013ea3a76f384 Mon Sep 17 00:00:00 2001
From 938f92470a25e590523f78912301177580c61955 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Wed, 20 Aug 2014 16:04:34 -0600
Subject: ntdll: Implement retrieving DOS attributes in
Subject: [PATCH] ntdll: Implement retrieving DOS attributes in
NtQuery[Full]AttributesFile and NtQueryDirectoryFile.
---
@ -11,10 +11,10 @@ Subject: ntdll: Implement retrieving DOS attributes in
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 83d07e2..b977e45 100644
index 1ffa675..78ab0ec 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -152,7 +152,8 @@ int fd_get_file_info( int fd, struct stat *st, ULONG *attr )
@@ -176,7 +176,8 @@ int fd_get_file_info( int fd, struct stat *st, ULONG *attr )
/* get the stat info and file attributes for a file (by name) */
int get_file_info( const char *path, struct stat *st, ULONG *attr )
{
@ -24,8 +24,8 @@ index 83d07e2..b977e45 100644
*attr = 0;
ret = lstat( path, st );
@@ -165,6 +166,9 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT;
@@ -193,6 +194,9 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
st->st_mode = (st->st_mode & ~S_IFMT) | (is_dir ? S_IFDIR : S_IFREG);
}
*attr |= get_file_attributes( st );
+ len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 );
@ -35,10 +35,10 @@ index 83d07e2..b977e45 100644
}
diff --git a/include/wine/port.h b/include/wine/port.h
index 521246b..7977eb9 100644
index eaa23bc..de6b995 100644
--- a/include/wine/port.h
+++ b/include/wine/port.h
@@ -370,6 +370,7 @@ extern int _spawnvp(int mode, const char *cmdname, const char * const argv[]);
@@ -351,6 +351,7 @@ extern int mkstemps(char *template, int suffix_len);
#endif
extern int xattr_fget( int filedes, const char *name, void *value, size_t size );

18
patches/ntdll-DOS_Attributes/0007-ntdll-Perform-the-Unix-style-hidden-file-check-withi.patch
View File

@ -1,4 +1,4 @@
From 92eada413d3bc9e95d1d00478daf9a06fd3e587e Mon Sep 17 00:00:00 2001
From a0b58c6366226c2079da60a4b5d757da4bd728b6 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Wed, 20 Aug 2014 11:26:48 -0600
Subject: [PATCH] ntdll: Perform the Unix-style hidden file check within the
@ -11,7 +11,7 @@ Subject: [PATCH] ntdll: Perform the Unix-style hidden file check within the
3 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c
index 4655a634..511a345 100644
index c853470..56737b8 100644
--- a/dlls/ntdll/directory.c
+++ b/dlls/ntdll/directory.c
@@ -1267,17 +1267,17 @@ static DWORD WINAPI init_options( RTL_RUN_ONCE *once, void *param, void **contex
@ -50,11 +50,11 @@ index 4655a634..511a345 100644
}
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 3a96d3b..b2b88d6 100644
index 0dbf612..5926c99 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -218,6 +218,10 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT;
@@ -227,6 +227,10 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
st->st_mode = (st->st_mode & ~S_IFMT) | (is_dir ? S_IFDIR : S_IFREG);
}
*attr |= get_file_attributes( st );
+ /* convert Unix-style hidden files to a DOS hidden file attribute */
@ -64,7 +64,7 @@ index 3a96d3b..b2b88d6 100644
len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, hexattr, sizeof(hexattr)-1 );
if (len == -1) return ret;
*attr |= get_file_xattr( hexattr, len );
@@ -3023,8 +3027,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
@@ -3447,8 +3451,6 @@ NTSTATUS WINAPI NtQueryFullAttributesFile( const OBJECT_ATTRIBUTES *attr,
info->AllocationSize = std.AllocationSize;
info->EndOfFile = std.EndOfFile;
info->FileAttributes = basic.FileAttributes;
@ -73,7 +73,7 @@ index 3a96d3b..b2b88d6 100644
}
RtlFreeAnsiString( &unix_name );
}
@@ -3052,11 +3054,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC
@@ -3476,11 +3478,7 @@ NTSTATUS WINAPI NtQueryAttributesFile( const OBJECT_ATTRIBUTES *attr, FILE_BASIC
else if (!S_ISREG(st.st_mode) && !S_ISDIR(st.st_mode))
status = STATUS_INVALID_INFO_CLASS;
else
@ -86,10 +86,10 @@ index 3a96d3b..b2b88d6 100644
}
else WARN("%s not found (%x)\n", debugstr_us(attr->ObjectName), status );
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index 01a7636..2a8c67b 100644
index b762ceb..32db62e 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -160,7 +160,7 @@ extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr,
@@ -164,7 +164,7 @@ extern NTSTATUS fill_file_info( const struct stat *st, ULONG attr, void *ptr,
FILE_INFORMATION_CLASS class ) DECLSPEC_HIDDEN;
extern NTSTATUS server_get_unix_name( HANDLE handle, ANSI_STRING *unix_name ) DECLSPEC_HIDDEN;
extern void init_directories(void) DECLSPEC_HIDDEN;

14
patches/ntdll-DOS_Attributes/0008-ntdll-Always-store-SAMBA_XATTR_DOS_ATTRIB-when-path-.patch
View File

@ -1,7 +1,7 @@
From 5a419298c1871c0d71a2892d6ac4b517288b3563 Mon Sep 17 00:00:00 2001
From 1fe0fcb904363d5ac59b8d30a918f62f622b78b7 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 14 Jan 2016 23:09:19 +0100
Subject: ntdll: Always store SAMBA_XATTR_DOS_ATTRIB when path could be
Subject: [PATCH] ntdll: Always store SAMBA_XATTR_DOS_ATTRIB when path could be
interpreted as hidden.
---
@ -9,11 +9,11 @@ Subject: ntdll: Always store SAMBA_XATTR_DOS_ATTRIB when path could be
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 50b0042..b38698f 100644
index 5926c99..cbd2531 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -213,12 +213,15 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
if (S_ISDIR( st->st_mode )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT;
@@ -227,12 +227,15 @@ int get_file_info( const char *path, struct stat *st, ULONG *attr )
st->st_mode = (st->st_mode & ~S_IFMT) | (is_dir ? S_IFDIR : S_IFREG);
}
*attr |= get_file_attributes( st );
- /* convert Unix-style hidden files to a DOS hidden file attribute */
@ -32,7 +32,7 @@ index 50b0042..b38698f 100644
*attr |= get_file_xattr( hexattr, len );
return ret;
}
@@ -231,7 +234,7 @@ NTSTATUS set_file_info( const char *path, ULONG attr )
@@ -245,7 +248,7 @@ NTSTATUS set_file_info( const char *path, ULONG attr )
/* Note: unix mode already set when called this way */
attr &= ~FILE_ATTRIBUTE_NORMAL; /* do not store everything, but keep everything Samba can use */
len = sprintf( hexattr, "0x%x", attr );
@ -42,5 +42,5 @@ index 50b0042..b38698f 100644
else
xattr_remove( path, SAMBA_XATTR_DOS_ATTRIB );
--
2.6.4
1.9.1