projects
/
reactos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unnecessary executable bits
[reactos.git]
/
drivers
/
filesystems
/
cdfs_new
/
fspdisp.c
diff --git
a/drivers/filesystems/cdfs_new/fspdisp.c
b/drivers/filesystems/cdfs_new/fspdisp.c
old mode 100755
(executable)
new mode 100644
(file)
index
b7c4e80
..
e119b11
--- a/
drivers/filesystems/cdfs_new/fspdisp.c
+++ b/
drivers/filesystems/cdfs_new/fspdisp.c
@@
-14,7
+14,7
@@
Abstract:
--*/
--*/
-#include "
CdP
rocs.h"
+#include "
cdp
rocs.h"
//
// The Bug check file id for this module
//
// The Bug check file id for this module
@@
-24,8
+24,9
@@
Abstract:
\f
VOID
\f
VOID
+NTAPI /* ReactOS Change: GCC Does not support STDCALL by default */
CdFspDispatch (
CdFspDispatch (
-
IN PIRP_CONTEXT Irp
Context
+
_In_ PVOID
Context
)
/*++
)
/*++
@@
-48,7
+49,8
@@
Return Value:
--*/
{
--*/
{
- THREAD_CONTEXT ThreadContext;
+ THREAD_CONTEXT ThreadContext = {0};
+ PIRP_CONTEXT IrpContext = Context;
NTSTATUS Status;
PIRP Irp = IrpContext->Irp;
NTSTATUS Status;
PIRP Irp = IrpContext->Irp;
@@
-94,7
+96,7
@@
Return Value:
while (TRUE) {
while (TRUE) {
-
try
{
+
_SEH2_TRY
{
//
// Reinitialize for the next try at completing this
//
// Reinitialize for the next try at completing this
@@
-124,7
+126,7
@@
Return Value:
case IRP_MJ_CLOSE :
case IRP_MJ_CLOSE :
- ASSERT( FALSE );
+
NT_
ASSERT( FALSE );
break;
case IRP_MJ_READ :
break;
case IRP_MJ_READ :
@@
-174,7
+176,7
@@
Return Value:
case IRP_MJ_PNP :
case IRP_MJ_PNP :
- ASSERT( FALSE );
+
NT_
ASSERT( FALSE );
CdCommonPnp( IrpContext, Irp );
break;
CdCommonPnp( IrpContext, Irp );
break;
@@
-184,10
+186,10
@@
Return Value:
CdCompleteRequest( IrpContext, Irp, Status );
}
CdCompleteRequest( IrpContext, Irp, Status );
}
- }
except( CdExceptionFilter( IrpContext,
GetExceptionInformation() )) {
+ }
_SEH2_EXCEPT( CdExceptionFilter( IrpContext, _SEH2_
GetExceptionInformation() )) {
- Status = CdProcessException( IrpContext, Irp, GetExceptionCode() );
- }
+ Status = CdProcessException( IrpContext, Irp,
_SEH2_
GetExceptionCode() );
+ }
_SEH2_END;
//
// Break out of the loop if we didn't get CANT_WAIT.
//
// Break out of the loop if we didn't get CANT_WAIT.
@@
-233,6
+235,12
@@
Return Value:
VolDo->OverflowQueueCount -= 1;
Entry = RemoveHeadList( &VolDo->OverflowQueue );
VolDo->OverflowQueueCount -= 1;
Entry = RemoveHeadList( &VolDo->OverflowQueue );
+
+ } else {
+
+ VolDo->PostedRequestCount -= 1;
+
+ Entry = NULL;
}
KeReleaseSpinLock( &VolDo->OverflowQueueSpinLock, SavedIrql );
}
KeReleaseSpinLock( &VolDo->OverflowQueueSpinLock, SavedIrql );
@@
-242,7
+250,10
@@
Return Value:
// the Ex Worker thread.
//
// the Ex Worker thread.
//
- if (Entry == NULL) { break; }
+ if (Entry == NULL) {
+
+ break;
+ }
//
// Extract the IrpContext , Irp, set wait to TRUE, and loop.
//
// Extract the IrpContext , Irp, set wait to TRUE, and loop.
@@
-254,6
+265,7
@@
Return Value:
Irp = IrpContext->Irp;
IrpSp = IoGetCurrentIrpStackLocation( Irp );
Irp = IrpContext->Irp;
IrpSp = IoGetCurrentIrpStackLocation( Irp );
+ __analysis_assert( IrpSp != 0 );
continue;
}
continue;
}
@@
-261,15
+273,6
@@
Return Value:
break;
}
break;
}
- //
- // Decrement the PostedRequestCount if there was a volume device object.
- //
-
- if (VolDo) {
-
- InterlockedDecrement( &VolDo->PostedRequestCount );
- }
-
return;
}
return;
}