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 67d0509f2f523935b0f4dbd3a713125252b37627.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-11-26 12:49:39 +11:00
parent 61120ad0dd
commit 7655d14b6a
5 changed files with 44 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch
View File

@@ -1,21 +1,22 @@
From 0066234ca48eee5b847de57d552966b8fbb14f95 Mon Sep 17 00:00:00 2001
From eb3264141add0ad12a6774b6ee10ba459e2a71e0 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Sat, 12 Dec 2020 17:28:31 -0700
Subject: [PATCH] kernel32: Advertise junction point support.
---
dlls/mountmgr.sys/device.c | 80 +++++++++++++++++++++++++++++++++++++-
dlls/mountmgr.sys/device.c | 82 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/tests/file.c | 9 ++++-
2 files changed, 86 insertions(+), 3 deletions(-)
2 files changed, 87 insertions(+), 4 deletions(-)
diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 04e8fe3c0f5..c8e7d6bf088 100644
index 2be8d8cfab6..fc32b57cf70 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -31,6 +31,21 @@
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
@@ -28,7 +28,21 @@
#include <fcntl.h>
#include <unistd.h>
#include <sys/time.h>
-#include <sys/types.h>
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
+#endif
@@ -34,13 +35,14 @@ index 04e8fe3c0f5..c8e7d6bf088 100644
#define NONAMELESSUNION
@@ -1902,6 +1917,68 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
@@ -1654,6 +1668,69 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
return status;
}
+static DWORD get_fs_flags( struct volume *volume )
+{
+#if defined(__NR_renameat2) || defined(RENAME_SWAP)
+#if 0
+/*#if defined(__NR_renameat2) || defined(RENAME_SWAP)*/
+#if defined(HAVE_FSTATFS)
+ struct statfs stfs;
+#elif defined(HAVE_FSTATVFS)
@@ -103,7 +105,7 @@ index 04e8fe3c0f5..c8e7d6bf088 100644
static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
{
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
@@ -1990,7 +2067,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
@@ -1742,7 +1819,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
memcpy(info->FileSystemName, fat32W, info->FileSystemNameLength);
break;
default:
@@ -142,5 +144,5 @@ index c5b3b83802e..084398ba83d 100644
{
skip("File system does not support reparse points.\n");
--
2.30.2
2.33.0