[ros-diffs] [reactos] 01/01: [CDFS_NEW] Fix diff

[Pierre Schweitzer]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=94298313c03c791d1ed47…

commit 94298313c03c791d1ed472125ebf86f4258d2354
Author: Pierre Schweitzer <pierre(a)reactos.org>
AuthorDate: Tue Nov 7 07:54:15 2017 +0100

    [CDFS_NEW] Fix diff
---
 drivers/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 a4bface2e4..cc84eb55c2 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)