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 f374e9ccc8c9b9933520d006b879495bde4e7bb3.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-11-30 10:55:25 +11:00
parent edb3417124
commit 65ca056d29
4 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,22 +1,21 @@
From eb3264141add0ad12a6774b6ee10ba459e2a71e0 Mon Sep 17 00:00:00 2001
From 6a6d039719ed3867b0fdfe8d750e260de0f29628 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 | 82 +++++++++++++++++++++++++++++++++++++-
dlls/mountmgr.sys/device.c | 81 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/tests/file.c | 9 ++++-
2 files changed, 87 insertions(+), 4 deletions(-)
2 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index 2be8d8cfab6..fc32b57cf70 100644
index d4f77012bbe..77577910103 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -28,7 +28,21 @@
#include <fcntl.h>
#include <unistd.h>
#include <sys/time.h>
-#include <sys/types.h>
@@ -23,6 +23,21 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
+#endif
@@ -35,7 +34,7 @@ index 2be8d8cfab6..fc32b57cf70 100644
#define NONAMELESSUNION
@@ -1654,6 +1668,69 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
@@ -1615,6 +1630,69 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
return status;
}
@@ -105,16 +104,16 @@ index 2be8d8cfab6..fc32b57cf70 100644
static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
{
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
@@ -1742,7 +1819,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
memcpy(info->FileSystemName, fat32W, info->FileSystemNameLength);
@@ -1695,7 +1773,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
break;
default:
fsname = L"NTFS";
- info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES | FILE_PERSISTENT_ACLS;
+ info->FileSystemAttributes = FILE_CASE_PRESERVED_NAMES | FILE_PERSISTENT_ACLS
+ | get_fs_flags( volume );
info->MaximumComponentNameLength = 255;
info->FileSystemNameLength = min( sizeof(ntfsW), length - offsetof( FILE_FS_ATTRIBUTE_INFORMATION, FileSystemName ) );
memcpy(info->FileSystemName, ntfsW, info->FileSystemNameLength);
break;
}
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index c5b3b83802e..084398ba83d 100644
--- a/dlls/ntdll/tests/file.c