From e4da7ecc50b59b9f8283d84b3707fa69c595a57d Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Mon, 6 Nov 2017 19:55:34 +0100 Subject: [PATCH 1/1] [CDFS_NEW] Remove a broken change (lol?!) that prevented the driver to properly work in ROS... Dropping SEH doesn't mean dropping code! --- drivers/filesystems/cdfs_new/cdprocs.h | 4 ++-- drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs_new/cdprocs.h index 4cb7da20982..921f5237200 100755 --- a/drivers/filesystems/cdfs_new/cdprocs.h +++ b/drivers/filesystems/cdfs_new/cdprocs.h @@ -1889,8 +1889,8 @@ CdCommonPnp ( // Implemented in Pnp.c #define GetExceptionCode() 0 #define AbnormalTermination() 0 -#define try_return(S) { goto try_exit; } -#define try_leave(S) { leave; } +#define try_return(S) { S; goto try_exit; } +#define try_leave(S) { S; leave; } // diff --git a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff index 46023ebfb93..b785ad91072 100644 --- a/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff +++ b/drivers/filesystems/cdfs_new/wdk_wnet_to_ros.diff @@ -564,10 +564,8 @@ Index: drivers/filesystems/cdfs_new/cdprocs.h +#define GetExceptionCode() 0 +#define AbnormalTermination() 0 --#define try_return(S) { S; goto try_exit; } --#define try_leave(S) { S; leave; } -+#define try_return(S) { goto try_exit; } -+#define try_leave(S) { leave; } + #define try_return(S) { S; goto try_exit; } + #define try_leave(S) { S; leave; } + // -- 2.17.1