Another fix for macos builds

This commit is contained in:
Alistair Leslie-Hughes 2021-11-30 20:35:23 +11:00
parent 2056903cdf
commit 3b7c98ebf1

View File

@ -1,21 +1,22 @@
From 6a6d039719ed3867b0fdfe8d750e260de0f29628 Mon Sep 17 00:00:00 2001
From bb018ca21a1ddf8c1bae06c0312dc72f4d2b381e 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 | 81 +++++++++++++++++++++++++++++++++++++-
dlls/mountmgr.sys/device.c | 83 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/tests/file.c | 9 ++++-
2 files changed, 87 insertions(+), 3 deletions(-)
2 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index d4f77012bbe..77577910103 100644
index d4f77012bbe..bb53d5fa3b2 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -23,6 +23,21 @@
@@ -23,6 +23,23 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#if 0 /* These need to be moved to the unixlib */
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
+#endif
@ -30,11 +31,12 @@ index d4f77012bbe..77577910103 100644
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#endif
#define NONAMELESSUNION
@@ -1615,6 +1630,69 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
@@ -1615,6 +1632,69 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
return status;
}
@ -104,7 +106,7 @@ index d4f77012bbe..77577910103 100644
static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
{
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
@@ -1695,7 +1773,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
@@ -1695,7 +1775,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
break;
default:
fsname = L"NTFS";