[akhaldi] 56973: [CLASSPNP] * Explicitly mark the functions as stdcall (NTAPI).. -mrtd changes the default calling convention, but name-decoration isn't affected by this. The -mrtd feature has its ...
29 Jul
2012
29 Jul
'12
1:49 a.m.
Author: akhaldi
Date: Sun Jul 29 01:49:24 2012
New Revision: 56973
URL: http://svn.reactos.org/svn/reactos?rev=56973&view=rev
Log:
[CLASSPNP]
* Explicitly mark the functions as stdcall (NTAPI).. -mrtd changes the default calling
convention, but name-decoration isn't affected by this. The -mrtd feature has its
origin in some older linux-code-mode, and it's considered for removal in GCC 4.8.
* Fix some warnings.
Modified:
trunk/reactos/drivers/storage/classpnp/CMakeLists.txt
trunk/reactos/drivers/storage/classpnp/autorun.c
trunk/reactos/drivers/storage/classpnp/class.c
trunk/reactos/drivers/storage/classpnp/classp.h
trunk/reactos/drivers/storage/classpnp/classwmi.c
trunk/reactos/drivers/storage/classpnp/clntirp.c
trunk/reactos/drivers/storage/classpnp/create.c
trunk/reactos/drivers/storage/classpnp/dictlib.c
trunk/reactos/drivers/storage/classpnp/lock.c
trunk/reactos/drivers/storage/classpnp/obsolete.c
trunk/reactos/drivers/storage/classpnp/power.c
trunk/reactos/drivers/storage/classpnp/retry.c
trunk/reactos/drivers/storage/classpnp/utils.c
trunk/reactos/drivers/storage/classpnp/xferpkt.c
Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Sun Jul 29 01:49:24
2012
@@ -38,9 +38,7 @@
#add_target_compile_flags(classpnp "/Gz")
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/Gz")
else()
-
- #add_target_compile_flags(classpnp "-mrtd -fno-builtin -w")
- set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-mrtd
-fno-builtin -w")
+ set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-w")
endif()
endif()
Modified: trunk/reactos/drivers/storage/classpnp/autorun.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/a…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] Sun Jul 29 01:49:24
2012
@@ -55,24 +55,28 @@
(! fdoExtension->PowerDownInProgress) )
BOOLEAN
+NTAPI
ClasspIsMediaChangeDisabledDueToHardwareLimitation(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PUNICODE_STRING RegistryPath
);
NTSTATUS
+NTAPI
ClasspMediaChangeDeviceInstanceOverride(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
OUT PBOOLEAN Enabled
);
BOOLEAN
+NTAPI
ClasspIsMediaChangeDisabledForClass(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PUNICODE_STRING RegistryPath
);
VOID
+NTAPI
ClasspSetMediaChangeStateEx(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN MEDIA_CHANGE_DETECTION_STATE NewState,
@@ -81,6 +85,7 @@
);
NTSTATUS
+NTAPI
ClasspMediaChangeRegistryCallBack(
IN PWSTR ValueName,
IN ULONG ValueType,
@@ -91,6 +96,7 @@
);
VOID
+NTAPI
ClasspSendMediaStateIrp(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PMEDIA_CHANGE_DETECTION_INFO Info,
@@ -98,12 +104,14 @@
);
VOID
+NTAPI
ClasspFailurePredict(
IN PDEVICE_OBJECT DeviceObject,
IN PFAILURE_PREDICTION_INFO Info
);
NTSTATUS
+NTAPI
ClasspInitializePolling(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN BOOLEAN AllowDriveToSleep
@@ -131,6 +139,7 @@
// ISSUE -- make this public?
VOID
+NTAPI
ClassSendEjectionNotification(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -163,8 +172,8 @@
return;
}
-
VOID
+NTAPI
ClasspSendNotification(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN const GUID * Guid,
@@ -219,9 +228,6 @@
notification = NULL;
return;
}
-
-
-
/*++////////////////////////////////////////////////////////////////////////////
@@ -280,6 +286,7 @@
--*/
VOID
+NTAPI
ClasspInterpretGesnData(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PNOTIFICATION_EVENT_STATUS_HEADER Header,
@@ -555,7 +562,7 @@
} // end switch on notification class
return;
}
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspInternalSetMediaChangeState()
@@ -584,6 +591,7 @@
--*/
VOID
+NTAPI
ClasspInternalSetMediaChangeState(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN MEDIA_CHANGE_DETECTION_STATE NewState,
@@ -596,7 +604,7 @@
MEDIA_CHANGE_DETECTION_STATE oldMediaState;
PMEDIA_CHANGE_DETECTION_INFO info = FdoExtension->MediaChangeDetectionInfo;
ULONG data;
- NTSTATUS status;
+ //NTSTATUS status;
ASSERT((NewState >= MediaUnknown) && (NewState <= MediaNotPresent));
@@ -676,7 +684,7 @@
return;
} // end ClasspInternalSetMediaChangeState()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassSetMediaChangeState()
@@ -708,6 +716,7 @@
--*/
VOID
+NTAPI
ClasspSetMediaChangeStateEx(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN MEDIA_CHANGE_DETECTION_STATE NewState,
@@ -769,7 +778,9 @@
return;
} // end ClassSetMediaChangeStateEx()
+
VOID
+NTAPI
ClassSetMediaChangeState(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN MEDIA_CHANGE_DETECTION_STATE NewState,
@@ -779,7 +790,7 @@
ClasspSetMediaChangeStateEx(FdoExtension, NewState, Wait, FALSE);
return;
}
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspMediaChangeDetectionCompletion()
@@ -803,6 +814,7 @@
--*/
NTSTATUS
+NTAPI
ClasspMediaChangeDetectionCompletion(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -812,7 +824,7 @@
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension;
PCLASS_PRIVATE_FDO_DATA fdoData;
PMEDIA_CHANGE_DETECTION_INFO info;
- PIO_STACK_LOCATION nextIrpStack;
+ //PIO_STACK_LOCATION nextIrpStack;
NTSTATUS status;
BOOLEAN retryImmediately = FALSE;
@@ -1004,7 +1016,7 @@
return STATUS_MORE_PROCESSING_REQUIRED;
}
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspSendTestUnitIrp() - ISSUE-2000/02/20-henrygab - not documented
@@ -1023,6 +1035,7 @@
--*/
PIRP
+NTAPI
ClasspPrepareMcnIrp(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PMEDIA_CHANGE_DETECTION_INFO Info,
@@ -1183,7 +1196,7 @@
return irp;
}
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspSendMediaStateIrp() - ISSUE-2000/02/20-henrygab - not documented
@@ -1201,6 +1214,7 @@
--*/
VOID
+NTAPI
ClasspSendMediaStateIrp(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PMEDIA_CHANGE_DETECTION_INFO Info,
@@ -1209,8 +1223,8 @@
{
BOOLEAN requestPending = FALSE;
LONG irpInUse;
- LARGE_INTEGER zero;
- NTSTATUS status;
+ //LARGE_INTEGER zero;
+ //NTSTATUS status;
DBGTRACE(ClassDebugMCN, ("> ClasspSendMediaStateIrp"));
@@ -1368,7 +1382,7 @@
return;
} // end ClasspSendMediaStateIrp()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassCheckMediaState()
@@ -1389,6 +1403,7 @@
--*/
VOID
+NTAPI
ClassCheckMediaState(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -1421,7 +1436,7 @@
return;
} // end ClassCheckMediaState()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassResetMediaChangeTimer()
@@ -1440,6 +1455,7 @@
--*/
VOID
+NTAPI
ClassResetMediaChangeTimer(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -1452,7 +1468,7 @@
}
return;
} // end ClassResetMediaChangeTimer()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspInitializePolling() - ISSUE-2000/02/20-henrygab - not documented
@@ -1470,15 +1486,16 @@
--*/
NTSTATUS
+NTAPI
ClasspInitializePolling(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN BOOLEAN AllowDriveToSleep
)
{
PDEVICE_OBJECT fdo = FdoExtension->DeviceObject;
- PCLASS_PRIVATE_FDO_DATA fdoData = FdoExtension->PrivateFdoData;
-
- ULONG size;
+ //PCLASS_PRIVATE_FDO_DATA fdoData = FdoExtension->PrivateFdoData;
+
+ //ULONG size;
PMEDIA_CHANGE_DETECTION_INFO info;
PIRP irp;
@@ -1519,7 +1536,7 @@
if (buffer != NULL) {
PIO_STACK_LOCATION irpStack;
PSCSI_REQUEST_BLOCK srb;
- PCDB cdb;
+ //PCDB cdb;
srb = &(info->MediaChangeSrb);
info->MediaChangeIrp = irp;
@@ -1648,8 +1665,9 @@
return STATUS_INSUFFICIENT_RESOURCES;
} // end ClasspInitializePolling()
-
+
NTSTATUS
+NTAPI
ClasspInitializeGesn(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PMEDIA_CHANGE_DETECTION_INFO Info
@@ -2004,6 +2022,7 @@
--*/
NTSTATUS
+NTAPI
ClassInitializeTestUnitPolling(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN BOOLEAN AllowDriveToSleep
@@ -2011,7 +2030,7 @@
{
return ClasspInitializePolling(FdoExtension, AllowDriveToSleep);
} // end ClassInitializeTestUnitPolling()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassInitializeMediaChangeDetection()
@@ -2038,6 +2057,7 @@
--*/
VOID
+NTAPI
ClassInitializeMediaChangeDetection(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PUCHAR EventPrefix
@@ -2120,7 +2140,7 @@
return;
} // end ClassInitializeMediaChangeDetection()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspMediaChangeDeviceInstanceOverride()
@@ -2144,6 +2164,7 @@
--*/
NTSTATUS
+NTAPI
ClasspMediaChangeDeviceInstanceOverride(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
OUT PBOOLEAN Enabled
@@ -2289,7 +2310,7 @@
return status;
} // end ClasspMediaChangeDeviceInstanceOverride()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspIsMediaChangeDisabledDueToHardwareLimitation()
@@ -2315,6 +2336,7 @@
--*/
BOOLEAN
+NTAPI
ClasspIsMediaChangeDisabledDueToHardwareLimitation(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PUNICODE_STRING RegistryPath
@@ -2519,7 +2541,7 @@
return FALSE;
} // end ClasspIsMediaChangeDisabledDueToHardwareLimitation()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspIsMediaChangeDisabledForClass()
@@ -2546,12 +2568,13 @@
--*/
BOOLEAN
+NTAPI
ClasspIsMediaChangeDisabledForClass(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PUNICODE_STRING RegistryPath
)
{
- PSTORAGE_DEVICE_DESCRIPTOR deviceDescriptor = FdoExtension->DeviceDescriptor;
+ //PSTORAGE_DEVICE_DESCRIPTOR deviceDescriptor = FdoExtension->DeviceDescriptor;
OBJECT_ATTRIBUTES objectAttributes;
HANDLE serviceKey = NULL;
@@ -2559,8 +2582,8 @@
RTL_QUERY_REGISTRY_TABLE parameters[3];
UNICODE_STRING paramStr;
- UNICODE_STRING deviceUnicodeString;
- ANSI_STRING deviceString;
+ //UNICODE_STRING deviceUnicodeString;
+ //ANSI_STRING deviceString;
//
// Default to ENABLING MediaChangeNotification (!)
@@ -2675,7 +2698,7 @@
return (BOOLEAN)(!mcnRegistryValue);
} // end ClasspIsMediaChangeDisabledForClass()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassEnableMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public?
@@ -2694,6 +2717,7 @@
--*/
VOID
+NTAPI
ClassEnableMediaChangeDetection(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -2757,7 +2781,7 @@
return;
} // end ClassEnableMediaChangeDetection()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassDisableMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public?
@@ -2778,6 +2802,7 @@
ULONG BreakOnMcnDisable = FALSE;
VOID
+NTAPI
ClassDisableMediaChangeDetection(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -2806,7 +2831,7 @@
return;
} // end ClassDisableMediaChangeDetection()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassCleanupMediaChangeDetection() ISSUE-2000/02/20-henrygab - why public?!
@@ -2823,6 +2848,7 @@
--*/
VOID
+NTAPI
ClassCleanupMediaChangeDetection(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -2845,7 +2871,7 @@
ExFreePool(info);
return;
} // end ClassCleanupMediaChangeDetection()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspMcnControl() - ISSUE-2000/02/20-henrygab - not documented
@@ -2863,6 +2889,7 @@
--*/
NTSTATUS
+NTAPI
ClasspMcnControl(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PIRP Irp,
@@ -2942,7 +2969,7 @@
}
return status;
} // end ClasspMcnControl(
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspMediaChangeRegistryCallBack()
@@ -2970,6 +2997,7 @@
--*/
NTSTATUS
+NTAPI
ClasspMediaChangeRegistryCallBack(
IN PWSTR ValueName,
IN ULONG ValueType,
@@ -3039,7 +3067,7 @@
return STATUS_SUCCESS;
} // end ClasspMediaChangeRegistryCallBack()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspTimerTick() - ISSUE-2000/02/20-henrygab - not documented
@@ -3057,6 +3085,7 @@
--*/
VOID
+NTAPI
ClasspTimerTick(
PDEVICE_OBJECT DeviceObject,
PVOID Context
@@ -3105,7 +3134,7 @@
if ((info != NULL) && (info->Method != FailurePredictionNone)) {
ULONG countDown;
- ULONG active;
+ //ULONG active;
if (ClasspCanSendPollingIrp(fdoExtension)) {
@@ -3186,7 +3215,7 @@
ClassReleaseRemoveLock(DeviceObject, (PIRP)ClasspTimerTick);
} // end ClasspTimerTick()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspEnableTimer() - ISSUE-2000/02/20-henrygab - not documented
@@ -3204,6 +3233,7 @@
--*/
NTSTATUS
+NTAPI
ClasspEnableTimer(
PDEVICE_OBJECT DeviceObject
)
@@ -3236,7 +3266,7 @@
return status;
} // end ClasspEnableTimer()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspDisableTimer() - ISSUE-2000/02/20-henrygab - not documented
@@ -3254,15 +3284,16 @@
--*/
NTSTATUS
+NTAPI
ClasspDisableTimer(
PDEVICE_OBJECT DeviceObject
)
{
- PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension;
- PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension;
- PMEDIA_CHANGE_DETECTION_INFO mCDInfo = fdoExtension->MediaChangeDetectionInfo;
- PFAILURE_PREDICTION_INFO fPInfo = fdoExtension->FailurePredictionInfo;
- NTSTATUS status;
+ //PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension;
+ //PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension;
+ //PMEDIA_CHANGE_DETECTION_INFO mCDInfo = fdoExtension->MediaChangeDetectionInfo;
+ //PFAILURE_PREDICTION_INFO fPInfo = fdoExtension->FailurePredictionInfo;
+ //NTSTATUS status;
PAGED_CODE();
@@ -3289,7 +3320,7 @@
return STATUS_SUCCESS;
} // end ClasspDisableTimer()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspFailurePredict() - ISSUE-2000/02/20-henrygab - not documented
@@ -3309,6 +3340,7 @@
so it must be PAGE LOCKED.
--*/
VOID
+NTAPI
ClasspFailurePredict(
IN PDEVICE_OBJECT DeviceObject,
IN PFAILURE_PREDICTION_INFO Info
@@ -3421,7 +3453,7 @@
IoFreeWorkItem(workItem);
return;
} // end ClasspFailurePredict()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassNotifyFailurePredicted() ISSUE-alanwar-2000/02/20 - not documented
@@ -3434,6 +3466,7 @@
--*/
VOID
+NTAPI
ClassNotifyFailurePredicted(
PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
PUCHAR Buffer,
@@ -3492,7 +3525,7 @@
}
}
} // end ClassNotifyFailurePredicted()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassSetFailurePredictionPoll()
@@ -3517,6 +3550,7 @@
--*/
NTSTATUS
+NTAPI
ClassSetFailurePredictionPoll(
PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
FAILURE_PREDICTION_METHOD FailurePredictionMethod,
@@ -3525,7 +3559,7 @@
{
PFAILURE_PREDICTION_INFO info;
NTSTATUS status;
- DEVICE_POWER_STATE powerState;
+ //DEVICE_POWER_STATE powerState;
PAGED_CODE();
@@ -3608,4 +3642,3 @@
return status;
} // end ClassSetFailurePredictionPoll()
-
Modified: trunk/reactos/drivers/storage/classpnp/class.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Sun Jul 29 01:49:24 2012
@@ -92,9 +92,6 @@
return STATUS_SUCCESS;
}
-
-
-
/*++////////////////////////////////////////////////////////////////////////////
ClassInitialize()
@@ -116,6 +113,7 @@
--*/
ULONG
+NTAPI
ClassInitialize(
IN PVOID Argument1,
IN PVOID Argument2,
@@ -328,7 +326,7 @@
status = STATUS_SUCCESS;
return status;
} // end ClassInitialize()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassInitializeEx()
@@ -362,6 +360,7 @@
--*/
ULONG
+NTAPI
ClassInitializeEx(
IN PDRIVER_OBJECT DriverObject,
IN LPGUID Guid,
@@ -402,7 +401,7 @@
return(status);
} // end ClassInitializeEx()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassUnload()
@@ -420,6 +419,7 @@
--*/
VOID
+NTAPI
ClassUnload(
IN PDRIVER_OBJECT DriverObject
)
@@ -459,7 +459,7 @@
return;
} // end ClassUnload()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassAddDevice()
@@ -484,6 +484,7 @@
--*/
NTSTATUS
+NTAPI
ClassAddDevice(
IN PDRIVER_OBJECT DriverObject,
IN PDEVICE_OBJECT PhysicalDeviceObject
@@ -502,7 +503,7 @@
PhysicalDeviceObject);
return status;
} // end ClassAddDevice()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassDispatchPnp()
@@ -524,6 +525,7 @@
--*/
NTSTATUS
+NTAPI
ClassDispatchPnp(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -1240,7 +1242,7 @@
return status;
} // end ClassDispatchPnp()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassPnpStartDevice()
@@ -1261,7 +1263,7 @@
none
--*/
-NTSTATUS ClassPnpStartDevice(IN PDEVICE_OBJECT DeviceObject)
+NTSTATUS NTAPI ClassPnpStartDevice(IN PDEVICE_OBJECT DeviceObject)
{
PCLASS_DRIVER_EXTENSION driverExtension;
PCLASS_INIT_DATA initData;
@@ -1273,7 +1275,7 @@
BOOLEAN isFdo = commonExtension->IsFdo;
BOOLEAN isMountedDevice = TRUE;
- UNICODE_STRING interfaceName;
+ //UNICODE_STRING interfaceName;
BOOLEAN timerStarted;
@@ -1570,12 +1572,12 @@
NT Status
--*/
-NTSTATUS ClassReadWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
+NTSTATUS NTAPI ClassReadWrite(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp)
{
PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension;
PDEVICE_OBJECT lowerDeviceObject = commonExtension->LowerDeviceObject;
PIO_STACK_LOCATION currentIrpStack = IoGetCurrentIrpStackLocation(Irp);
- LARGE_INTEGER startingOffset = currentIrpStack->Parameters.Read.ByteOffset;
+ //LARGE_INTEGER startingOffset =
currentIrpStack->Parameters.Read.ByteOffset;
ULONG transferByteCount = currentIrpStack->Parameters.Read.Length;
ULONG isRemoved;
NTSTATUS status;
@@ -1725,7 +1727,7 @@
Status is returned.
--*/
-NTSTATUS ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo)
+NTSTATUS NTAPI ClassReadDriveCapacity(IN PDEVICE_OBJECT Fdo)
{
READ_CAPACITY_DATA readCapacityBuffer = {0};
NTSTATUS status;
@@ -1738,7 +1740,7 @@
if (pkt){
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
KEVENT event;
- NTSTATUS pktStatus;
+ //NTSTATUS pktStatus;
IRP pseudoIrp = {0};
/*
@@ -2009,6 +2011,7 @@
--*/
VOID
+NTAPI
ClassSendStartUnit(
IN PDEVICE_OBJECT Fdo
)
@@ -2135,7 +2138,7 @@
return;
} // end StartUnit()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassAsynchronousCompletion() ISSUE-2000/02/18-henrygab - why public?!
@@ -2162,6 +2165,7 @@
--*/
NTSTATUS
+NTAPI
ClassAsynchronousCompletion(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -2239,15 +2243,13 @@
return STATUS_MORE_PROCESSING_REQUIRED;
} // end ClassAsynchronousCompletion()
-
-
-
-VOID ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp)
+
+VOID NTAPI ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp)
{
- PCOMMON_DEVICE_EXTENSION commonExt = Fdo->DeviceExtension;
+ //PCOMMON_DEVICE_EXTENSION commonExt = Fdo->DeviceExtension;
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
- PSTORAGE_ADAPTER_DESCRIPTOR adapterDesc =
commonExt->PartitionZeroExtension->AdapterDescriptor;
+ //PSTORAGE_ADAPTER_DESCRIPTOR adapterDesc =
commonExt->PartitionZeroExtension->AdapterDescriptor;
PIO_STACK_LOCATION currentSp = IoGetCurrentIrpStackLocation(Irp);
ULONG entireXferLen = currentSp->Parameters.Read.Length;
PUCHAR bufPtr = MmGetMdlVirtualAddress(Irp->MdlAddress);
@@ -2256,7 +2258,7 @@
SINGLE_LIST_ENTRY pktList;
PSINGLE_LIST_ENTRY slistEntry;
ULONG numPackets;
- KIRQL oldIrql;
+ //KIRQL oldIrql;
ULONG i;
/*
@@ -2397,7 +2399,6 @@
}
-
/*++////////////////////////////////////////////////////////////////////////////
ClassIoComplete()
@@ -2428,6 +2429,7 @@
--*/
NTSTATUS
+NTAPI
ClassIoComplete(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp,
@@ -2611,7 +2613,6 @@
} // end ClassIoComplete()
-
/*++////////////////////////////////////////////////////////////////////////////
ClassSendSrbSynchronous()
@@ -2644,6 +2645,7 @@
--*/
NTSTATUS
+NTAPI
ClassSendSrbSynchronous(
PDEVICE_OBJECT Fdo,
PSCSI_REQUEST_BLOCK Srb,
@@ -2960,7 +2962,6 @@
return status;
}
-
/*++////////////////////////////////////////////////////////////////////////////
ClassInterpretSenseInfo()
@@ -2990,6 +2991,7 @@
--*/
BOOLEAN
+NTAPI
ClassInterpretSenseInfo(
IN PDEVICE_OBJECT Fdo,
IN PSCSI_REQUEST_BLOCK Srb,
@@ -3443,7 +3445,7 @@
case SCSI_SENSE_UNIT_ATTENTION: {
- PVPB vpb;
+ //PVPB vpb;
ULONG count;
//
@@ -4095,8 +4097,6 @@
} // end ClassInterpretSenseInfo()
-
-
/*++////////////////////////////////////////////////////////////////////////////
ClassModeSense()
@@ -4121,7 +4121,7 @@
Length of the transferred data is returned.
--*/
-ULONG ClassModeSense( IN PDEVICE_OBJECT Fdo,
+ULONG NTAPI ClassModeSense( IN PDEVICE_OBJECT Fdo,
IN PCHAR ModeSenseBuffer,
IN ULONG Length,
IN UCHAR PageMode)
@@ -4137,7 +4137,7 @@
TRANSFER_PACKET *pkt = DequeueFreeTransferPacket(Fdo, TRUE);
if (pkt){
KEVENT event;
- NTSTATUS pktStatus;
+ //NTSTATUS pktStatus;
IRP pseudoIrp = {0};
/*
@@ -4182,7 +4182,6 @@
return lengthTransferred;
}
-
/*++////////////////////////////////////////////////////////////////////////////
ClassFindModePage()
@@ -4208,6 +4207,7 @@
--*/
PVOID
+NTAPI
ClassFindModePage(
IN PCHAR ModeSenseBuffer,
IN ULONG Length,
@@ -4279,7 +4279,7 @@
return result;
} // end ClassFindModePage()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassSendSrbAsynchronous()
@@ -4319,6 +4319,7 @@
--*/
NTSTATUS
+NTAPI
ClassSendSrbAsynchronous(
PDEVICE_OBJECT Fdo,
PSCSI_REQUEST_BLOCK Srb,
@@ -4506,7 +4507,7 @@
return STATUS_PENDING;
} // end ClassSendSrbAsynchronous()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassDeviceControlDispatch()
@@ -4529,6 +4530,7 @@
--*/
NTSTATUS
+NTAPI
ClassDeviceControlDispatch(
PDEVICE_OBJECT DeviceObject,
PIRP Irp
@@ -4559,7 +4561,6 @@
return commonExtension->DevInfo->ClassDeviceControl(DeviceObject,Irp);
} // end ClassDeviceControlDispatch()
-
/*++////////////////////////////////////////////////////////////////////////////
ClassDeviceControl()
@@ -4587,6 +4588,7 @@
--*/
NTSTATUS
+NTAPI
ClassDeviceControl(
PDEVICE_OBJECT DeviceObject,
PIRP Irp
@@ -4613,7 +4615,7 @@
if ((controlCode == IOCTL_SCSI_PASS_THROUGH) ||
(controlCode == IOCTL_SCSI_PASS_THROUGH_DIRECT)) {
- PSCSI_PASS_THROUGH scsiPass;
+ //PSCSI_PASS_THROUGH scsiPass;
//
// Validiate the user buffer.
@@ -5585,7 +5587,7 @@
return status;
} // end ClassDeviceControl()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassShutdownFlush()
@@ -5609,6 +5611,7 @@
--*/
NTSTATUS
+NTAPI
ClassShutdownFlush(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -5618,7 +5621,7 @@
ULONG isRemoved;
- NTSTATUS status;
+ //NTSTATUS status;
isRemoved = ClassAcquireRemoveLock(DeviceObject, Irp);
@@ -5653,7 +5656,7 @@
return STATUS_INVALID_DEVICE_REQUEST;
} // end ClassShutdownFlush()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassCreateDeviceObject()
@@ -5682,6 +5685,7 @@
--*/
NTSTATUS
+NTAPI
ClassCreateDeviceObject(
IN PDRIVER_OBJECT DriverObject,
IN PCCHAR ObjectNameBuffer,
@@ -5693,7 +5697,7 @@
BOOLEAN isPartitionable;
STRING ntNameString;
UNICODE_STRING ntUnicodeString;
- NTSTATUS status, status2;
+ NTSTATUS status;
PDEVICE_OBJECT deviceObject = NULL;
ULONG characteristics;
@@ -5956,7 +5960,7 @@
return status;
} // end ClassCreateDeviceObject()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassClaimDevice()
@@ -5979,6 +5983,7 @@
--*/
NTSTATUS
+NTAPI
ClassClaimDevice(
IN PDEVICE_OBJECT LowerDeviceObject,
IN BOOLEAN Release
@@ -6079,7 +6084,7 @@
return status;
} // end ClassClaimDevice()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassInternalIoControl()
@@ -6110,6 +6115,7 @@
--*/
NTSTATUS
+NTAPI
ClassInternalIoControl(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -6161,7 +6167,7 @@
return IoCallDriver(commonExtension->LowerDeviceObject, Irp);
} // end ClassInternalIoControl()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassQueryTimeOutRegistryValue()
@@ -6182,6 +6188,7 @@
--*/
ULONG
+NTAPI
ClassQueryTimeOutRegistryValue(
IN PDEVICE_OBJECT DeviceObject
)
@@ -6264,7 +6271,7 @@
return timeOut;
} // end ClassQueryTimeOutRegistryValue()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassCheckVerifyComplete() ISSUE-2000/02/18-henrygab - why public?!
@@ -6289,6 +6296,7 @@
--*/
NTSTATUS
+NTAPI
ClassCheckVerifyComplete(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp,
@@ -6328,7 +6336,7 @@
return STATUS_MORE_PROCESSING_REQUIRED;
} // end ClassCheckVerifyComplete()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassGetDescriptor()
@@ -6354,6 +6362,7 @@
--*/
NTSTATUS
+NTAPI
ClassGetDescriptor(
IN PDEVICE_OBJECT DeviceObject,
IN PSTORAGE_PROPERTY_ID PropertyId,
@@ -6366,7 +6375,7 @@
PSTORAGE_DESCRIPTOR_HEADER descriptor = NULL;
ULONG length;
- UCHAR pass = 0;
+ //UCHAR pass = 0;
PAGED_CODE();
@@ -6477,7 +6486,7 @@
*Descriptor = descriptor;
return ioStatus.Status;
} // end ClassGetDescriptor()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassSignalCompletion()
@@ -6503,6 +6512,7 @@
--*/
NTSTATUS
+NTAPI
ClassSignalCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -6513,7 +6523,7 @@
return STATUS_MORE_PROCESSING_REQUIRED;
} // end ClassSignalCompletion()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassPnpQueryFdoRelations()
@@ -6537,6 +6547,7 @@
--*/
NTSTATUS
+NTAPI
ClassPnpQueryFdoRelations(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp
@@ -6569,7 +6580,7 @@
return Irp->IoStatus.Status;
} // end ClassPnpQueryFdoRelations()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassMarkChildrenMissing()
@@ -6590,6 +6601,7 @@
--*/
VOID
+NTAPI
ClassMarkChildrenMissing(
IN PFUNCTIONAL_DEVICE_EXTENSION Fdo
)
@@ -6615,7 +6627,7 @@
ClassReleaseChildLock(Fdo);
return;
} // end ClassMarkChildrenMissing()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassMarkChildMissing()
@@ -6642,6 +6654,7 @@
--*/
BOOLEAN
+NTAPI
ClassMarkChildMissing(
IN PPHYSICAL_DEVICE_EXTENSION Child,
IN BOOLEAN AcquireChildLock
@@ -6668,7 +6681,7 @@
return returnValue;
} // end ClassMarkChildMissing()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassRetrieveDeviceRelations()
@@ -6693,6 +6706,7 @@
--*/
NTSTATUS
+NTAPI
ClassRetrieveDeviceRelations(
IN PDEVICE_OBJECT Fdo,
IN DEVICE_RELATION_TYPE RelationType,
@@ -6782,7 +6796,7 @@
ClassReleaseChildLock(fdoExtension);
return STATUS_SUCCESS;
} // end ClassRetrieveDeviceRelations()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassGetPdoId()
@@ -6807,6 +6821,7 @@
--*/
NTSTATUS
+NTAPI
ClassGetPdoId(
IN PDEVICE_OBJECT Pdo,
IN BUS_QUERY_ID_TYPE IdType,
@@ -6824,7 +6839,7 @@
return driverExtension->InitData.ClassQueryId( Pdo, IdType, IdString);
} // end ClassGetPdoId()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassQueryPnpCapabilities()
@@ -6845,6 +6860,7 @@
--*/
NTSTATUS
+NTAPI
ClassQueryPnpCapabilities(
IN PDEVICE_OBJECT DeviceObject,
IN PDEVICE_CAPABILITIES Capabilities
@@ -6874,7 +6890,7 @@
return STATUS_NOT_IMPLEMENTED;
}
} // end ClassQueryPnpCapabilities()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassInvalidateBusRelations()
@@ -6896,6 +6912,7 @@
--*/
VOID
+NTAPI
ClassInvalidateBusRelations(
IN PDEVICE_OBJECT Fdo
)
@@ -6927,7 +6944,7 @@
return;
} // end ClassInvalidateBusRelations()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassRemoveDevice() ISSUE-2000/02/18-henrygab - why public?!
@@ -6951,6 +6968,7 @@
--*/
NTSTATUS
+NTAPI
ClassRemoveDevice(
IN PDEVICE_OBJECT DeviceObject,
IN UCHAR RemoveType
@@ -7072,7 +7090,7 @@
status = STATUS_SUCCESS;
if (commonExtension->IsFdo){
- PDEVICE_OBJECT pdo;
+ //PDEVICE_OBJECT pdo;
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension =
DeviceObject->DeviceExtension;
ClasspDisableTimer(fdoExtension->DeviceObject);
@@ -7196,7 +7214,7 @@
return STATUS_SUCCESS;
} // end ClassRemoveDevice()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassGetDriverExtension()
@@ -7215,13 +7233,14 @@
--*/
PCLASS_DRIVER_EXTENSION
+NTAPI
ClassGetDriverExtension(
IN PDRIVER_OBJECT DriverObject
)
{
return IoGetDriverObjectExtension(DriverObject, CLASS_DRIVER_EXTENSION_KEY);
} // end ClassGetDriverExtension()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspStartIo()
@@ -7240,6 +7259,7 @@
--*/
VOID
+NTAPI
ClasspStartIo(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -7270,7 +7290,7 @@
return;
} // ClasspStartIo()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassUpdateInformationInRegistry()
@@ -7299,6 +7319,7 @@
--*/
VOID
+NTAPI
ClassUpdateInformationInRegistry(
IN PDEVICE_OBJECT Fdo,
IN PCHAR DeviceName,
@@ -7477,7 +7498,7 @@
}
} // end ClassUpdateInformationInRegistry()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspSendSynchronousCompletion()
@@ -7501,6 +7522,7 @@
--*/
NTSTATUS
+NTAPI
ClasspSendSynchronousCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -7539,13 +7561,14 @@
return STATUS_MORE_PROCESSING_REQUIRED;
} // end ClasspSendSynchronousCompletion()
-
+
/*++
ISSUE-2000/02/20-henrygab Not documented ClasspRegisterMountedDeviceInterface
--*/
VOID
+NTAPI
ClasspRegisterMountedDeviceInterface(
IN PDEVICE_OBJECT DeviceObject
)
@@ -7598,7 +7621,7 @@
}
return;
} // end ClasspRegisterMountedDeviceInterface()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassSendDeviceIoControlSynchronous()
@@ -7636,6 +7659,7 @@
--*/
VOID
+NTAPI
ClassSendDeviceIoControlSynchronous(
IN ULONG IoControlCode,
IN PDEVICE_OBJECT TargetDeviceObject,
@@ -7874,7 +7898,7 @@
return;
} // end ClassSendDeviceIoControlSynchronous()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassForwardIrpSynchronous()
@@ -7893,6 +7917,7 @@
--*/
NTSTATUS
+NTAPI
ClassForwardIrpSynchronous(
IN PCOMMON_DEVICE_EXTENSION CommonExtension,
IN PIRP Irp
@@ -7901,7 +7926,7 @@
IoCopyCurrentIrpStackLocationToNext(Irp);
return ClassSendIrpSynchronous(CommonExtension->LowerDeviceObject, Irp);
} // end ClassForwardIrpSynchronous()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassSendIrpSynchronous()
@@ -7922,6 +7947,7 @@
--*/
NTSTATUS
+NTAPI
ClassSendIrpSynchronous(
IN PDEVICE_OBJECT TargetDeviceObject,
IN PIRP Irp
@@ -7999,7 +8025,7 @@
return status;
} // end ClassSendIrpSynchronous()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassGetVpb()
@@ -8021,25 +8047,27 @@
--*/
PVPB
+NTAPI
ClassGetVpb(
IN PDEVICE_OBJECT DeviceObject
)
{
return DeviceObject->Vpb;
} // end ClassGetVpb()
-
+
/*++
ISSUE-2000/02/20-henrygab Not documented ClasspAllocateReleaseRequest
--*/
NTSTATUS
+NTAPI
ClasspAllocateReleaseRequest(
IN PDEVICE_OBJECT Fdo
)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = Fdo->DeviceExtension;
- PIO_STACK_LOCATION irpStack;
+ //PIO_STACK_LOCATION irpStack;
KeInitializeSpinLock(&(fdoExtension->ReleaseQueueSpinLock));
@@ -8062,13 +8090,14 @@
return STATUS_SUCCESS;
} // end ClasspAllocateReleaseRequest()
-
+
/*++
ISSUE-2000/02/20-henrygab Not documented ClasspFreeReleaseRequest
--*/
VOID
+NTAPI
ClasspFreeReleaseRequest(
IN PDEVICE_OBJECT Fdo
)
@@ -8105,7 +8134,7 @@
return;
} // end ClasspFreeReleaseRequest()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassReleaseQueue()
@@ -8130,6 +8159,7 @@
--*/
VOID
+NTAPI
ClassReleaseQueue(
IN PDEVICE_OBJECT Fdo
)
@@ -8137,7 +8167,7 @@
ClasspReleaseQueue(Fdo, NULL);
return;
} // end ClassReleaseQueue()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspAllocateReleaseQueueIrp()
@@ -8162,11 +8192,12 @@
--*/
NTSTATUS
+NTAPI
ClasspAllocateReleaseQueueIrp(
PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
{
- KIRQL oldIrql;
+ //KIRQL oldIrql;
UCHAR lowerStackSize;
//
@@ -8205,7 +8236,6 @@
return STATUS_SUCCESS;
}
-
/*++////////////////////////////////////////////////////////////////////////////
@@ -8238,6 +8268,7 @@
--*/
VOID
+NTAPI
ClasspReleaseQueue(
IN PDEVICE_OBJECT Fdo,
IN PIRP ReleaseQueueIrp OPTIONAL
@@ -8353,7 +8384,7 @@
return;
} // end ClassReleaseQueue()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassReleaseQueueCompletion()
@@ -8380,6 +8411,7 @@
--*/
NTSTATUS
+NTAPI
ClassReleaseQueueCompletion(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -8429,7 +8461,7 @@
return STATUS_MORE_PROCESSING_REQUIRED;
} // ClassAsynchronousCompletion()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassAcquireChildLock()
@@ -8450,6 +8482,7 @@
--*/
VOID
+NTAPI
ClassAcquireChildLock(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -8472,7 +8505,7 @@
FdoExtension->ChildLockAcquisitionCount++;
return;
}
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassReleaseChildLock() ISSUE-2000/02/18-henrygab - not documented
@@ -8492,6 +8525,7 @@
--*/
VOID
+NTAPI
ClassReleaseChildLock(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -8508,7 +8542,7 @@
return;
} // end ClassReleaseChildLock(
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassAddChild()
@@ -8531,6 +8565,7 @@
--*/
VOID
+NTAPI
ClassAddChild(
IN PFUNCTIONAL_DEVICE_EXTENSION Parent,
IN PPHYSICAL_DEVICE_EXTENSION Child,
@@ -8565,7 +8600,7 @@
}
return;
} // end ClassAddChild()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassRemoveChild()
@@ -8592,6 +8627,7 @@
--*/
PPHYSICAL_DEVICE_EXTENSION
+NTAPI
ClassRemoveChild(
IN PFUNCTIONAL_DEVICE_EXTENSION Parent,
IN PPHYSICAL_DEVICE_EXTENSION Child,
@@ -8659,13 +8695,13 @@
return Child;
} // end ClassRemoveChild()
-
/*++
ISSUE-2000/02/20-henrygab Not documented ClasspRetryRequestDpc
--*/
VOID
+NTAPI
ClasspRetryRequestDpc(
IN PKDPC Dpc,
IN PDEVICE_OBJECT DeviceObject,
@@ -8735,13 +8771,14 @@
return;
} // end ClasspRetryRequestDpc()
-
+
/*++
ISSUE-2000/02/20-henrygab Not documented ClassRetryRequest
--*/
VOID
+NTAPI
ClassRetryRequest(
IN PDEVICE_OBJECT SelfDeviceObject,
IN PIRP Irp,
@@ -8751,7 +8788,7 @@
PFUNCTIONAL_DEVICE_EXTENSION fdoExtension;
PCLASS_PRIVATE_FDO_DATA fdoData;
PCLASS_RETRY_INFO retryInfo;
- PCLASS_RETRY_INFO *previousNext;
+ //PCLASS_RETRY_INFO *previousNext;
LARGE_INTEGER delta;
KIRQL irql;
@@ -8867,13 +8904,14 @@
} // end ClassRetryRequest()
-
+
/*++
ISSUE-2000/02/20-henrygab Not documented ClasspRetryDpcTimer
--*/
VOID
+NTAPI
ClasspRetryDpcTimer(
IN PCLASS_PRIVATE_FDO_DATA FdoData
)
@@ -8922,8 +8960,9 @@
return;
} // end ClasspRetryDpcTimer()
-
+
NTSTATUS
+NTAPI
ClasspInitializeHotplugInfo(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -9040,8 +9079,9 @@
return STATUS_SUCCESS;
}
-
+
VOID
+NTAPI
ClasspScanForClassHacks(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN ULONG_PTR Data
@@ -9057,8 +9097,9 @@
SET_FLAG(FdoExtension->PrivateFdoData->HackFlags, Data);
return;
}
-
+
VOID
+NTAPI
ClasspScanForSpecialInRegistry(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -9177,7 +9218,3 @@
return;
}
-
-
-
-
Modified: trunk/reactos/drivers/storage/classpnp/classp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/classp.h [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/classp.h [iso-8859-1] Sun Jul 29 01:49:24 2012
@@ -509,34 +509,40 @@
}
NTSTATUS
+NTAPI
DriverEntry(
IN PDRIVER_OBJECT DriverObject,
IN PUNICODE_STRING RegistryPath
);
VOID
+NTAPI
ClassUnload(
IN PDRIVER_OBJECT DriverObject
);
NTSTATUS
+NTAPI
ClassCreateClose(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
);
NTSTATUS
+NTAPI
ClasspCreateClose(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
);
VOID
+NTAPI
ClasspCleanupProtectedLocks(
IN PFILE_OBJECT_EXTENSION FsContext
);
NTSTATUS
+NTAPI
ClasspEjectionControl(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp,
@@ -545,63 +551,59 @@
);
NTSTATUS
+NTAPI
ClassReadWrite(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
);
NTSTATUS
+NTAPI
ClassDeviceControlDispatch(
PDEVICE_OBJECT DeviceObject,
PIRP Irp
);
NTSTATUS
-ClassDeviceControl(
- PDEVICE_OBJECT DeviceObject,
- PIRP Irp
- );
-
-NTSTATUS
+NTAPI
ClassDispatchPnp(
PDEVICE_OBJECT DeviceObject,
PIRP Irp
);
NTSTATUS
+NTAPI
ClassPnpStartDevice(
IN PDEVICE_OBJECT DeviceObject
);
NTSTATUS
-ClassInternalIoControl (
+NTAPI
+ClassShutdownFlush(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
);
NTSTATUS
-ClassShutdownFlush(
+NTAPI
+ClassSystemControl(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
);
-NTSTATUS
-ClassSystemControl(
- IN PDEVICE_OBJECT DeviceObject,
- IN PIRP Irp
- );
-
//
// Class internal routines
//
NTSTATUS
+NTAPI
ClassAddDevice(
IN PDRIVER_OBJECT DriverObject,
IN OUT PDEVICE_OBJECT PhysicalDeviceObject
);
NTSTATUS
+NTAPI
ClasspSendSynchronousCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -609,6 +611,7 @@
);
VOID
+NTAPI
RetryRequest(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -618,6 +621,7 @@
);
NTSTATUS
+NTAPI
ClassIoCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -625,12 +629,14 @@
);
NTSTATUS
+NTAPI
ClassPnpQueryFdoRelations(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp
);
NTSTATUS
+NTAPI
ClassRetrieveDeviceRelations(
IN PDEVICE_OBJECT Fdo,
IN DEVICE_RELATION_TYPE RelationType,
@@ -638,6 +644,7 @@
);
NTSTATUS
+NTAPI
ClassGetPdoId(
IN PDEVICE_OBJECT Pdo,
IN BUS_QUERY_ID_TYPE IdType,
@@ -645,18 +652,21 @@
);
NTSTATUS
+NTAPI
ClassQueryPnpCapabilities(
IN PDEVICE_OBJECT PhysicalDeviceObject,
IN PDEVICE_CAPABILITIES Capabilities
);
VOID
+NTAPI
ClasspStartIo(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
);
NTSTATUS
+NTAPI
ClasspPagingNotificationCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -664,6 +674,7 @@
);
NTSTATUS
+NTAPI
ClasspMediaChangeCompletion(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -671,12 +682,14 @@
);
PFILE_OBJECT_EXTENSION
+NTAPI
ClasspGetFsContext(
IN PCOMMON_DEVICE_EXTENSION CommonExtension,
IN PFILE_OBJECT FileObject
);
NTSTATUS
+NTAPI
ClasspMcnControl(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PIRP Irp,
@@ -684,16 +697,19 @@
);
VOID
+NTAPI
ClasspRegisterMountedDeviceInterface(
IN PDEVICE_OBJECT DeviceObject
);
NTSTATUS
+NTAPI
ClasspDisableTimer(
PDEVICE_OBJECT DeviceObject
);
NTSTATUS
+NTAPI
ClasspEnableTimer(
PDEVICE_OBJECT DeviceObject
);
@@ -703,16 +719,19 @@
//
VOID
+NTAPI
InitializeDictionary(
IN PDICTIONARY Dictionary
);
BOOLEAN
+NTAPI
TestDictionarySignature(
IN PDICTIONARY Dictionary
);
NTSTATUS
+NTAPI
AllocateDictionaryEntry(
IN PDICTIONARY Dictionary,
IN ULONGLONG Key,
@@ -722,12 +741,14 @@
);
PVOID
+NTAPI
GetDictionaryEntry(
IN PDICTIONARY Dictionary,
IN ULONGLONG Key
);
VOID
+NTAPI
FreeDictionaryEntry(
IN PDICTIONARY Dictionary,
IN PVOID Entry
@@ -735,16 +756,19 @@
NTSTATUS
+NTAPI
ClasspAllocateReleaseRequest(
IN PDEVICE_OBJECT Fdo
);
VOID
+NTAPI
ClasspFreeReleaseRequest(
IN PDEVICE_OBJECT Fdo
);
NTSTATUS
+NTAPI
ClassReleaseQueueCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -752,12 +776,14 @@
);
VOID
+NTAPI
ClasspReleaseQueue(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP ReleaseQueueIrp
);
VOID
+NTAPI
ClasspDisablePowerNotification(
PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
);
@@ -767,12 +793,14 @@
//
NTSTATUS
+NTAPI
ClassDispatchPower(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
);
NTSTATUS
+NTAPI
ClassMinimalPowerHandler(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -783,6 +811,7 @@
//
VOID
+NTAPI
ClassAddChild(
IN PFUNCTIONAL_DEVICE_EXTENSION Parent,
IN PPHYSICAL_DEVICE_EXTENSION Child,
@@ -790,6 +819,7 @@
);
PPHYSICAL_DEVICE_EXTENSION
+NTAPI
ClassRemoveChild(
IN PFUNCTIONAL_DEVICE_EXTENSION Parent,
IN PPHYSICAL_DEVICE_EXTENSION Child,
@@ -797,11 +827,13 @@
);
VOID
+NTAPI
ClasspRetryDpcTimer(
IN PCLASS_PRIVATE_FDO_DATA FdoData
);
VOID
+NTAPI
ClasspRetryRequestDpc(
IN PKDPC Dpc,
IN PDEVICE_OBJECT DeviceObject,
@@ -810,12 +842,14 @@
);
VOID
+NTAPI
ClassFreeOrReuseSrb(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PSCSI_REQUEST_BLOCK Srb
);
VOID
+NTAPI
ClassRetryRequest(
IN PDEVICE_OBJECT SelfDeviceObject,
IN PIRP Irp,
@@ -823,6 +857,7 @@
);
VOID
+NTAPI
ClasspBuildRequestEx(
IN PFUNCTIONAL_DEVICE_EXTENSION Fdo,
IN PIRP Irp,
@@ -830,17 +865,20 @@
);
NTSTATUS
+NTAPI
ClasspAllocateReleaseQueueIrp(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
);
NTSTATUS
+NTAPI
ClasspInitializeGesn(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PMEDIA_CHANGE_DETECTION_INFO Info
);
VOID
+NTAPI
ClasspSendNotification(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN const GUID * Guid,
@@ -849,60 +887,60 @@
);
VOID
+NTAPI
ClassSendEjectionNotification(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
);
VOID
+NTAPI
ClasspScanForSpecialInRegistry(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
);
VOID
+NTAPI
ClasspScanForClassHacks(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN ULONG_PTR Data
);
NTSTATUS
+NTAPI
ClasspInitializeHotplugInfo(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
);
VOID
+NTAPI
ClasspPerfIncrementErrorCount(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
);
VOID
+NTAPI
ClasspPerfIncrementSuccessfulIo(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
);
-
-PTRANSFER_PACKET NewTransferPacket(PDEVICE_OBJECT Fdo);
-VOID DestroyTransferPacket(PTRANSFER_PACKET Pkt);
-VOID EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt);
-PTRANSFER_PACKET DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN AllocIfNeeded);
-VOID SetupReadWriteTransferPacket(PTRANSFER_PACKET pkt, PVOID Buf, ULONG Len,
LARGE_INTEGER DiskLocation, PIRP OriginalIrp);
-VOID SubmitTransferPacket(PTRANSFER_PACKET Pkt);
-NTSTATUS TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID Context);
-VOID ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp);
-VOID TransferPacketRetryTimerDpc(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID
SystemArgument1, IN PVOID SystemArgument2);
-BOOLEAN InterpretTransferPacketError(PTRANSFER_PACKET Pkt);
-BOOLEAN RetryTransferPacket(PTRANSFER_PACKET Pkt);
-VOID EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp);
-PIRP DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData);
-VOID InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER
TargetLocation);
-BOOLEAN StepLowMemRetry(PTRANSFER_PACKET Pkt);
-VOID SetupEjectionTransferPacket(TRANSFER_PACKET *Pkt, BOOLEAN PreventMediaRemoval,
PKEVENT SyncEventPtr, PIRP OriginalIrp);
-VOID SetupModeSenseTransferPacket(TRANSFER_PACKET *Pkt, PKEVENT SyncEventPtr, PVOID
ModeSenseBuffer, UCHAR ModeSenseBufferLen, UCHAR PageMode, PIRP OriginalIrp);
-VOID SetupDriveCapacityTransferPacket(TRANSFER_PACKET *Pkt, PVOID ReadCapacityBuffer,
ULONG ReadCapacityBufferLen, PKEVENT SyncEventPtr, PIRP OriginalIrp);
-PMDL BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen);
-VOID FreeDeviceInputMdl(PMDL Mdl);
-NTSTATUS InitializeTransferPackets(PDEVICE_OBJECT Fdo);
-VOID DestroyAllTransferPackets(PDEVICE_OBJECT Fdo);
-
-
-
-
-
+PTRANSFER_PACKET NTAPI NewTransferPacket(PDEVICE_OBJECT Fdo);
+VOID NTAPI DestroyTransferPacket(PTRANSFER_PACKET Pkt);
+VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt);
+PTRANSFER_PACKET NTAPI DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN
AllocIfNeeded);
+VOID NTAPI SetupReadWriteTransferPacket(PTRANSFER_PACKET pkt, PVOID Buf, ULONG Len,
LARGE_INTEGER DiskLocation, PIRP OriginalIrp);
+VOID NTAPI SubmitTransferPacket(PTRANSFER_PACKET Pkt);
+NTSTATUS NTAPI TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID
Context);
+VOID NTAPI ServiceTransferRequest(PDEVICE_OBJECT Fdo, PIRP Irp);
+VOID NTAPI TransferPacketRetryTimerDpc(IN PKDPC Dpc, IN PVOID DeferredContext, IN PVOID
SystemArgument1, IN PVOID SystemArgument2);
+BOOLEAN NTAPI InterpretTransferPacketError(PTRANSFER_PACKET Pkt);
+BOOLEAN NTAPI RetryTransferPacket(PTRANSFER_PACKET Pkt);
+VOID NTAPI EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp);
+PIRP NTAPI DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData);
+VOID NTAPI InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER
TargetLocation);
+BOOLEAN NTAPI StepLowMemRetry(PTRANSFER_PACKET Pkt);
+VOID NTAPI SetupEjectionTransferPacket(TRANSFER_PACKET *Pkt, BOOLEAN PreventMediaRemoval,
PKEVENT SyncEventPtr, PIRP OriginalIrp);
+VOID NTAPI SetupModeSenseTransferPacket(TRANSFER_PACKET *Pkt, PKEVENT SyncEventPtr, PVOID
ModeSenseBuffer, UCHAR ModeSenseBufferLen, UCHAR PageMode, PIRP OriginalIrp);
+VOID NTAPI SetupDriveCapacityTransferPacket(TRANSFER_PACKET *Pkt, PVOID
ReadCapacityBuffer, ULONG ReadCapacityBufferLen, PKEVENT SyncEventPtr, PIRP OriginalIrp);
+PMDL NTAPI BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen);
+VOID NTAPI FreeDeviceInputMdl(PMDL Mdl);
+NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo);
+VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo);
Modified: trunk/reactos/drivers/storage/classpnp/classwmi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] Sun Jul 29 01:49:24
2012
@@ -24,6 +24,7 @@
#include "classp.h"
NTSTATUS
+NTAPI
ClassSystemControl(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -121,6 +122,7 @@
--*/
NTSTATUS
+NTAPI
ClassSystemControl(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -551,6 +553,7 @@
--*/
SCSIPORTAPI
NTSTATUS
+NTAPI
ClassWmiCompleteRequest(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -561,7 +564,7 @@
{
PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension;
PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp);
- UCHAR MinorFunction;
+ //UCHAR MinorFunction;
PUCHAR buffer;
ULONG retSize;
UCHAR minorFunction;
@@ -715,6 +718,7 @@
--*/
NTSTATUS
+NTAPI
ClassWmiFireEvent(
IN PDEVICE_OBJECT DeviceObject,
IN LPGUID Guid,
Modified: trunk/reactos/drivers/storage/classpnp/clntirp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/clntirp.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/clntirp.c [iso-8859-1] Sun Jul 29 01:49:24
2012
@@ -24,13 +24,12 @@
#include "classp.h"
#include "debug.h"
-
/*
* EnqueueDeferredClientIrp
*
* Note: we currently do not support Cancel for storage irps.
*/
-VOID EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp)
+VOID NTAPI EnqueueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData, PIRP Irp)
{
KIRQL oldIrql;
@@ -44,7 +43,7 @@
* DequeueDeferredClientIrp
*
*/
-PIRP DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData)
+PIRP NTAPI DequeueDeferredClientIrp(PCLASS_PRIVATE_FDO_DATA FdoData)
{
KIRQL oldIrql;
PLIST_ENTRY listEntry;
@@ -69,6 +68,3 @@
return irp;
}
-
-
-
Modified: trunk/reactos/drivers/storage/classpnp/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/create.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/create.c [iso-8859-1] Sun Jul 29 01:49:24 2012
@@ -35,16 +35,18 @@
PFILE_OBJECT_EXTENSION
+NTAPI
ClasspGetFsContext(
IN PCOMMON_DEVICE_EXTENSION CommonExtension,
IN PFILE_OBJECT FileObject
);
VOID
+NTAPI
ClasspCleanupDisableMcn(
IN PFILE_OBJECT_EXTENSION FsContext
);
-
+
#ifdef ALLOC_PRAGMA
#pragma alloc_text(PAGE, ClassCreateClose)
#pragma alloc_text(PAGE, ClasspCreateClose)
@@ -55,6 +57,7 @@
#endif
NTSTATUS
+NTAPI
ClassCreateClose(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -119,8 +122,8 @@
return status;
}
-
NTSTATUS
+NTAPI
ClasspCreateClose(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -292,8 +295,8 @@
return status;
}
-
VOID
+NTAPI
ClasspCleanupProtectedLocks(
IN PFILE_OBJECT_EXTENSION FsContext
)
@@ -403,8 +406,8 @@
return;
}
-
VOID
+NTAPI
ClasspCleanupDisableMcn(
IN PFILE_OBJECT_EXTENSION FsContext
)
@@ -438,7 +441,6 @@
return;
}
-
#if 1
/*
@@ -447,6 +449,7 @@
* are resolved.
*/
NTSTATUS
+NTAPI
ClasspEjectionControl(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp,
@@ -738,7 +741,8 @@
* HOWEVER, it seems to cause pagefile initialization to fail during boot
* for some reason. Need to resolve this before switching to this function.
*/
-NTSTATUS
+NTSTATUS
+NTAPI
ClasspEjectionControl(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp,
@@ -965,6 +969,7 @@
#endif
PFILE_OBJECT_EXTENSION
+NTAPI
ClasspGetFsContext(
IN PCOMMON_DEVICE_EXTENSION CommonExtension,
IN PFILE_OBJECT FileObject
@@ -974,4 +979,3 @@
return GetDictionaryEntry(&(CommonExtension->FileObjectDictionary),
(ULONGLONG) FileObject);
}
-
Modified: trunk/reactos/drivers/storage/classpnp/dictlib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/d…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/dictlib.c [iso-8859-1] Sun Jul 29 01:49:24
2012
@@ -35,6 +35,7 @@
VOID
+NTAPI
InitializeDictionary(
IN PDICTIONARY Dictionary
)
@@ -45,8 +46,8 @@
return;
}
-
BOOLEAN
+NTAPI
TestDictionarySignature(
IN PDICTIONARY Dictionary
)
@@ -55,6 +56,7 @@
}
NTSTATUS
+NTAPI
AllocateDictionaryEntry(
IN PDICTIONARY Dictionary,
IN ULONGLONG Key,
@@ -132,8 +134,8 @@
return status;
}
-
PVOID
+NTAPI
GetDictionaryEntry(
IN PDICTIONARY Dictionary,
IN ULONGLONG Key
@@ -164,8 +166,8 @@
return data;
}
-
VOID
+NTAPI
FreeDictionaryEntry(
IN PDICTIONARY Dictionary,
IN PVOID Entry
@@ -208,5 +210,3 @@
return;
}
-
-
Modified: trunk/reactos/drivers/storage/classpnp/lock.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/l…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] Sun Jul 29 01:49:24 2012
@@ -79,6 +79,7 @@
--*/
ULONG
+NTAPI
ClassAcquireRemoveLockEx(
IN PDEVICE_OBJECT DeviceObject,
IN OPTIONAL PVOID Tag,
@@ -209,6 +210,7 @@
--*/
VOID
+NTAPI
ClassReleaseRemoveLock(
IN PDEVICE_OBJECT DeviceObject,
IN OPTIONAL PIRP Tag
@@ -372,6 +374,7 @@
--*/
VOID
+NTAPI
ClassCompleteRequest(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Sun Jul 29 01:49:24
2012
@@ -26,8 +26,8 @@
#include "classp.h"
#include "debug.h"
-PIRP ClassRemoveCScanList(IN PCSCAN_LIST List);
-VOID ClasspInitializeCScanList(IN PCSCAN_LIST List);
+PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List);
+VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List);
#ifdef ALLOC_PRAGMA
#pragma alloc_text(PAGE, ClassDeleteSrbLookasideList)
@@ -38,10 +38,6 @@
LIST_ENTRY Entry;
ULONGLONG BlockNumber;
} CSCAN_LIST_ENTRY, *PCSCAN_LIST_ENTRY;
-
-
-
-
/*
* ClassSplitRequest
@@ -51,7 +47,7 @@
* StartIo routine when the transfer size is too large for the hardware.
* We map it to our new read/write handler.
*/
-VOID ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes)
+VOID NTAPI ClassSplitRequest(IN PDEVICE_OBJECT Fdo, IN PIRP Irp, IN ULONG MaximumBytes)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -69,7 +65,6 @@
ServiceTransferRequest(Fdo, Irp);
}
-
/*++////////////////////////////////////////////////////////////////////////////
@@ -100,6 +95,7 @@
--*/
NTSTATUS
+NTAPI
ClassIoCompleteAssociated(
IN PDEVICE_OBJECT Fdo,
IN PIRP Irp,
@@ -313,7 +309,6 @@
} // end ClassIoCompleteAssociated()
-
/*++////////////////////////////////////////////////////////////////////////////
RetryRequest()
@@ -342,6 +337,7 @@
--*/
VOID
+NTAPI
RetryRequest(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -443,7 +439,6 @@
return;
} // end RetryRequest()
-
/*++
ClassBuildRequest()
@@ -477,6 +472,7 @@
--*/
NTSTATUS
+NTAPI
ClassBuildRequest(
PDEVICE_OBJECT Fdo,
PIRP Irp
@@ -504,8 +500,8 @@
} // end ClassBuildRequest()
-
VOID
+NTAPI
ClasspBuildRequestEx(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PIRP Irp,
@@ -731,8 +727,7 @@
}
-
-VOID ClasspInsertCScanList(IN PLIST_ENTRY ListHead, IN PCSCAN_LIST_ENTRY Entry)
+VOID NTAPI ClasspInsertCScanList(IN PLIST_ENTRY ListHead, IN PCSCAN_LIST_ENTRY Entry)
{
PCSCAN_LIST_ENTRY t;
@@ -776,8 +771,7 @@
}
-
-VOID ClassInsertCScanList(IN PCSCAN_LIST List, IN PIRP Irp, IN ULONGLONG BlockNumber, IN
BOOLEAN LowPriority)
+VOID NTAPI ClassInsertCScanList(IN PCSCAN_LIST List, IN PIRP Irp, IN ULONGLONG
BlockNumber, IN BOOLEAN LowPriority)
/*++
Routine Description:
@@ -829,11 +823,8 @@
return;
}
-
-
-
-VOID ClassFreeOrReuseSrb( IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
- IN PSCSI_REQUEST_BLOCK Srb)
+VOID NTAPI ClassFreeOrReuseSrb(IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
+ IN PSCSI_REQUEST_BLOCK Srb)
/*++
Routine Description:
@@ -887,7 +878,6 @@
}
}
-
/*++////////////////////////////////////////////////////////////////////////////
ClassDeleteSrbLookasideList()
@@ -909,7 +899,7 @@
None
--*/
-VOID ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension)
+VOID NTAPI ClassDeleteSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension)
{
PAGED_CODE();
@@ -924,7 +914,6 @@
DBGWARN(("ClassDeleteSrbLookasideList: attempt to delete uninitialized or
freed srblookasidelist"));
}
}
-
/*++////////////////////////////////////////////////////////////////////////////
@@ -952,8 +941,8 @@
--*/
-VOID ClassInitializeSrbLookasideList( IN PCOMMON_DEVICE_EXTENSION CommonExtension,
- IN ULONG NumberElements)
+VOID NTAPI ClassInitializeSrbLookasideList(IN PCOMMON_DEVICE_EXTENSION CommonExtension,
+ IN ULONG NumberElements)
{
PAGED_CODE();
@@ -976,10 +965,7 @@
}
-
-
-
-VOID ClasspInitializeCScanList(IN PCSCAN_LIST List)
+VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List)
{
PAGED_CODE();
RtlZeroMemory(List, sizeof(CSCAN_LIST));
@@ -987,9 +973,7 @@
InitializeListHead(&(List->NextSweep));
}
-
-
-VOID ClasspStartNextSweep(PCSCAN_LIST List)
+VOID NTAPI ClasspStartNextSweep(PCSCAN_LIST List)
{
ASSERT(IsListEmpty(&(List->CurrentSweep)) == TRUE);
@@ -1024,9 +1008,7 @@
return;
}
-
-
-PIRP ClassRemoveCScanList(IN PCSCAN_LIST List)
+PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List)
{
PCSCAN_LIST_ENTRY entry;
@@ -1057,4 +1039,3 @@
return CONTAINING_RECORD(entry, IRP, Tail.Overlay.DriverContext);
}
-
Modified: trunk/reactos/drivers/storage/classpnp/power.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/p…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/power.c [iso-8859-1] Sun Jul 29 01:49:24 2012
@@ -26,6 +26,7 @@
#define CLASS_TAG_POWER 'WLcS'
NTSTATUS
+NTAPI
ClasspPowerHandler(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -33,6 +34,7 @@
);
NTSTATUS
+NTAPI
ClasspPowerDownCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -40,6 +42,7 @@
);
NTSTATUS
+NTAPI
ClasspPowerUpCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -47,6 +50,7 @@
);
VOID
+NTAPI
RetryPowerRequest(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -54,13 +58,14 @@
);
NTSTATUS
+NTAPI
ClasspStartNextPowerIrpCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
IN PVOID Context
);
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassDispatchPower()
@@ -79,6 +84,7 @@
--*/
NTSTATUS
+NTAPI
ClassDispatchPower(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -108,7 +114,7 @@
return commonExtension->DevInfo->ClassPowerDevice(DeviceObject, Irp);
} // end ClassDispatchPower()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspPowerUpCompletion()
@@ -149,6 +155,7 @@
--*/
NTSTATUS
+NTAPI
ClasspPowerUpCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -476,7 +483,7 @@
return STATUS_MORE_PROCESSING_REQUIRED;
} // end ClasspPowerUpCompletion()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspPowerDownCompletion()
@@ -517,6 +524,7 @@
--*/
NTSTATUS
+NTAPI
ClasspPowerDownCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -974,7 +982,7 @@
return STATUS_MORE_PROCESSING_REQUIRED;
} // end ClasspPowerDownCompletion()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspPowerHandler()
@@ -998,6 +1006,7 @@
--*/
NTSTATUS
+NTAPI
ClasspPowerHandler(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -1278,7 +1287,7 @@
TRUE);
return PoCallDriver(lowerDevice, Irp);
} // end ClasspPowerHandler()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassMinimalPowerHandler()
@@ -1290,6 +1299,7 @@
--*/
NTSTATUS
+NTAPI
ClassMinimalPowerHandler(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -1355,7 +1365,7 @@
return status;
}
} // end ClassMinimalPowerHandler()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassSpinDownPowerHandler()
@@ -1383,6 +1393,7 @@
--*/
NTSTATUS
+NTAPI
ClassSpinDownPowerHandler(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -1434,7 +1445,7 @@
return ClasspPowerHandler(DeviceObject, Irp, options);
} // end ClassSpinDownPowerHandler()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClassStopUnitPowerHandler()
@@ -1450,6 +1461,7 @@
--*/
NTSTATUS
+NTAPI
ClassStopUnitPowerHandler(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp
@@ -1475,7 +1487,7 @@
return ClassSpinDownPowerHandler(DeviceObject, Irp);
} // end ClassStopUnitPowerHandler()
-
+
/*++////////////////////////////////////////////////////////////////////////////
RetryPowerRequest()
@@ -1499,6 +1511,7 @@
--*/
VOID
+NTAPI
RetryPowerRequest(
PDEVICE_OBJECT DeviceObject,
PIRP Irp,
@@ -1574,7 +1587,7 @@
return;
} // end RetryRequest()
-
+
/*++////////////////////////////////////////////////////////////////////////////
ClasspStartNextPowerIrpCompletion()
@@ -1586,6 +1599,7 @@
--*/
NTSTATUS
+NTAPI
ClasspStartNextPowerIrpCompletion(
IN PDEVICE_OBJECT DeviceObject,
IN PIRP Irp,
@@ -1599,4 +1613,3 @@
PoStartNextPowerIrp(Irp);
return STATUS_SUCCESS;
} // end ClasspStartNextPowerIrpCompletion()
-
Modified: trunk/reactos/drivers/storage/classpnp/retry.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/r…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/retry.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/retry.c [iso-8859-1] Sun Jul 29 01:49:24 2012
@@ -24,8 +24,6 @@
#include "classp.h"
#include "debug.h"
-
-
/*
* InterpretTransferPacketError
*
@@ -34,7 +32,7 @@
*
* Return TRUE iff packet should be retried.
*/
-BOOLEAN InterpretTransferPacketError(PTRANSFER_PACKET Pkt)
+BOOLEAN NTAPI InterpretTransferPacketError(PTRANSFER_PACKET Pkt)
{
BOOLEAN shouldRetry = FALSE;
PCDB pCdb = (PCDB)Pkt->Srb.Cdb;
@@ -172,7 +170,6 @@
return shouldRetry;
}
-
/*
* RetryTransferPacket
*
@@ -181,7 +178,7 @@
* Return TRUE iff the packet is complete.
* (if so the status in pkt->irp is the final status).
*/
-BOOLEAN RetryTransferPacket(PTRANSFER_PACKET Pkt)
+BOOLEAN NTAPI RetryTransferPacket(PTRANSFER_PACKET Pkt)
{
BOOLEAN packetDone;
@@ -278,18 +275,16 @@
return packetDone;
}
-
-VOID TransferPacketRetryTimerDpc( IN PKDPC Dpc,
- IN PVOID DeferredContext,
- IN PVOID SystemArgument1,
- IN PVOID SystemArgument2)
+VOID NTAPI TransferPacketRetryTimerDpc(IN PKDPC Dpc,
+ IN PVOID DeferredContext,
+ IN PVOID SystemArgument1,
+ IN PVOID SystemArgument2)
{
PTRANSFER_PACKET pkt = (PTRANSFER_PACKET)DeferredContext;
SubmitTransferPacket(pkt);
}
-
-VOID InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER
TargetLocation)
+VOID NTAPI InitLowMemRetry(PTRANSFER_PACKET Pkt, PVOID BufPtr, ULONG Len, LARGE_INTEGER
TargetLocation)
{
ASSERT(Len > 0);
ASSERT(!Pkt->InLowMemRetry);
@@ -299,7 +294,6 @@
Pkt->LowMemRetry_nextChunkTargetLocation = TargetLocation;
}
-
/*
* StepLowMemRetry
*
@@ -308,7 +302,7 @@
*
* Returns TRUE iff the packet is done.
*/
-BOOLEAN StepLowMemRetry(PTRANSFER_PACKET Pkt)
+BOOLEAN NTAPI StepLowMemRetry(PTRANSFER_PACKET Pkt)
{
BOOLEAN packetDone;
@@ -346,4 +340,3 @@
return packetDone;
}
-
Modified: trunk/reactos/drivers/storage/classpnp/utils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/u…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] Sun Jul 29 01:49:24 2012
@@ -23,8 +23,6 @@
#include "classp.h"
#include "debug.h"
-
-
#ifdef ALLOC_PRAGMA
#pragma alloc_text(PAGE, ClassGetDeviceParameter)
@@ -32,10 +30,8 @@
#pragma alloc_text(PAGE, ClassSetDeviceParameter)
#endif
-
-
// custom string match -- careful!
-BOOLEAN ClasspMyStringMatches(IN PCHAR StringToMatch OPTIONAL, IN PCHAR TargetString)
+BOOLEAN NTAPI ClasspMyStringMatches(IN PCHAR StringToMatch OPTIONAL, IN PCHAR
TargetString)
{
ULONG length; // strlen returns an int, not size_t (!)
PAGED_CODE();
@@ -54,8 +50,7 @@
return (strncmp(StringToMatch, TargetString, length) == 0);
}
-
-VOID ClassGetDeviceParameter(
+VOID NTAPI ClassGetDeviceParameter(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PWSTR SubkeyName OPTIONAL,
IN PWSTR ParameterName,
@@ -139,8 +134,7 @@
} // end ClassGetDeviceParameter()
-
-NTSTATUS ClassSetDeviceParameter(
+NTSTATUS NTAPI ClassSetDeviceParameter(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN PWSTR SubkeyName OPTIONAL,
IN PWSTR ParameterName,
@@ -210,7 +204,6 @@
} // end ClassSetDeviceParameter()
-
/*
* ClassScanForSpecial
*
@@ -218,7 +211,7 @@
* hardware based upon id strings. it does not check the registry.
*/
-VOID ClassScanForSpecial(
+VOID NTAPI ClassScanForSpecial(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension,
IN CLASSPNP_SCAN_FOR_SPECIAL_INFO DeviceList[],
IN PCLASS_SCAN_FOR_SPECIAL_HANDLER Function)
@@ -311,7 +304,6 @@
return;
} // end ClasspScanForSpecialByInquiry()
-
//
// In order to provide better performance without the need to reboot,
@@ -338,6 +330,7 @@
//
VOID
+NTAPI
ClasspPerfIncrementErrorCount(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -389,6 +382,7 @@
}
VOID
+NTAPI
ClasspPerfIncrementSuccessfulIo(
IN PFUNCTIONAL_DEVICE_EXTENSION FdoExtension
)
@@ -484,8 +478,7 @@
return;
}
-
-PMDL BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen)
+PMDL NTAPI BuildDeviceInputMdl(PVOID Buffer, ULONG BufferLen)
{
PMDL mdl;
@@ -514,13 +507,11 @@
return mdl;
}
-
-VOID FreeDeviceInputMdl(PMDL Mdl)
+VOID NTAPI FreeDeviceInputMdl(PMDL Mdl)
{
MmUnlockPages(Mdl);
IoFreeMdl(Mdl);
}
-
#if 0
VOID
@@ -561,5 +552,3 @@
return;
}
#endif
-
-
Modified: trunk/reactos/drivers/storage/classpnp/xferpkt.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/x…
==============================================================================
--- trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] Sun Jul 29 01:49:24
2012
@@ -41,7 +41,7 @@
*
* Allocate/initialize TRANSFER_PACKETs and related resources.
*/
-NTSTATUS InitializeTransferPackets(PDEVICE_OBJECT Fdo)
+NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo)
{
PCOMMON_DEVICE_EXTENSION commonExt = Fdo->DeviceExtension;
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
@@ -132,8 +132,7 @@
return status;
}
-
-VOID DestroyAllTransferPackets(PDEVICE_OBJECT Fdo)
+VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -151,8 +150,7 @@
ASSERT(fdoData->NumTotalTransferPackets == 0);
}
-
-PTRANSFER_PACKET NewTransferPacket(PDEVICE_OBJECT Fdo)
+PTRANSFER_PACKET NTAPI NewTransferPacket(PDEVICE_OBJECT Fdo)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -188,12 +186,11 @@
return newPkt;
}
-
/*
* DestroyTransferPacket
*
*/
-VOID DestroyTransferPacket(PTRANSFER_PACKET Pkt)
+VOID NTAPI DestroyTransferPacket(PTRANSFER_PACKET Pkt)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -218,8 +215,7 @@
ExFreePool(Pkt);
}
-
-VOID EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt)
+VOID NTAPI EnqueueFreeTransferPacket(PDEVICE_OBJECT Fdo, PTRANSFER_PACKET Pkt)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -324,8 +320,7 @@
}
-
-PTRANSFER_PACKET DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN AllocIfNeeded)
+PTRANSFER_PACKET NTAPI DequeueFreeTransferPacket(PDEVICE_OBJECT Fdo, BOOLEAN
AllocIfNeeded)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -365,8 +360,6 @@
return pkt;
}
-
-
/*
* SetupReadWriteTransferPacket
*
@@ -377,11 +370,11 @@
* The Irp is set up in SubmitTransferPacket because it must be reset
* for each packet submission.
*/
-VOID SetupReadWriteTransferPacket( PTRANSFER_PACKET Pkt,
- PVOID Buf,
- ULONG Len,
- LARGE_INTEGER DiskLocation,
- PIRP OriginalIrp)
+VOID NTAPI SetupReadWriteTransferPacket(PTRANSFER_PACKET Pkt,
+ PVOID Buf,
+ ULONG Len,
+ LARGE_INTEGER DiskLocation,
+ PIRP OriginalIrp)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -460,13 +453,12 @@
Pkt->CompleteOriginalIrpWhenLastPacketCompletes = TRUE;
}
-
/*
* SubmitTransferPacket
*
* Set up the IRP for the TRANSFER_PACKET submission and send it down.
*/
-VOID SubmitTransferPacket(PTRANSFER_PACKET Pkt)
+VOID NTAPI SubmitTransferPacket(PTRANSFER_PACKET Pkt)
{
PCOMMON_DEVICE_EXTENSION commonExtension = Pkt->Fdo->DeviceExtension;
PDEVICE_OBJECT nextDevObj = commonExtension->LowerDeviceObject;
@@ -508,8 +500,7 @@
IoCallDriver(nextDevObj, Pkt->Irp);
}
-
-NTSTATUS TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID Context)
+NTSTATUS NTAPI TransferPktComplete(IN PDEVICE_OBJECT NullFdo, IN PIRP Irp, IN PVOID
Context)
{
PTRANSFER_PACKET pkt = (PTRANSFER_PACKET)Context;
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = pkt->Fdo->DeviceExtension;
@@ -718,13 +709,12 @@
return STATUS_MORE_PROCESSING_REQUIRED;
}
-
/*
* SetupEjectionTransferPacket
*
* Set up a transferPacket for a synchronous Ejection Control transfer.
*/
-VOID SetupEjectionTransferPacket( TRANSFER_PACKET *Pkt,
+VOID NTAPI SetupEjectionTransferPacket( TRANSFER_PACKET *Pkt,
BOOLEAN PreventMediaRemoval,
PKEVENT SyncEventPtr,
PIRP OriginalIrp)
@@ -762,14 +752,13 @@
Pkt->SyncEventPtr = SyncEventPtr;
Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE;
}
-
/*
* SetupModeSenseTransferPacket
*
* Set up a transferPacket for a synchronous Mode Sense transfer.
*/
-VOID SetupModeSenseTransferPacket( TRANSFER_PACKET *Pkt,
+VOID NTAPI SetupModeSenseTransferPacket(TRANSFER_PACKET *Pkt,
PKEVENT SyncEventPtr,
PVOID ModeSenseBuffer,
UCHAR ModeSenseBufferLen,
@@ -814,17 +803,16 @@
Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE;
}
-
/*
* SetupDriveCapacityTransferPacket
*
* Set up a transferPacket for a synchronous Drive Capacity transfer.
*/
-VOID SetupDriveCapacityTransferPacket( TRANSFER_PACKET *Pkt,
- PVOID ReadCapacityBuffer,
- ULONG ReadCapacityBufferLen,
- PKEVENT SyncEventPtr,
- PIRP OriginalIrp)
+VOID NTAPI SetupDriveCapacityTransferPacket(TRANSFER_PACKET *Pkt,
+ PVOID ReadCapacityBuffer,
+ ULONG ReadCapacityBufferLen,
+ PKEVENT SyncEventPtr,
+ PIRP OriginalIrp)
{
PFUNCTIONAL_DEVICE_EXTENSION fdoExt = Pkt->Fdo->DeviceExtension;
PCLASS_PRIVATE_FDO_DATA fdoData = fdoExt->PrivateFdoData;
@@ -860,7 +848,6 @@
Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE;
}
-
#if 0
/*
* SetupSendStartUnitTransferPacket
@@ -907,5 +894,3 @@
Pkt->CompleteOriginalIrpWhenLastPacketCompletes = FALSE;
}
#endif
-
-
4435
days inactive
4435
days old
0 comments
1 participants
participants (1)
-
akhaldi＠svn.reactos.org