wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-01-28 22:04:43 -08:00
Code Issues Packages Projects Releases Wiki Activity

ntdll-Junction_Points: Fix compilation on MacOS.

Browse Source
This commit is contained in:
Erich E. Hoover 2021-03-02 20:26:41 -06:00 committed by Zebediah Figura
parent 0b1ffe4b94
commit a2ca43d98b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,18 +1,18 @@
From 030f5dc385e009c1074817bc0ec528ac81e02737 Mon Sep 17 00:00:00 2001
From 1b9189f1aecf65f2ab73b5e26a1707e11c7d1926 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 | 74 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/tests/file.c | 9 +++--
2 files changed, 80 insertions(+), 3 deletions(-)
dlls/mountmgr.sys/device.c | 80 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/tests/file.c | 9 ++++-
2 files changed, 86 insertions(+), 3 deletions(-)
diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index dd2c7d70759..00cca81e9ad 100644
index dd2c7d70759..171dc6ea592 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -31,6 +31,15 @@
@@ -31,6 +31,21 @@
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
#endif
@ -24,11 +24,17 @@ index dd2c7d70759..00cca81e9ad 100644
+#endif
+#ifdef HAVE_SYS_VFS_H
+# include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
#define NONAMELESSUNION
@@ -1828,6 +1837,68 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
@@ -1828,6 +1843,68 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
return status;
}
@ -97,7 +103,7 @@ index dd2c7d70759..00cca81e9ad 100644
static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
{
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
@@ -1916,7 +1987,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
@@ -1916,7 +1993,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
memcpy(info->FileSystemName, fat32W, info->FileSystemNameLength);
break;
default: