Author: pschweitzer
Date: Mon Jun 5 15:54:51 2017
New Revision: 74925
URL: http://svn.reactos.org/svn/reactos?rev=74925&view=rev
Log:
[UDFS]
Misc fixes by Thomas.
CORE-4375
Modified:
trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h
trunk/reactos/drivers/filesystems/udfs/close.cpp
trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp
trunk/reactos/drivers/filesystems/udfs/misc.cpp
trunk/reactos/drivers/filesystems/udfs/protos.h
trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp
trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp
trunk/reactos/drivers/filesystems/udfs/udfinit.cpp
Modified: trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h [iso-8859-1]
(original)
+++ trunk/reactos/drivers/filesystems/udfs/Include/phys_lib.h [iso-8859-1]
Mon Jun 5 15:54:51 2017
@@ -96,7 +96,7 @@
extern OSSTATUS UDFGetDiskInfo(IN PDEVICE_OBJECT DeviceObject, // the target
device object
IN PVCB Vcb); // Volume
control block from this DevObj
-extern VOID UDFEjectReqWaiter(IN PVOID Context);
+extern VOID NTAPI UDFEjectReqWaiter(IN PVOID Context);
extern VOID UDFStopEjectWaiter(PVCB Vcb);
@@ -182,4 +182,4 @@
IN BOOLEAN Unlock);
-#endif //__UDF_PHYS_LIB__H__
+#endif //__UDF_PHYS_LIB__H__
Modified: trunk/reactos/drivers/filesystems/udfs/close.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/close.cpp?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/close.cpp [iso-8859-1] Mon Jun 5
15:54:51 2017
@@ -686,6 +686,7 @@
It operates until reach lower threshold
*/
VOID
+NTAPI
UDFDelayedClose(
PVOID unused
)
Modified: trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/fscntrl.cpp [iso-8859-1] Mon Jun 5
15:54:51 2017
@@ -900,7 +900,7 @@
// terminates automatically
ASSERT(!(Vcb->VCBFlags & UDF_VCB_FLAGS_STOP_WAITER_EVENT));
Vcb->VCBFlags |= UDF_VCB_FLAGS_STOP_WAITER_EVENT;
- ExInitializeWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem),
(PWORKER_THREAD_ROUTINE)UDFEjectReqWaiter, Vcb->EjectWaiter);
+ ExInitializeWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem),
UDFEjectReqWaiter, Vcb->EjectWaiter);
UDFPrint(("UDFStartEjectWaiter: create thread\n"));
ExQueueWorkItem(&(Vcb->EjectWaiter->EjectReqWorkQueueItem),
DelayedWorkQueue);
} else {
Modified: trunk/reactos/drivers/filesystems/udfs/misc.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/misc.cpp?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/misc.cpp [iso-8859-1] Mon Jun 5
15:54:51 2017
@@ -1174,7 +1174,7 @@
KeReleaseSpinLock( &(Vcb->OverflowQueueSpinLock), SavedIrql );
// queue up the request
- ExInitializeWorkItem(&(PtrIrpContext->WorkQueueItem),
(PWORKER_THREAD_ROUTINE)UDFCommonDispatch, PtrIrpContext);
+ ExInitializeWorkItem(&(PtrIrpContext->WorkQueueItem),
UDFCommonDispatch, PtrIrpContext);
ExQueueWorkItem(&(PtrIrpContext->WorkQueueItem), CriticalWorkQueue);
// ExQueueWorkItem(&(PtrIrpContext->WorkQueueItem), DelayedWorkQueue);
@@ -1204,6 +1204,7 @@
*
*************************************************************************/
VOID
+NTAPI
UDFCommonDispatch(
IN PVOID Context // actually is a pointer to IRPContext structure
)
Modified: trunk/reactos/drivers/filesystems/udfs/protos.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/protos.h?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/protos.h [iso-8859-1] Mon Jun 5
15:54:51 2017
@@ -87,7 +87,7 @@
extern VOID UDFCloseAllDelayed(PVCB Vcb);
-extern VOID UDFDelayedClose(PVOID unused = NULL);
+extern VOID NTAPI UDFDelayedClose(PVOID unused = NULL);
extern NTSTATUS UDFCloseAllXXXDelayedInDir(IN PVCB Vcb,
IN PUDF_FILE_INFO FileInfo,
@@ -642,7 +642,7 @@
PtrUDFIrpContext PtrIrpContext,
PIRP Irp);
-extern VOID UDFCommonDispatch(
+extern VOID NTAPI UDFCommonDispatch(
VOID *Context); // actually an IRPContext structure
extern NTSTATUS UDFInitializeVCB(
@@ -756,7 +756,7 @@
extern OSSTATUS UDFGetDiskInfo(IN PDEVICE_OBJECT DeviceObject, // the target
device object
IN PVCB Vcb); // Volume
control block from this DevObj
-extern VOID UDFEjectReqWaiter(IN PVOID Context);
+extern VOID NTAPI UDFEjectReqWaiter(IN PVOID Context);
extern VOID UDFStopEjectWaiter(PVCB Vcb);
Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp
[iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/udf_info/phys_eject.cpp
[iso-8859-1] Mon Jun 5 15:54:51 2017
@@ -26,6 +26,7 @@
This routine checks for User Eject request & initiates Dismount
*/
void
+NTAPI
UDFEjectReqWaiter(
IN void* Context
)
Modified: trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1]
(original)
+++ trunk/reactos/drivers/filesystems/udfs/udf_info/remap.cpp [iso-8859-1]
Mon Jun 5 15:54:51 2017
@@ -537,10 +537,12 @@
} // end UDFVForget()
VOID
+NTAPI
UDFVWorkItem(
- PUDF_VERIFY_REQ VerifyReq
- )
-{
+ PVOID Context
+ )
+{
+ PUDF_VERIFY_REQ VerifyReq = (PUDF_VERIFY_REQ)Context;
PVCB Vcb = VerifyReq->Vcb;
ULONG ReadBytes;
// OSSTATUS RC;
@@ -703,7 +705,7 @@
InterlockedIncrement((PLONG)&(VerifyCtx->QueuedCount));
#ifndef _CONSOLE
ExInitializeWorkItem( &(VerifyReq->VerifyItem),
- (PWORKER_THREAD_ROUTINE)
UDFVWorkItem,
+ UDFVWorkItem,
VerifyReq );
ExQueueWorkItem( &(VerifyReq->VerifyItem),
CriticalWorkQueue );
#else
Modified: trunk/reactos/drivers/filesystems/udfs/udfinit.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/udfs/udfinit.cpp?rev=74925&r1=74924&r2=74925&view=diff
==============================================================================
--- trunk/reactos/drivers/filesystems/udfs/udfinit.cpp [iso-8859-1] (original)
+++ trunk/reactos/drivers/filesystems/udfs/udfinit.cpp [iso-8859-1] Mon Jun 5
15:54:51 2017
@@ -179,7 +179,7 @@
InitializeListHead( &UDFGlobalData.DirDelayedCloseQueue );
ExInitializeWorkItem( &UDFGlobalData.CloseItem,
- (PWORKER_THREAD_ROUTINE) UDFDelayedClose,
+ UDFDelayedClose,
NULL );
UDFGlobalData.DelayedCloseCount = 0;
@@ -312,7 +312,7 @@
FsRegistered = TRUE;
UDFPrint(("UDF: IoRegisterFsRegistrationChange()\n"));
- IoRegisterFsRegistrationChange( DriverObject,
(PDRIVER_FS_NOTIFICATION)UDFFsNotification );
+ IoRegisterFsRegistrationChange( DriverObject, UDFFsNotification );
// delay.QuadPart = -10000000;
// KeDelayExecutionThread(KernelMode, FALSE, &delay); //10
microseconds
