Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CDFS_NEW] Re-apply many of the reactos-specific changes and fix build.

Browse source 
- Also, get rid of the old diff file.
This commit is contained in:
David Quintana 2017-11-23 21:05:28 +01:00 • committed by Pierre Schweitzer
parent fd34548263
commit 5429771b99
32 changed files with 541 additions and 1198 deletions
Download patch file Download diff file Expand all files Collapse all files

27
drivers/filesystems/cdfs_new/dirctrl.c
View file

@ -14,7 +14,7 @@ Abstract:
--*/
#include "CdProcs.h"
#include "cdprocs.h"
//
// The Bug check file id for this module
@ -292,7 +292,7 @@ Return Value:
// Use a try-finally to facilitate cleanup.
//
try {
_SEH2_TRY {
//
// Verify the Fcb is still good.
@ -504,7 +504,7 @@ Return Value:
// such trickery.
//
try {
_SEH2_TRY {
//
// Zero and initialize the base part of the current entry.
@ -579,6 +579,9 @@ Return Value:
NamesInfo->FileNameLength = FileNameBytes + SeparatorBytes + VersionStringBytes;
break;
/* ReactOS Change: GCC "enumeration value not handled in switch" */
default: break;
}
//
@ -712,8 +715,10 @@ Return Value:
LastEntry = NextEntry;
NextEntry = QuadAlign( Information );
#ifdef _MSC_VER
#pragma warning(suppress: 6320)
} except (EXCEPTION_EXECUTE_HANDLER) {
#endif
} _SEH2_EXCEPT (EXCEPTION_EXECUTE_HANDLER) {
//
// We had a problem filling in the user's buffer, so stop and
@ -722,13 +727,13 @@ Return Value:
//
Information = 0;
try_leave( Status = GetExceptionCode());
}
try_leave( Status = _SEH2_GetExceptionCode());
} _SEH2_END;
}
DoCcbUpdate = TRUE;
} finally {
} _SEH2_FINALLY {
//
// Cleanup our search context - *before* aquiring the FCB mutex exclusive,
@ -767,7 +772,7 @@ Return Value:
//
CdReleaseFile( IrpContext, Fcb );
}
} _SEH2_END;
//
// Complete the request here.
@ -836,7 +841,7 @@ Return Value:
// Use a try-finally to facilitate cleanup.
//
try {
_SEH2_TRY {
//
// Verify the Vcb.
@ -861,14 +866,14 @@ Return Value:
NULL,
NULL );
} finally {
} _SEH2_FINALLY {
//
// Release the Vcb.
//
CdReleaseVcb( IrpContext, IrpContext->Vcb );
}
} _SEH2_END;
//
// Cleanup the IrpContext.