Author: jgardou Date: Mon May 23 20:07:45 2016 New Revision: 71388
URL: http://svn.reactos.org/svn/reactos?rev=71388&view=rev Log: [CDFS_NEW] - "Convert" to PSEH2 + unix compilation friendliness - Use
Modified: branches/TransitionPte/drivers/filesystems/CMakeLists.txt branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c branches/TransitionPte/drivers/filesystems/cdfs_new/close.c branches/TransitionPte/drivers/filesystems/cdfs_new/create.c branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/read.c branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c
Modified: branches/TransitionPte/drivers/filesystems/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/CMakeLists.txt [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/CMakeLists.txt [iso-8859-1] Mon May 23 20:07:45 2016 @@ -1,5 +1,6 @@
-add_subdirectory(cdfs) +#add_subdirectory(cdfs) +add_subdirectory(cdfs_new) add_subdirectory(ext2) add_subdirectory(fastfat) #add_subdirectory(fastfat_new)
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/allocsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -44,7 +44,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -149,7 +149,7 @@ // Use a try finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // We use a loop to perform the lookup. If we don't find the mapping in the @@ -296,7 +296,7 @@ FirstPass = FALSE; }
- } finally { + } _SEH2_FINALLY {
if (CleanupParent) {
@@ -311,7 +311,7 @@ }
if (UnlockFcb) { CdUnlockFcb( IrpContext, Fcb ); } - } + } _SEH2_END
return; }
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cachesup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -94,7 +94,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Create the internal stream. The Vpb should be pointing at our volume @@ -272,7 +272,7 @@ } }
- } finally { + } _SEH2_FINALLY {
// // Cleanup any dirent structures we may have used. @@ -306,7 +306,7 @@ }
CdUnlockFcb( IrpContext, Fcb ); - } + } _SEH2_END
return; }
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cddata.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -17,7 +17,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
#ifdef CD_SANITY BOOLEAN CdTestTopLevel = TRUE; @@ -259,7 +259,7 @@ // Use a try-except to handle the exception cases. //
- try { + _SEH2_TRY {
// // If the IrpContext is NULL then this is the first pass through @@ -398,10 +398,10 @@ CdCompleteRequest( IrpContext, Irp, Status ); }
- } except( CdExceptionFilter( IrpContext, GetExceptionInformation() )) { - - Status = CdProcessException( IrpContext, Irp, GetExceptionCode() ); - } + } _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _exception_info() )) { + + Status = CdProcessException( IrpContext, Irp, _exception_code() ); + } _SEH2_END
} while (Status == STATUS_CANT_WAIT);
@@ -653,7 +653,7 @@ // Note that (children of) CdFsdPostRequest can raise (Mdl allocation). //
- try { + _SEH2_TRY {
if (ExceptionCode == STATUS_CANT_WAIT) {
@@ -670,10 +670,10 @@ } } } - except( CdExceptionFilter( IrpContext, GetExceptionInformation() )) { + _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _exception_info() )) {
- ExceptionCode = GetExceptionCode(); - } + ExceptionCode = _exception_code(); + } _SEH2_END
// // If we posted the request or our caller will retry then just return here.
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cdinit.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cdprocs.h [iso-8859-1] Mon May 23 20:07:45 2016 @@ -28,9 +28,11 @@ #endif
#include "nodetype.h" -#include "Cd.h" -#include "CdStruc.h" -#include "CdData.h" +#include "cd.h" +#include "cdstruc.h" +#include "cddata.h" + +#include <pseh/pseh2.h>
//**** x86 compiler bug **** @@ -44,30 +46,28 @@ // Here are the different pool tags. //
-/* ReactOS Change: GCC doesn't understand this, use TAG macro */ -#include <reactos/helper.h> -#define TAG_CCB TAG('c','c','d','C') // Ccb -#define TAG_CDROM_TOC TAG('c','t','d','C') // TOC -#define TAG_DIRENT_NAME TAG('n','d','d','C') // CdName in dirent -#define TAG_ENUM_EXPRESSION TAG('e','e','d','C') // Search expression for enumeration -#define TAG_FCB_DATA TAG('d','f','d','C') // Data Fcb -#define TAG_FCB_INDEX TAG('i','f','d','C') // Index Fcb -#define TAG_FCB_NONPAGED TAG('n','f','d','C') // Nonpaged Fcb -#define TAG_FCB_TABLE TAG('t','f','d','C') // Fcb Table entry -#define TAG_FILE_NAME TAG('n','F','d','C') // Filename buffer -#define TAG_GEN_SHORT_NAME TAG('s','g','d','C') // Generated short name -#define TAG_IO_BUFFER TAG('f','b','d','C') // Temporary IO buffer -#define TAG_IO_CONTEXT TAG('o','i','d','C') // Io context for async reads -#define TAG_IRP_CONTEXT TAG('c','i','d','C') // Irp Context -#define TAG_IRP_CONTEXT_LITE TAG('l','i','d','C') // Irp Context lite -#define TAG_MCB_ARRAY TAG('a','m','d','C') // Mcb array -#define TAG_PATH_ENTRY_NAME TAG('n','P','d','C') // CdName in path entry -#define TAG_PREFIX_ENTRY TAG('e','p','d','C') // Prefix Entry -#define TAG_PREFIX_NAME TAG('n','p','d','C') // Prefix Entry name -#define TAG_SPANNING_PATH_TABLE TAG('p','s','d','C') // Buffer for spanning path table -#define TAG_UPCASE_NAME TAG('n','u','d','C') // Buffer for upcased name -#define TAG_VOL_DESC TAG('d','v','d','C') // Buffer for volume descriptor -#define TAG_VPB TAG('p','v','d','C') // Vpb allocated in filesystem +#define TAG_CCB 'ccdC' // Ccb +#define TAG_CDROM_TOC 'ctdC' // TOC +#define TAG_DIRENT_NAME 'nddC' // CdName in dirent +#define TAG_ENUM_EXPRESSION 'eedC' // Search expression for enumeration +#define TAG_FCB_DATA 'dfdC' // Data Fcb +#define TAG_FCB_INDEX 'ifdC' // Index Fcb +#define TAG_FCB_NONPAGED 'nfdC' // Nonpaged Fcb +#define TAG_FCB_TABLE 'tfdC' // Fcb Table entry +#define TAG_FILE_NAME 'nFdC' // Filename buffer +#define TAG_GEN_SHORT_NAME 'sgdC' // Generated short name +#define TAG_IO_BUFFER 'fbdC' // Temporary IO buffer +#define TAG_IO_CONTEXT 'oidC' // Io context for async reads +#define TAG_IRP_CONTEXT 'cidC' // Irp Context +#define TAG_IRP_CONTEXT_LITE 'lidC' // Irp Context lite +#define TAG_MCB_ARRAY 'amdC' // Mcb array +#define TAG_PATH_ENTRY_NAME 'nPdC' // CdName in path entry +#define TAG_PREFIX_ENTRY 'epdC' // Prefix Entry +#define TAG_PREFIX_NAME 'npdC' // Prefix Entry name +#define TAG_SPANNING_PATH_TABLE 'psdC' // Buffer for spanning path table +#define TAG_UPCASE_NAME 'nudC' // Buffer for upcased name +#define TAG_VOL_DESC 'dvdC' // Buffer for volume descriptor +#define TAG_VPB 'pvdC' // Vpb allocated in filesystem
// // Tag all of our allocations if tagging is turned on @@ -1883,16 +1883,9 @@ // // #define try_return(S) { S; goto try_exit; } // -/* ReactOS Change: Remove SEH */ -#define try -#define leave goto exitLabel; -#define finally if (0) goto exitLabel; exitLabel: -#define except(x) while (0) -#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; _SEH2_LEAVE; }
//
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/cleanup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -159,7 +159,7 @@ // Use a try-finally to facilitate cleanup. //
- //try { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + _SEH2_TRY {
// // Case on the type of open that we are trying to cleanup. @@ -279,7 +279,7 @@
IoRemoveShareAccess( FileObject, &Fcb->ShareAccess );
- //} finally { /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + } _SEH2_FINALLY {
CdReleaseFcb( IrpContext, Fcb );
@@ -287,7 +287,7 @@
FsRtlNotifyVolumeEvent( FileObject, FSRTL_VOLUME_UNLOCK ); } - //} /* ReactOS Change: Manual removal of SEH since macros to hack around it don't allow multiple SEH usage within one function */ + } _SEH2_END
// // If appropriate, try to spark teardown by purging the volume. Should @@ -305,19 +305,19 @@
CdAcquireCdData( IrpContext);
- try { + _SEH2_TRY {
CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); VcbAcquired = TRUE;
CdPurgeVolume( IrpContext, Vcb, FALSE );
- } finally { + } _SEH2_FINALLY {
if (VcbAcquired) { CdReleaseVcb( IrpContext, Vcb ); }
CdReleaseCdData( IrpContext); - } + } _SEH2_END }
//
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/close.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/close.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/close.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -42,7 +42,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/create.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/create.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/create.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -222,13 +222,15 @@
PAGED_CODE();
+ DbgPrint("CdCommonCreate(%p)\n", IrpSp->FileObject); + // // If we were called with our file system device object instead of a // volume device object, just complete this request with STATUS_SUCCESS. //
if (IrpContext->Vcb == NULL) { - + DbgPrint("IrpContext->Vcb == NULL\n"); CdCompleteRequest( IrpContext, Irp, STATUS_SUCCESS ); return STATUS_SUCCESS; } @@ -315,7 +317,7 @@ // in the IrpContext will indicate whether we removed the // backslash. // - + DbgPrint("Avant CdNormalizeFileNames.\n"); Status = CdNormalizeFileNames( IrpContext, Vcb, OpenByFileId, @@ -357,7 +359,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Verify that the Vcb is not in an unusable condition. This routine @@ -490,6 +492,7 @@
if (RemainingName.FileName.Length == 0) {
+ DbgPrint("RemainingName.FileName.Length == 0\n"); // // If this is a file so verify the user didn't want to open // a directory. @@ -499,7 +502,7 @@
if (FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_TRAIL_BACKSLASH ) || FlagOn( IrpSp->Parameters.Create.Options, FILE_DIRECTORY_FILE )) { - + DbgPrint("STATUS_NOT_A_DIRECTORY.\n"); try_return( Status = STATUS_NOT_A_DIRECTORY ); }
@@ -574,7 +577,7 @@ //
if (!FlagOn( IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT )) { - + DbgPrint("IrpContext->Flags, IRP_CONTEXT_FLAG_WAIT\n"); CdRaiseStatus( IrpContext, STATUS_CANT_WAIT ); }
@@ -584,6 +587,7 @@
FinalName.VersionString.Length = 0;
+ DbgPrint("Avant la boucle.\n"); while (TRUE) {
ShortNameMatch = FALSE; @@ -761,7 +765,7 @@
try_return( Status = STATUS_ACCESS_DENIED ); } - + DbgPrint("CdOpenDirectoryFromPathEntry\n"); try_return( Status = CdOpenDirectoryFromPathEntry( IrpContext, IrpSp, Vcb, @@ -792,6 +796,7 @@ CdCleanupCompoundPathEntry( IrpContext, &CompoundPathEntry ); CleanupCompoundPathEntry = FALSE; } + DbgPrint("Apres la boucle.\n");
// // We need to scan the current directory for a matching file name @@ -890,6 +895,7 @@ // first and last dirents. //
+ DbgPrint("Avant CdOpenFileFromFileContext.\n"); try_return( Status = CdOpenFileFromFileContext( IrpContext, IrpSp, Vcb, @@ -901,7 +907,7 @@ RelatedCcb ));
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
// // Cleanup the PathEntry if initialized. @@ -926,7 +932,7 @@ // condition. //
- if (AbnormalTermination()) { + if (_abnormal_termination()) {
// @@ -985,7 +991,7 @@ //
CdCompleteRequest( IrpContext, Irp, Status ); - } + } _SEH2_END
return Status; } @@ -1508,11 +1514,13 @@
RtlCopyMemory( &FileId, IrpSp->FileObject->FileName.Buffer, sizeof( FILE_ID ));
+ DbgPrint("CdOpenByFileId (%p)", IrpSp->FileObject); + // // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Go ahead and figure out the TypeOfOpen and NodeType. We can @@ -1524,7 +1532,7 @@ TypeOfOpen = UserDirectoryOpen; NodeTypeCode = CDFS_NTC_FCB_INDEX;
- // + //CdQueryFidDirentOffset // If the offset isn't zero then the file Id is bad. //
@@ -1546,7 +1554,7 @@ // request can't wait. //
- CdLockVcb( IrpContext, Vcb ); + CdLockVcb( CdQueryFidDirentOffsetIrpContext, Vcb ); UnlockVcb = TRUE;
NextFcb = CdLookupFcbTable( IrpContext, Vcb, FileId ); @@ -1723,7 +1731,7 @@ //
if (NextFcb->FileObject == NULL) { - + DbgPrint("NextFcb->FileObject == NULL\n"); CdCreateInternalStream( IrpContext, Vcb, NextFcb ); }
@@ -1905,7 +1913,7 @@ }
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
if (UnlockVcb) {
@@ -1921,7 +1929,7 @@
CdCleanupCompoundPathEntry( IrpContext, &CompoundPathEntry ); } - } + } _SEH2_END
return Status; } @@ -1977,6 +1985,8 @@ NTSTATUS Status = STATUS_ACCESS_DENIED;
PAGED_CODE(); + + DbgPrint("CdOpenExistingFcb(%p)", IrpSp->FileObject);
// // Check that the desired access is legal. @@ -2110,6 +2120,8 @@
PAGED_CODE();
+ DbgPrint("CdOpenDirectoryFromPathEntry(%p)", IrpSp->FileObject); + // // Check for illegal access to this file. // @@ -2126,7 +2138,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Check the related Ccb to see if this was an OpenByFileId. @@ -2281,7 +2293,7 @@ IrpSp->Parameters.Create.SecurityContext->DesiredAccess ); }
- } finally { + } _SEH2_FINALLY {
// // Unlock the Vcb if held. @@ -2300,7 +2312,7 @@
CdReleaseFcb( IrpContext, ParentFcb ); } - } + } _SEH2_END
return Status; } @@ -2384,6 +2396,8 @@
PAGED_CODE();
+ DbgPrint("CdOpenFileFromFileContext(%p)\n", IrpSp); + // // Check for illegal access to this file. // @@ -2399,7 +2413,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Check if a version number was used to open this file. @@ -2569,7 +2583,7 @@ CcbFlags, IrpSp->Parameters.Create.SecurityContext->DesiredAccess );
- } finally { + } _SEH2_FINALLY {
// // Unlock the Vcb if held. @@ -2588,7 +2602,7 @@
CdReleaseFcb( IrpContext, ParentFcb ); } - } + } _SEH2_END
return Status; } @@ -2652,6 +2666,8 @@ PCCB Ccb;
PAGED_CODE(); + + DbgPrint("CdCompleteFcbOpen(%p).\n", IrpSp->FileObject);
// // Expand maximum allowed to something sensible for share access checking
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/devctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -27,6 +27,7 @@ //
NTSTATUS +NTAPI CdDevCtrlCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -165,12 +166,13 @@ return Status; }
- + // // Local support routine //
NTSTATUS +NTAPI CdDevCtrlCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp,
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/deviosup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -355,7 +355,7 @@ // Use a try-finally to perform the final cleanup. //
- try { + _SEH2_TRY {
// // Loop while there are more bytes to transfer. @@ -518,7 +518,7 @@ }
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
// // Perform final cleanup on the IoRuns if necessary. @@ -528,7 +528,7 @@
CdFinishBuffers( IrpContext, IoRuns, CleanupRunCount, TRUE, FALSE ); } - } + } _SEH2_END
return Status; } @@ -624,7 +624,7 @@ // Use a try-finally to perform the final cleanup. //
- try { + _SEH2_TRY {
// // If the initial offset lies within the RIFF header then copy the @@ -960,7 +960,7 @@ KeFlushIoBuffers( IrpContext->Irp->MdlAddress, TRUE, FALSE );
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
// // Perform final cleanup on the IoRuns if necessary. @@ -970,7 +970,7 @@
CdFinishBuffers( IrpContext, IoRuns, CleanupRunCount, TRUE, FALSE ); } - } + } _SEH2_END
return Status; } @@ -1176,15 +1176,15 @@ // deallocate the Mdl and return the appropriate "expected" status. //
- try { + _SEH2_TRY {
MmProbeAndLockPages( Mdl, IrpContext->Irp->RequestorMode, IoWriteAccess );
Status = STATUS_SUCCESS;
- } except(EXCEPTION_EXECUTE_HANDLER) { - - Status = GetExceptionCode(); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + + Status = _exception_code();
IoFreeMdl( Mdl ); IrpContext->Irp->MdlAddress = NULL; @@ -1193,7 +1193,7 @@
Status = STATUS_INVALID_USER_BUFFER; } - } + } _SEH2_END }
//
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/dirctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -287,7 +287,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Verify the Fcb is still good. @@ -499,7 +499,7 @@ // such trickery. //
- try { + _SEH2_TRY {
// // Zero and initialize the base part of the current entry. @@ -715,7 +715,7 @@ LastEntry = NextEntry; NextEntry = QuadAlign( Information );
- } except (EXCEPTION_EXECUTE_HANDLER) { + } _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) {
// // We had a problem filling in the user's buffer, so stop and @@ -724,13 +724,13 @@ //
Information = 0; - try_leave( Status = GetExceptionCode()); - } + try_leave( Status = _exception_code()); + } _SEH2_END }
DoCcbUpdate = TRUE;
- } finally { + } _SEH2_FINALLY {
// // Cleanup our search context - *before* aquiring the FCB mutex exclusive, @@ -769,7 +769,7 @@ //
CdReleaseFile( IrpContext, Fcb ); - } + } _SEH2_END
// // Complete the request here. @@ -837,7 +837,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Verify the Vcb. @@ -862,14 +862,14 @@ NULL, NULL );
- } finally { + } _SEH2_FINALLY {
// // Release the Vcb. //
CdReleaseVcb( IrpContext, IrpContext->Vcb ); - } + } _SEH2_END
// // Cleanup the IrpContext.
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/dirsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -65,7 +65,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fieldoff.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -1,4 +1,4 @@ -#include "CdProcs.h" +#include "cdprocs.h" #include <stdio.h>
#define doit(a,b) { printf("%s %04lx %4lx %s\n", #a, FIELD_OFFSET(a,b), sizeof(d.b), #b); }
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fileinfo.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -165,7 +165,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // We only support query on file and directory handles. @@ -325,7 +325,7 @@
Irp->IoStatus.Information = IrpSp->Parameters.QueryFile.Length - Length;
- } finally { + } _SEH2_FINALLY {
// // Release the file. @@ -335,7 +335,7 @@
CdReleaseFile( IrpContext, Fcb ); } - } + } _SEH2_END
// // Complete the request if we didn't raise. @@ -406,7 +406,7 @@
CdAcquireFileShared( IrpContext, Fcb );
- try { + _SEH2_TRY {
// // Make sure the Fcb is in a usable condition. This @@ -445,10 +445,10 @@ Status = STATUS_SUCCESS;
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
CdReleaseFile( IrpContext, Fcb ); - } + } _SEH2_END
// // Complete the request if there was no raise. @@ -536,7 +536,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Only deal with 'good' Fcb's. @@ -566,12 +566,12 @@ Result = TRUE; }
- } finally { + } _SEH2_FINALLY {
ExReleaseResourceLite( Fcb->Resource );
FsRtlExitFileSystem(); - } + } _SEH2_END
return Result; } @@ -654,7 +654,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Only deal with 'good' Fcb's. @@ -694,12 +694,12 @@ Result = TRUE; }
- } finally { + } _SEH2_FINALLY {
ExReleaseResourceLite( Fcb->Resource );
FsRtlExitFileSystem(); - } + } _SEH2_END
return Result; } @@ -782,7 +782,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Only deal with 'good' Fcb's. @@ -827,12 +827,12 @@ Result = TRUE; }
- } finally { + } _SEH2_FINALLY {
ExReleaseResourceLite( Fcb->Resource );
FsRtlExitFileSystem(); - } + } _SEH2_END
return Result; } @@ -1278,7 +1278,7 @@ // Use a try-finally to cleanup the structures. //
- try { + _SEH2_TRY {
ParentFcb = Fcb->ParentFcb; CdAcquireFileShared( IrpContext, ParentFcb ); @@ -1396,7 +1396,7 @@ RtlCopyMemory( Buffer->FileName, ShortNameBuffer, Buffer->FileNameLength );
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
if (CleanupFileLookup) {
@@ -1413,7 +1413,7 @@
CdReleaseFile( IrpContext, ParentFcb ); } - } + } _SEH2_END
// // Reduce the available bytes by the amount stored into this buffer.
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/filobsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fsctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -702,7 +702,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Allocate a buffer to query the TOC. @@ -1019,7 +1019,7 @@
Status = STATUS_SUCCESS;
- } finally { + } _SEH2_FINALLY {
// // Free the TOC buffer if not in the Vcb. @@ -1043,7 +1043,7 @@ // If we are not mounting the device, then set the verify bit again. //
- if ((AbnormalTermination() || (Status != STATUS_SUCCESS)) && + if ((_abnormal_termination() || (Status != STATUS_SUCCESS)) && SetDoVerifyOnFail) {
CdMarkRealDevForVerify( IrpContext->RealDevice); @@ -1080,7 +1080,7 @@ //
CdReleaseCdData( IrpContext ); - } + } _SEH2_END
// // Now send mount notification. @@ -1182,7 +1182,7 @@
CdAcquireCdData( IrpContext );
- try { + _SEH2_TRY {
CdAcquireVcbExclusive( IrpContext, Vcb, FALSE ); ReleaseVcb = TRUE; @@ -1506,7 +1506,7 @@ } }
- } finally { + } _SEH2_FINALLY {
// // Free the TOC buffer if allocated. @@ -1528,7 +1528,7 @@ }
CdReleaseCdData( IrpContext ); - } + } _SEH2_END
// // Now send mount notification. @@ -1653,7 +1653,7 @@ // Use a try finally to free the Fcb. //
- try { + _SEH2_TRY {
// // Verify the Fcb. @@ -1683,14 +1683,14 @@
Irp = NULL;
- } finally { + } _SEH2_FINALLY {
// // Release all of our resources //
CdReleaseFcb( IrpContext, Fcb ); - } + } _SEH2_END
// // Complete the request if there was no exception. @@ -1765,7 +1765,7 @@ Vcb = Fcb->Vcb; CdAcquireVcbExclusive( IrpContext, Vcb, FALSE );
- try { + _SEH2_TRY {
// // Verify the Vcb. @@ -1775,7 +1775,7 @@
Status = CdLockVolumeInternal( IrpContext, Vcb, IrpSp->FileObject );
- } finally { + } _SEH2_FINALLY {
// // Release the Vcb. @@ -1783,11 +1783,11 @@
CdReleaseVcb( IrpContext, Vcb );
- if (AbnormalTermination() || !NT_SUCCESS( Status )) { + if (_abnormal_termination() || !NT_SUCCESS( Status )) {
FsRtlNotifyVolumeEvent( IrpSp->FileObject, FSRTL_VOLUME_LOCK_FAILED ); } - } + } _SEH2_END
// // Complete the request if there haven't been any exceptions. @@ -2295,7 +2295,7 @@
Status = ObReferenceObjectByHandle( Handle, 0, - IoFileObjectType, /* ReactOS Change: GCC/LD Incompatibily with exported kernel data */ + *IoFileObjectType, KernelMode, (PVOID*)&FileToMarkBad, /* ReactOS Change: GCC "passing argument 5 of 'ObReferenceObjectByHandle' from incompatible pointer type" */ NULL ); @@ -2591,7 +2591,7 @@ // Check for whether this device supports XA and multi-session. //
- try { + _SEH2_TRY {
// // Allocate a buffer for the last session information. @@ -2669,10 +2669,10 @@ ThisPass += 1; }
- } finally { + } _SEH2_FINALLY {
if (CdromToc != NULL) { CdFreePool( &CdromToc ); } - } + } _SEH2_END }
//
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/fspdisp.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -94,7 +94,7 @@
while (TRUE) {
- try { + _SEH2_TRY {
// // Reinitialize for the next try at completing this @@ -184,10 +184,10 @@ CdCompleteRequest( IrpContext, Irp, Status ); }
- } except( CdExceptionFilter( IrpContext, GetExceptionInformation() )) { - - Status = CdProcessException( IrpContext, Irp, GetExceptionCode() ); - } + } _SEH2_EXCEPT( CdExceptionFilter( IrpContext, _exception_info() )) { + + Status = CdProcessException( IrpContext, Irp, _exception_code() ); + } _SEH2_END
// // Break out of the loop if we didn't get CANT_WAIT.
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/lockctrl.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -224,7 +224,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // We check whether we can proceed based on the state of the file oplocks. @@ -275,10 +275,10 @@ }
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
FsRtlExitFileSystem(); - } + } _SEH2_END
return Results; } @@ -366,7 +366,7 @@
FsRtlEnterFileSystem();
- try { + _SEH2_TRY {
// // We check whether we can proceed based on the state of the file oplocks. @@ -416,10 +416,10 @@ }
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
FsRtlExitFileSystem(); - } + } _SEH2_END
return Results; } @@ -498,7 +498,7 @@
FsRtlEnterFileSystem();
- try { + _SEH2_TRY {
// // We check whether we can proceed based on the state of the file oplocks. @@ -539,10 +539,10 @@ CdUnlockFcb( IrpContext, Fcb );
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
FsRtlExitFileSystem(); - } + } _SEH2_END
return Results; } @@ -624,7 +624,7 @@
FsRtlEnterFileSystem();
- try { + _SEH2_TRY {
// // We check whether we can proceed based on the state of the file oplocks. @@ -666,10 +666,10 @@ CdUnlockFcb( IrpContext, Fcb );
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
FsRtlExitFileSystem(); - } + } _SEH2_END
return Results; }
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/namesup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/nodetype.h [iso-8859-1] Mon May 23 20:07:45 2016 @@ -97,8 +97,6 @@ #define CDFS_BUG_CHECK_VOLINFO (0x001b0000) #define CDFS_BUG_CHECK_WORKQUE (0x001c0000)
-/* ReactOS Change: Need to add to reactos.mc */ -#define CDFS_FILE_SYSTEM ((ULONG)0x00000026L) #define CdBugCheck(A,B,C) { KeBugCheckEx(CDFS_FILE_SYSTEM, BugCheckFileId | __LINE__, A, B, C ); }
#endif // _NODETYPE_
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/pathsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -73,7 +73,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/pnp.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -51,6 +51,7 @@ );
NTSTATUS +NTAPI CdPnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp, @@ -774,6 +775,7 @@ //
NTSTATUS +NTAPI CdPnpCompletionRoutine ( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp,
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/prefxsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/read.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/read.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/read.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -35,11 +35,11 @@ //
#define SafeZeroMemory(IC,AT,BYTE_COUNT) { \ - try { \ + _SEH2_TRY { \ RtlZeroMemory( (AT), (BYTE_COUNT) ); \ - } except( EXCEPTION_EXECUTE_HANDLER ) { \ + } _SEH2_EXCEPT( EXCEPTION_EXECUTE_HANDLER ) { \ CdRaiseStatus( IC, STATUS_INVALID_USER_BUFFER ); \ - } \ + } _SEH2_END \ }
// @@ -180,7 +180,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Verify the Fcb. Allow reads if this is a DASD handle that is @@ -515,7 +515,7 @@ }
try_exit: NOTHING; - } finally { + } _SEH2_FINALLY {
// // Release the Fcb. @@ -525,7 +525,7 @@
CdReleaseFile( IrpContext, Fcb ); } - } + } _SEH2_END
// // Post the request if we got CANT_WAIT.
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/resrcsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/strucsup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -298,19 +298,19 @@ // uninitialize the notify structures before returning. //
- try { + _SEH2_TRY {
Vcb->SwapVpb = FsRtlAllocatePoolWithTag( NonPagedPool, sizeof( VPB ), TAG_VPB ); } - finally { - - if (AbnormalTermination()) { + _SEH2_FINALLY { + + if (_abnormal_termination()) {
FsRtlNotifyUninitializeSync( &Vcb->NotifySync ); } - } + } _SEH2_END
// // Nothing beyond this point should raise. @@ -456,7 +456,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Copy the block size and compute the various block masks. @@ -843,10 +843,10 @@ SetFlag( Vcb->VcbState, VCB_STATE_ISO ); }
- } finally { + } _SEH2_FINALLY {
if (UnlockVcb) { CdUnlockVcb( IrpContext, Vcb ); } - } + } _SEH2_END }
@@ -1238,7 +1238,7 @@
CdLockFcb( IrpContext, Fcb );
- try { + _SEH2_TRY {
// // Initialize the common header in the Fcb. The node type is already @@ -1361,10 +1361,10 @@ CdInsertFcbTable( IrpContext, Fcb ); SetFlag( Fcb->FcbState, FCB_STATE_IN_FCB_TABLE );
- } finally { + } _SEH2_FINALLY {
CdUnlockFcb( IrpContext, Fcb ); - } + } _SEH2_END
return; } @@ -1927,7 +1927,7 @@ // Use a try-finally to safely clear the top-level field. //
- try { + _SEH2_TRY {
// // Loop until we find an Fcb we can't remove. @@ -2031,7 +2031,7 @@
} while (CurrentFcb != NULL);
- } finally { + } _SEH2_FINALLY {
// // Release the current Fcb if we have acquired it. @@ -2047,7 +2047,7 @@ //
ClearFlag( IrpContext->TopLevel->Flags, IRP_CONTEXT_FLAG_IN_TEARDOWN ); - } + } _SEH2_END
*RemovedStartingFcb = (CurrentFcb != StartingFcb); return;
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/verfysup.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -13,7 +13,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -92,7 +92,7 @@ Vcb = &CONTAINING_RECORD( IrpSp->DeviceObject, VOLUME_DEVICE_OBJECT, DeviceObject )->Vcb; - try { + _SEH2_TRY {
// // Send down the verify FSCTL. Note that this is sent to the @@ -206,7 +206,7 @@ Status = CdFsdPostRequest( IrpContext, Irp ); }
- } except(CdExceptionFilter( IrpContext, GetExceptionInformation() )) { + } _SEH2_EXCEPT(CdExceptionFilter( IrpContext, _exception_info() )) {
// // We had some trouble trying to perform the verify or raised @@ -214,8 +214,8 @@ // the error status that we get back from the execption code. //
- Status = CdProcessException( IrpContext, Irp, GetExceptionCode() ); - } + Status = CdProcessException( IrpContext, Irp, _exception_code() ); + } _SEH2_END
return Status; }
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/volinfo.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module @@ -130,7 +130,7 @@ // Use a try-finally to facilitate cleanup. //
- try { + _SEH2_TRY {
// // Verify the Vcb. @@ -177,14 +177,14 @@
Irp->IoStatus.Information = IrpSp->Parameters.QueryVolume.Length - Length;
- } finally { + } _SEH2_FINALLY {
// // Release the Vcb. //
CdReleaseVcb( IrpContext, Fcb->Vcb ); - } + } _SEH2_END
// // Complete the request if we didn't raise.
Modified: branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/drivers/filesystem... ============================================================================== --- branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c [iso-8859-1] (original) +++ branches/TransitionPte/drivers/filesystems/cdfs_new/workque.c [iso-8859-1] Mon May 23 20:07:45 2016 @@ -14,7 +14,7 @@
--*/
-#include "CdProcs.h" +#include "cdprocs.h"
// // The Bug check file id for this module
-
jgardou＠svn.reactos.org