From 818025ecc8006c19ce6f6139b21294795f51bafd Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:46:43 +0100 Subject: [PATCH] [CDFS_NEW] Remove a no longer required build hack --- drivers/filesystems/cdfs_new/fsctrl.c | 2 +- drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs_new/fsctrl.c index 95dda725a61..31c4965f9f1 100755 --- a/drivers/filesystems/cdfs_new/fsctrl.c +++ b/drivers/filesystems/cdfs_new/fsctrl.c @@ -2295,7 +2295,7 @@ Return Value: Status = ObReferenceObjectByHandle( Handle, 0, - IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibility with exported kernel data */ + *IoFileObjectType, KernelMode, (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ NULL ); diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index 9221a7f0d7d..ed075d0a1a2 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -935,12 +935,9 @@ Index: drivers/filesystems/cdfs_new/fsctrl.c CdIsVolumeDirty ( IN PIRP_CONTEXT IrpContext, IN PIRP Irp -@@ -2294,9 +2295,9 @@ - - Status = ObReferenceObjectByHandle( Handle, +@@ -2296,9 +2297,9 @@ 0, -- *IoFileObjectType, -+ IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibility with exported kernel data */ + *IoFileObjectType, KernelMode, - &FileToMarkBad, + (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ -- 2.17.1