Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 43453: [fastfat_new] - Implement shared VCB locking. - Implement QueryVolumeInfo common handler, and a handler of QueryFsVolumeInfo class. Doesn't currently work due to missing VPB.
by fireball＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: fireball Date: Wed Oct 14 17:59:14 2009 New Revision: 43453 URL: http://svn.reactos.org/svn/reactos?rev=43453&view=rev Log: [fastfat_new] - Implement shared VCB locking. - Implement QueryVolumeInfo common handler, and a handler of QueryFsVolumeInfo class. Doesn't currently work due to missing VPB. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/volume.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Wed Oct 14 17:59:14 2009 @@ -385,6 +385,23 @@ } } +BOOLEAN +NTAPI +FatAcquireSharedVcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb) +{ + /* Acquire VCB's resource if possible */ + if (ExAcquireResourceSharedLite(&Vcb->Resource, + BooleanFlagOn(IrpContext->Flags, IRPCONTEXT_CANWAIT))) + { + return TRUE; + } + else + { + return FALSE; + } +} + VOID NTAPI FatReleaseVcb(IN PFAT_IRP_CONTEXT IrpContext, Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Wed Oct 14 17:59:14 2009 @@ -142,6 +142,10 @@ BOOLEAN NTAPI FatAcquireExclusiveVcb(IN PFAT_IRP_CONTEXT IrpContext, IN PVCB Vcb); + +BOOLEAN NTAPI +FatAcquireSharedVcb(IN PFAT_IRP_CONTEXT IrpContext, + IN PVCB Vcb); VOID NTAPI FatReleaseVcb(IN PFAT_IRP_CONTEXT IrpContext, Modified: trunk/reactos/drivers/filesystems/fastfat_new/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/volume.c [iso-8859-1] Wed Oct 14 17:59:14 2009 @@ -8,17 +8,159 @@ /* INCLUDES *****************************************************************/ -#define NDEBUG +//#define NDEBUG #include "fastfat.h" /* FUNCTIONS ****************************************************************/ NTSTATUS NTAPI +FatiQueryFsVolumeInfo(PVCB Vcb, + PFILE_FS_VOLUME_INFORMATION Buffer, + PLONG Length) +{ + ULONG ByteSize; + NTSTATUS Status = STATUS_SUCCESS; + + /* Deduct the minimum written length */ + *Length -= FIELD_OFFSET(FILE_FS_VOLUME_INFORMATION, VolumeLabel[0]); + + /* Zero it */ + RtlZeroMemory(Buffer, sizeof(FILE_FS_VOLUME_INFORMATION)); + + DPRINT("Serial number 0x%x, label length %d\n", + Vcb->Vpb->SerialNumber, Vcb->Vpb->VolumeLabelLength); + + /* Save serial number */ + Buffer->VolumeSerialNumber = Vcb->Vpb->SerialNumber; + + /* Set max byte size */ + ByteSize = Vcb->Vpb->VolumeLabelLength; + + /* Check buffer length and reduce byte size if needed */ + if (*Length < Vcb->Vpb->VolumeLabelLength) + { + /* Copy only up to what buffer size was provided */ + ByteSize = *Length; + Status = STATUS_BUFFER_OVERFLOW; + } + + /* Copy volume label */ + Buffer->VolumeLabelLength = Vcb->Vpb->VolumeLabelLength; + RtlCopyMemory(Buffer->VolumeLabel, Vcb->Vpb->VolumeLabel, ByteSize); + *Length -= ByteSize; + + return Status; +} + +NTSTATUS +NTAPI +FatiQueryVolumeInfo(PFAT_IRP_CONTEXT IrpContext, PIRP Irp) +{ + PFILE_OBJECT FileObject; + PIO_STACK_LOCATION IrpSp; + FILE_INFORMATION_CLASS InfoClass; + TYPE_OF_OPEN FileType; + PVCB Vcb; + PFCB Fcb; + PCCB Ccb; + LONG Length; + PVOID Buffer; + BOOLEAN VcbLocked = FALSE; + NTSTATUS Status = STATUS_SUCCESS; + + /* Get IRP stack location */ + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Get the file object */ + FileObject = IrpSp->FileObject; + + /* Copy variables to something with shorter names */ + InfoClass = IrpSp->Parameters.QueryVolume.FsInformationClass; + Length = IrpSp->Parameters.QueryVolume.Length; + Buffer = Irp->AssociatedIrp.SystemBuffer; + + DPRINT("FatiQueryVolumeInfo\n", 0); + DPRINT("\tIrp = %08lx\n", Irp); + DPRINT("\tLength = %08lx\n", Length); + DPRINT("\tFsInformationClass = %08lx\n", InfoClass); + DPRINT("\tBuffer = %08lx\n", Buffer); + + FileType = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); + + DPRINT("Vcb %p, Fcb %p, Ccb %p, open type %d\n", Vcb, Fcb, Ccb, FileType); + + switch (InfoClass) + { + case FileFsVolumeInformation: + /* Acquired the shared VCB lock */ + if (!FatAcquireSharedVcb(IrpContext, Vcb)) + { + ASSERT(FALSE); + } + + /* Remember we locked it */ + VcbLocked = TRUE; + + /* Call FsVolumeInfo handler */ + Status = FatiQueryFsVolumeInfo(Vcb, Buffer, &Length); + break; + default: + DPRINT1("Volume information class %d is not supported!\n", InfoClass); + UNIMPLEMENTED; + } + + /* Set IoStatus.Information to amount of filled bytes */ + Irp->IoStatus.Information = IrpSp->Parameters.QueryVolume.Length - Length; + + /* Release VCB lock */ + if (VcbLocked) FatReleaseVcb(IrpContext, Vcb); + + /* Complete request and return status */ + FatCompleteRequest(IrpContext, Irp, Status); + return Status; +} + +NTSTATUS +NTAPI FatQueryVolumeInfo(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - DPRINT1("FatQueryVolumeInfo()\n"); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + BOOLEAN TopLevel, CanWait; + PFAT_IRP_CONTEXT IrpContext; + + CanWait = TRUE; + TopLevel = FALSE; + Status = STATUS_INVALID_DEVICE_REQUEST; + + /* Get CanWait flag */ + if (IoGetCurrentIrpStackLocation(Irp)->FileObject != NULL) + CanWait = IoIsOperationSynchronous(Irp); + + /* Enter FsRtl critical region */ + FsRtlEnterFileSystem(); + + /* Set Top Level IRP if not set */ + if (IoGetTopLevelIrp() == NULL) + { + IoSetTopLevelIrp(Irp); + TopLevel = TRUE; + } + + /* Build an irp context */ + IrpContext = FatBuildIrpContext(Irp, CanWait); + + /* Call the request handler */ + Status = FatiQueryVolumeInfo(IrpContext, Irp); + + /* Restore top level Irp */ + if (TopLevel) + IoSetTopLevelIrp(NULL); + + /* Leave FsRtl critical region */ + FsRtlExitFileSystem(); + + return Status; } NTSTATUS

1 0

[tkreuzer] 43452: Update ReactOS-amd64.rbuild
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 16:29:32 2009 New Revision: 43452 URL: http://svn.reactos.org/svn/reactos?rev=43452&view=rev Log: Update ReactOS-amd64.rbuild Modified: trunk/reactos/ReactOS-amd64.rbuild Modified: trunk/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-amd64.rbuild?rev=4… ============================================================================== --- trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-amd64.rbuild [iso-8859-1] Wed Oct 14 16:29:32 2009 @@ -221,6 +221,9 @@ <directory name="bzip2"> <xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" /> </directory> + <directory name="cardlib"> + <xi:include href="lib/3rdparty/cardlib/cardlib.rbuild" /> + </directory> <directory name="expat"> <xi:include href="lib/3rdparty/expat/expat.rbuild" /> </directory>

1 0

[tkreuzer] 43451: Fix NtGetWriteWatch and NtResetWriteWatch parameters
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 15:25:30 2009 New Revision: 43451 URL: http://svn.reactos.org/svn/reactos?rev=43451&view=rev Log: Fix NtGetWriteWatch and NtResetWriteWatch parameters Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/virtual.c [iso-8859-1] Wed Oct 14 15:25:30 2009 @@ -1245,9 +1245,9 @@ NtGetWriteWatch(IN HANDLE ProcessHandle, IN ULONG Flags, IN PVOID BaseAddress, - IN ULONG RegionSize, + IN SIZE_T RegionSize, IN PVOID *UserAddressArray, - OUT PULONG EntriesInUserAddressArray, + OUT PULONG_PTR EntriesInUserAddressArray, OUT PULONG Granularity) { if (!EntriesInUserAddressArray || !Granularity) @@ -1279,7 +1279,7 @@ NTAPI NtResetWriteWatch(IN HANDLE ProcessHandle, IN PVOID BaseAddress, - IN ULONG RegionSize) + IN SIZE_T RegionSize) { if (!RegionSize) {

1 0

[tkreuzer] 43450: fix copy paste error
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 13:56:36 2009 New Revision: 43450 URL: http://svn.reactos.org/svn/reactos?rev=43450&view=rev Log: fix copy paste error Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Wed Oct 14 13:56:36 2009 @@ -267,7 +267,7 @@ switch (DataSize) { case sizeof(UCHAR): - /* read one UCHAR */ + /* Read one UCHAR */ *(PUCHAR)DataValue = READ_PORT_UCHAR((PUCHAR)IoAddress); break; @@ -316,17 +316,17 @@ switch (DataSize) { case sizeof(UCHAR): - /* read one UCHAR */ + /* Write one UCHAR */ WRITE_PORT_UCHAR((PUCHAR)IoAddress, *(PUCHAR)DataValue); break; case sizeof(USHORT): - /* Read one USHORT */ + /* Write one USHORT */ WRITE_PORT_USHORT((PUSHORT)IoAddress, *(PUSHORT)DataValue); break; case sizeof(ULONG): - /* Read one ULONG */ + /* Write one ULONG */ WRITE_PORT_ULONG((PULONG)IoAddress, *(PULONG)DataValue); break;

1 0

[tkreuzer] 43449: prefix DEBUG_CONTROL constants with AMD64 as they are architecture specific
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 13:53:30 2009 New Revision: 43449 URL: http://svn.reactos.org/svn/reactos?rev=43449&view=rev Log: prefix DEBUG_CONTROL constants with AMD64 as they are architecture specific Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Wed Oct 14 13:53:30 2009 @@ -195,13 +195,12 @@ #define DBGKD_PARTITION_ALTERNATE 0x01 // -// Control Space types -// -#define DEBUG_CONTROL_SPACE_KPCR 0 -#define DEBUG_CONTROL_SPACE_KPRCB 1 -#define DEBUG_CONTROL_SPACE_KSPECIAL 2 -#define DEBUG_CONTROL_SPACE_KTHREAD 3 -#define X86_DEBUG_CONTROL_SPACE_KSPECIAL 716 +// AMD64 Control Space types +// +#define AMD64_DEBUG_CONTROL_SPACE_KPCR 0 +#define AMD64_DEBUG_CONTROL_SPACE_KPRCB 1 +#define AMD64_DEBUG_CONTROL_SPACE_KSPECIAL 2 +#define AMD64_DEBUG_CONTROL_SPACE_KTHREAD 3 // Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Wed Oct 14 13:53:30 2009 @@ -185,25 +185,25 @@ switch ((ULONG_PTR)BaseAddress) { - case DEBUG_CONTROL_SPACE_KPCR: + case AMD64_DEBUG_CONTROL_SPACE_KPCR: /* Copy a pointer to the Pcr */ ControlStart = &Pcr; RealLength = sizeof(PVOID); break; - case DEBUG_CONTROL_SPACE_KPRCB: + case AMD64_DEBUG_CONTROL_SPACE_KPRCB: /* Copy a pointer to the Prcb */ ControlStart = &Prcb; RealLength = sizeof(PVOID); break; - case DEBUG_CONTROL_SPACE_KSPECIAL: + case AMD64_DEBUG_CONTROL_SPACE_KSPECIAL: /* Copy SpecialRegisters */ ControlStart = &Prcb->ProcessorState.SpecialRegisters; RealLength = sizeof(KSPECIAL_REGISTERS); break; - case DEBUG_CONTROL_SPACE_KTHREAD: + case AMD64_DEBUG_CONTROL_SPACE_KTHREAD: /* Copy a pointer to the current Thread */ ControlStart = &Prcb->CurrentThread; RealLength = sizeof(PVOID);

1 0

[tkreuzer] 43448: [KD64] - use SEH in KdpSysReadMsr - use constants for KdpSysReadControlSpace cases (DEBUG_CONTROL_SPACE_KSPECIAL taken from singularity) - implement case DEBUG_CONTROL_SPACE_KTHREAD returning a pointer to the current thread - Implement KdpSysReadIoSpace, KdpSysWriteIoSpace for amd64, can be used for x86, too
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 13:39:59 2009 New Revision: 43448 URL: http://svn.reactos.org/svn/reactos?rev=43448&view=rev Log: [KD64] - use SEH in KdpSysReadMsr - use constants for KdpSysReadControlSpace cases (DEBUG_CONTROL_SPACE_KSPECIAL taken from singularity) - implement case DEBUG_CONTROL_SPACE_KTHREAD returning a pointer to the current thread - Implement KdpSysReadIoSpace, KdpSysWriteIoSpace for amd64, can be used for x86, too Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Wed Oct 14 13:39:59 2009 @@ -195,6 +195,16 @@ #define DBGKD_PARTITION_ALTERNATE 0x01 // +// Control Space types +// +#define DEBUG_CONTROL_SPACE_KPCR 0 +#define DEBUG_CONTROL_SPACE_KPRCB 1 +#define DEBUG_CONTROL_SPACE_KSPECIAL 2 +#define DEBUG_CONTROL_SPACE_KTHREAD 3 +#define X86_DEBUG_CONTROL_SPACE_KSPECIAL 716 + + +// // KD Packet Structure // typedef struct _KD_PACKET Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Wed Oct 14 13:39:59 2009 @@ -374,7 +374,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); @@ -386,7 +386,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Wed Oct 14 13:39:59 2009 @@ -104,7 +104,17 @@ KdpSysReadMsr(IN ULONG Msr, OUT PLARGE_INTEGER MsrValue) { - MsrValue->QuadPart = __readmsr(Msr); + /* Use SEH to protect from invalid MSRs */ + _SEH2_TRY + { + MsrValue->QuadPart = __readmsr(Msr); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + _SEH2_END + return STATUS_SUCCESS; } @@ -113,7 +123,17 @@ KdpSysWriteMsr(IN ULONG Msr, IN PLARGE_INTEGER MsrValue) { - __writemsr(Msr, MsrValue->QuadPart); + /* Use SEH to protect from invalid MSRs */ + _SEH2_TRY + { + __writemsr(Msr, MsrValue->QuadPart); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + _SEH2_END + return STATUS_SUCCESS; } @@ -165,28 +185,35 @@ switch ((ULONG_PTR)BaseAddress) { - case 0: + case DEBUG_CONTROL_SPACE_KPCR: /* Copy a pointer to the Pcr */ ControlStart = &Pcr; RealLength = sizeof(PVOID); break; - case 1: + case DEBUG_CONTROL_SPACE_KPRCB: /* Copy a pointer to the Prcb */ ControlStart = &Prcb; RealLength = sizeof(PVOID); break; - case 2: + case DEBUG_CONTROL_SPACE_KSPECIAL: /* Copy SpecialRegisters */ ControlStart = &Prcb->ProcessorState.SpecialRegisters; RealLength = sizeof(KSPECIAL_REGISTERS); break; + case DEBUG_CONTROL_SPACE_KTHREAD: + /* Copy a pointer to the current Thread */ + ControlStart = &Prcb->CurrentThread; + RealLength = sizeof(PVOID); + break; + default: RealLength = 0; ControlStart = NULL; ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; } if (RealLength < Length) Length = RealLength; @@ -225,14 +252,48 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + OUT PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; -} + /* Verify parameters */ + if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) + { + /* No data was read */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + switch (DataSize) + { + case sizeof(UCHAR): + /* read one UCHAR */ + *(PUCHAR)DataValue = READ_PORT_UCHAR((PUCHAR)IoAddress); + break; + + case sizeof(USHORT): + /* Read one USHORT */ + *(PUSHORT)DataValue = READ_PORT_USHORT((PUSHORT)IoAddress); + break; + + case sizeof(ULONG): + /* Read one ULONG */ + *(PULONG)DataValue = READ_PORT_ULONG((PULONG)IoAddress); + break; + + default: + /* Invalid data size */ + *ActualDataSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Return the size of the data */ + *ActualDataSize = DataSize; + + /* Success! */ + return STATUS_SUCCESS; +} + NTSTATUS NTAPI @@ -240,20 +301,53 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) +{ + /* Verify parameters */ + if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) + { + /* No data was written */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + switch (DataSize) + { + case sizeof(UCHAR): + /* read one UCHAR */ + WRITE_PORT_UCHAR((PUCHAR)IoAddress, *(PUCHAR)DataValue); + break; + + case sizeof(USHORT): + /* Read one USHORT */ + WRITE_PORT_USHORT((PUSHORT)IoAddress, *(PUSHORT)DataValue); + break; + + case sizeof(ULONG): + /* Read one ULONG */ + WRITE_PORT_ULONG((PULONG)IoAddress, *(PULONG)DataValue); + break; + + default: + /* Invalid data size */ + *ActualDataSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Return the size of the data */ + *ActualDataSize = DataSize; + + /* Success! */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdpSysCheckLowMemory(IN ULONG Flags) { UNIMPLEMENTED; while (TRUE); return STATUS_UNSUCCESSFUL; } - -NTSTATUS -NTAPI -KdpSysCheckLowMemory(IN ULONG Flags) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; -}

1 0

[tkreuzer] 43447: [DDK] Fix MmSizeOfMdl prototype
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 13:23:57 2009 New Revision: 43447 URL: http://svn.reactos.org/svn/reactos?rev=43447&view=rev Log: [DDK] Fix MmSizeOfMdl prototype Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Wed Oct 14 13:23:57 2009 @@ -9277,7 +9277,7 @@ IN ULONG ProbeMode); NTKERNELAPI -ULONG +SIZE_T NTAPI MmSizeOfMdl( IN PVOID Base,

1 0

[janderwald] 43446: - Implement KSPROPERTY_CONNECTION_ALLOCATORFRAMING for CPortPinWaveCyclic + CPortPinWavePci
by janderwald＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: janderwald Date: Wed Oct 14 12:24:19 2009 New Revision: 43446 URL: http://svn.reactos.org/svn/reactos?rev=43446&view=rev Log: - Implement KSPROPERTY_CONNECTION_ALLOCATORFRAMING for CPortPinWaveCyclic + CPortPinWavePci Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Wed Oct 14 12:24:19 2009 @@ -51,6 +51,7 @@ friend NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + friend NTSTATUS NTAPI PinWaveCyclicAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); IPortWaveCyclic * m_Port; IPortFilterWaveCyclic * m_Filter; @@ -75,6 +76,7 @@ ULONG m_TotalPackets; ULONG m_StopCount; KSAUDIO_POSITION m_Position; + KSALLOCATOR_FRAMING m_AllocatorFraming; SUBDEVICE_DESCRIPTOR m_Descriptor; ULONG m_Delay; @@ -93,9 +95,9 @@ NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - - -DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat); +NTSTATUS NTAPI PinWaveCyclicAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + +DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); KSPROPERTY_SET PinWaveCyclicPropertySet[] = @@ -144,7 +146,40 @@ return STATUS_UNSUCCESSFUL; } - +NTSTATUS +NTAPI +PinWaveCyclicAllocatorFraming( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // copy pin framing + RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + + Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} NTSTATUS NTAPI @@ -960,6 +995,7 @@ PDEVICE_OBJECT DeviceObject; BOOLEAN Capture; PVOID SilenceBuffer; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor = NULL; //IDrmAudioStream * DrmAudio = NULL; m_KsPinDescriptor = KsPinDescriptor; @@ -1015,6 +1051,8 @@ } #endif + DPRINT("CPortPinWaveCyclic::Init Status %x\n", Status); + if (!NT_SUCCESS(Status)) return Status; @@ -1024,8 +1062,6 @@ if (!NT_SUCCESS(Status)) return Status; - - PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor = NULL; Status = Subdevice->GetDescriptor(&SubDeviceDescriptor); if (!NT_SUCCESS(Status)) @@ -1044,11 +1080,10 @@ m_Descriptor.UnknownMiniport = SubDeviceDescriptor->UnknownMiniport; m_Descriptor.PortPin = (PVOID)this; - DPRINT("CPortPinWaveCyclic::Init Status %x\n", Status); - // release subdevice descriptor Subdevice->Release(); + // add ourselves to service group Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) { @@ -1072,6 +1107,15 @@ if (!SilenceBuffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* set up allocator framing */ + m_AllocatorFraming.RequirementsFlags = KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY; + m_AllocatorFraming.PoolType = NonPagedPool; + m_AllocatorFraming.Frames = 8; + m_AllocatorFraming.FileAlignment = FILE_64_BYTE_ALIGNMENT; + m_AllocatorFraming.Reserved = 0; + m_AllocatorFraming.FrameSize = m_FrameSize; + m_Stream->Silence(SilenceBuffer, m_FrameSize); Status = m_IrpQueue->Init(ConnectDetails, DataFormat, DeviceObject, m_FrameSize, 0, SilenceBuffer); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Wed Oct 14 12:24:19 2009 @@ -94,7 +94,7 @@ NTSTATUS NTAPI PinWavePciAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWavePciAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); -DEFINE_KSPROPERTY_ALLOCATORFRAMING(PinWavePciConnectionSet, PinWavePciState, PinWavePciDataFormat, PinWavePciAllocatorFraming); +DEFINE_KSPROPERTY_CONNECTIONSET(PinWavePciConnectionSet, PinWavePciState, PinWavePciDataFormat, PinWavePciAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWavePciAudioSet, PinWavePciAudioPosition); KSPROPERTY_SET PinWavePciPropertySet[] = @@ -123,8 +123,32 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + CPortPinWavePci *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWavePci*)Descriptor->PortPin; + + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // copy pin framing + RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + + Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; } NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Wed Oct 14 12:24:19 2009 @@ -317,13 +317,6 @@ IN PSUBDEVICE_DESCRIPTOR Descriptor); #define DEFINE_KSPROPERTY_CONNECTIONSET(PinSet,\ - PropStateHandler, PropDataFormatHandler)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(PropDataFormatHandler, PropDataFormatHandler)\ -} - -#define DEFINE_KSPROPERTY_ALLOCATORFRAMING(PinSet,\ PropStateHandler, PropDataFormatHandler, PropAllocatorFraming)\ DEFINE_KSPROPERTY_TABLE(PinSet) {\ DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\

1 0

[mjmartin] 43445: - CmpPrepareKey: If cell signature is CM_KEY_NODE_SIGNATURE, the KeyCell is index leaf, handle it properly by calling CmpPrepareKey vice CmpPrepareIndexOfKeys. Fixes ASSERT in cminit.c that occurs on reboot after installing some applications.
by mjmartin＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: mjmartin Date: Wed Oct 14 11:50:31 2009 New Revision: 43445 URL: http://svn.reactos.org/svn/reactos?rev=43445&view=rev Log: - CmpPrepareKey: If cell signature is CM_KEY_NODE_SIGNATURE, the KeyCell is index leaf, handle it properly by calling CmpPrepareKey vice CmpPrepareIndexOfKeys. Fixes ASSERT in cminit.c that occurs on reboot after installing some applications. Modified: trunk/reactos/lib/cmlib/cminit.c Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=434… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] Wed Oct 14 11:50:31 2009 @@ -82,7 +82,10 @@ for (i = 0; i < IndexCell->Count; i++) { PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); - CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); + if (SubIndexCell->Signature == CM_KEY_NODE_SIGNATURE) + CmpPrepareKey(RegistryHive, (PCM_KEY_NODE)SubIndexCell); + else + CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); } } else if (IndexCell->Signature == CM_KEY_FAST_LEAF ||

1 0

[cwittich] 43444: -revert accidental change
by cwittich＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: cwittich Date: Tue Oct 13 23:51:16 2009 New Revision: 43444 URL: http://svn.reactos.org/svn/reactos?rev=43444&view=rev Log: -revert accidental change Modified: trunk/reactos/drivers/storage/floppy/SOURCES Modified: trunk/reactos/drivers/storage/floppy/SOURCES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/SOU… ============================================================================== --- trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] Tue Oct 13 23:51:16 2009 @@ -1,28 +1,30 @@ +# ReactOS Floppy Driver +# Copyright (C) 2004, Vizzini (vizzini(a)plasmic.com) +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# +# PROJECT: ReactOS Floppy Driver +# FILE: SOURCES +# PURPOSE: SOURCES file for Microsoft DDK build system +# PROGRAMMER: Vizzini (vizzini(a)plasmic.com) +# REVISIONS: +# 15-Feb-2004 vizzini - Created/ + TARGETNAME=floppy TARGETTYPE=DRIVER - +TARGETPATH=obj +TARGETLIBS= $(DDK_LIB_PATH)\csq.lib +SOURCES= floppy.c csqrtns.c hardware.c readwrite.c ioctl.c MSC_WARNING_LEVEL=/W3 /WX - -C_DEFINES=$(C_DEFINES) /DSTDCALL=__stdcall /DDDKAPI=__stdcall /wd4996 -INCLUDES=.; \ - ../../../.; \ - ../../../include; \ - ../../../include; \ - ../../../include/dxsdk; \ - ../../../include/dxsdk; \ - ../../../include/GL; \ - ../../../include/ndk; \ - ../../../include/reactos; \ - ../../../include/reactos; \ - ../../../include/reactos/mc; \ - ../../../include/reactos/libs - -TARGETLIBS= $(DDK_LIB_PATH)\ntstrsafe.lib - -SOURCES=csqrtns.c \ - floppy.c \ - hardware.c \ - ioctl.c \ - readwrite.c \ - floppy.rc -TARGET_DESTINATION=retail

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs