From 94298313c03c791d1ed472125ebf86f4258d2354 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Tue, 7 Nov 2017 07:54:15 +0100
Subject: [PATCH] [CDFS_NEW] Fix diff

---
 .../filesystems/cdfs_new/wdk_wnet_to_ros.diff | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
index a4bface2e44..cc84eb55c2e 100644
--- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
+++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff
@@ -147,6 +147,14 @@ Index: drivers/filesystems/cdfs_new/devctrl.c
 ===================================================================
 --- drivers/filesystems/cdfs_new/devctrl.c	(revision 34615)
 +++ drivers/filesystems/cdfs_new/devctrl.c	(working copy)
+@@ -27,6 +27,7 @@
+ //
+ 
+ NTSTATUS
++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
+ CdDevCtrlCompletionRoutine (
+     IN PDEVICE_OBJECT DeviceObject,
+     IN PIRP Irp,
 @@ -64,7 +64,7 @@
      PIO_STACK_LOCATION IrpSp;
      PIO_STACK_LOCATION NextIrpSp;
@@ -156,6 +164,14 @@ Index: drivers/filesystems/cdfs_new/devctrl.c
  
      PAGED_CODE();
  
+@@ -171,6 +172,7 @@
+ //
+ 
+ NTSTATUS
++NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
+ CdDevCtrlCompletionRoutine (
+     IN PDEVICE_OBJECT DeviceObject,
+     IN PIRP Irp,
 Index: drivers/filesystems/cdfs_new/close.c
 ===================================================================
 --- drivers/filesystems/cdfs_new/close.c	(revision 34615)
@@ -820,26 +836,6 @@ Index: drivers/filesystems/cdfs_new/cleanup.c
  
      //
      //  If appropriate, try to spark teardown by purging the volume.  Should
-Index: drivers/filesystems/cdfs_new/devctrl.c
-===================================================================
---- drivers/filesystems/cdfs_new/devctrl.c	(revision 34615)
-+++ drivers/filesystems/cdfs_new/devctrl.c	(working copy)
-@@ -27,6 +27,7 @@
- //
- 
- NTSTATUS
-+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
- CdDevCtrlCompletionRoutine (
-     IN PDEVICE_OBJECT DeviceObject,
-     IN PIRP Irp,
-@@ -171,6 +172,7 @@
- //
- 
- NTSTATUS
-+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
- CdDevCtrlCompletionRoutine (
-     IN PDEVICE_OBJECT DeviceObject,
-     IN PIRP Irp,
 Index: drivers/filesystems/cdfs_new/strucsup.c
 ===================================================================
 --- drivers/filesystems/cdfs_new/strucsup.c	(revision 34615)