Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 68331: [PORTCLS] - implement & export PcUnregisterAdapterPowerManagement
by janderwald＠svn.reactos.org 02 Jul '15

02 Jul '15

Author: janderwald Date: Thu Jul 2 15:35:19 2015 New Revision: 68331 URL: http://svn.reactos.org/svn/reactos?rev=68331&view=rev Log: [PORTCLS] - implement & export PcUnregisterAdapterPowerManagement Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/portcls.spec [iso-8859-1] Thu Jul 2 15:35:19 2015 @@ -41,6 +41,7 @@ ; Power Management @ stdcall PcRegisterAdapterPowerManagement(ptr ptr) @ stdcall PcRequestNewPowerState(ptr long) +@ stdcall PcUnregisterAdapterPowerManagement(ptr) ; Properties @ stdcall PcCompletePendingPropertyRequest(ptr long) Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] Thu Jul 2 15:35:19 2015 @@ -48,6 +48,30 @@ return STATUS_SUCCESS; } +NTSTATUS +NTAPI +PcUnregisterAdapterPowerManagement( + IN PDEVICE_OBJECT DeviceObject) +{ + PPCLASS_DEVICE_EXTENSION DeviceExt; + + DPRINT("PcUnregisterAdapterPowerManagement pUnknown %p pvContext %p\n", DeviceObject); + PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); + + if (!DeviceObject) + return STATUS_INVALID_PARAMETER; + + DeviceExt = (PPCLASS_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + if (DeviceExt->AdapterPowerManagement) + { + DeviceExt->AdapterPowerManagement->Release(); + } + DeviceExt->AdapterPowerManagement = NULL; + return STATUS_SUCCESS; +} + + static VOID

1 0

[janderwald] 68330: [HDAUDBUS] - partly implement HDA_TransferCodecVerbs - stubplement HDAUDIO_BUS_INTERFACE_V2 - silence traces
by janderwald＠svn.reactos.org 02 Jul '15

02 Jul '15

Author: janderwald Date: Thu Jul 2 11:07:39 2015 New Revision: 68330 URL: http://svn.reactos.org/svn/reactos?rev=68330&view=rev Log: [HDAUDBUS] - partly implement HDA_TransferCodecVerbs - stubplement HDAUDIO_BUS_INTERFACE_V2 - silence traces Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/businterface.cpp [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -27,15 +27,37 @@ NTSTATUS NTAPI HDA_TransferCodecVerbs( -IN PVOID _context, -IN ULONG Count, -IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, -IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, -IN PVOID Context) -{ - UNIMPLEMENTED; - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; + IN PVOID _context, + IN ULONG Count, + IN OUT PHDAUDIO_CODEC_TRANSFER CodecTransfer, + IN PHDAUDIO_TRANSFER_COMPLETE_CALLBACK Callback, + IN PVOID Context) +{ + ULONG Verbs[MAX_CODEC_RESPONSES], Responses[MAX_CODEC_RESPONSES]; + ULONG Index; + PHDA_PDO_DEVICE_EXTENSION DeviceExtension; + + DPRINT1("HDA_TransferCodecVerbs Coun %lu CodecTransfer %p Callback %p Context %p\n", Count, CodecTransfer, Callback, Context); + + /* get device extension */ + DeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)_context; + ASSERT(DeviceExtension->IsFDO == FALSE); + + /* FIXME handle callback*/ + ASSERT(Callback == NULL); + + for (Index = 0; Index < Count; Index++) + { + Verbs[Index] = CodecTransfer[Index].Output.Command; + } + + HDA_SendVerbs(DeviceExtension->FDO, DeviceExtension->Codec, Verbs, Responses, Count); + + for (Index = 0; Index < DeviceExtension->Codec->ResponseCount; Index++) + { + CodecTransfer[Index].Input.Response = DeviceExtension->Codec->Responses[Index]; + } + return STATUS_SUCCESS; } NTSTATUS @@ -216,12 +238,70 @@ } NTSTATUS +NTAPI +HDA_AllocateDmaBufferWithNotification( + IN PVOID _context, + IN HANDLE Handle, + IN ULONG NotificationCount, + IN SIZE_T RequestedBufferSize, + OUT PMDL *BufferMdl, + OUT PSIZE_T AllocatedBufferSize, + OUT PSIZE_T OffsetFromFirstPage, + OUT PUCHAR StreamId, + OUT PULONG FifoSize) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + +} +NTSTATUS +NTAPI +HDA_FreeDmaBufferWithNotification( + IN PVOID _context, + IN HANDLE Handle, + IN PMDL BufferMdl, + IN SIZE_T BufferSize) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +HDA_RegisterNotificationEvent( + PVOID _context, + HANDLE Handle, + IN PKEVENT NotificationEvent) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; + +} + +NTSTATUS +NTAPI +HDA_UnregisterNotificationEvent( + IN PVOID _context, + IN HANDLE Handle, + IN PKEVENT NotificationEvent) +{ + UNIMPLEMENTED; + ASSERT(FALSE); + return STATUS_NOT_IMPLEMENTED; +} + + +NTSTATUS HDA_PDOHandleQueryInterface( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { PIO_STACK_LOCATION IoStack; - PHDAUDIO_BUS_INTERFACE InterfaceHDA; + PHDAUDIO_BUS_INTERFACE_V2 InterfaceHDA; PHDA_PDO_DEVICE_EXTENSION DeviceExtension; /* get device extension */ @@ -232,10 +312,12 @@ if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, GUID_HDAUDIO_BUS_INTERFACE)) { - InterfaceHDA = (PHDAUDIO_BUS_INTERFACE)IoStack->Parameters.QueryInterface.Interface; + InterfaceHDA = (PHDAUDIO_BUS_INTERFACE_V2)IoStack->Parameters.QueryInterface.Interface; InterfaceHDA->Version = IoStack->Parameters.QueryInterface.Version; - InterfaceHDA->Size = IoStack->Parameters.QueryInterface.Size; + InterfaceHDA->Size = sizeof(HDAUDIO_BUS_INTERFACE); InterfaceHDA->Context = DeviceExtension; + InterfaceHDA->InterfaceReference = HDA_InterfaceReference; + InterfaceHDA->InterfaceDereference = HDA_InterfaceDereference; InterfaceHDA->TransferCodecVerbs = HDA_TransferCodecVerbs; InterfaceHDA->AllocateCaptureDmaEngine = HDA_AllocateCaptureDmaEngine; @@ -251,11 +333,40 @@ InterfaceHDA->UnregisterEventCallback = HDA_UnregisterEventCallback; InterfaceHDA->GetDeviceInformation = HDA_GetDeviceInformation; InterfaceHDA->GetResourceInformation = HDA_GetResourceInformation; - return STATUS_SUCCESS; } + else if (IsEqualGUIDAligned(*IoStack->Parameters.QueryInterface.InterfaceType, GUID_HDAUDIO_BUS_INTERFACE_V2)) + { + InterfaceHDA = (PHDAUDIO_BUS_INTERFACE_V2)IoStack->Parameters.QueryInterface.Interface; + InterfaceHDA->Version = IoStack->Parameters.QueryInterface.Version; + InterfaceHDA->Size = sizeof(HDAUDIO_BUS_INTERFACE_V2); + InterfaceHDA->Context = DeviceExtension; + InterfaceHDA->InterfaceReference = HDA_InterfaceReference; + InterfaceHDA->InterfaceDereference = HDA_InterfaceDereference; + + InterfaceHDA->TransferCodecVerbs = HDA_TransferCodecVerbs; + InterfaceHDA->AllocateCaptureDmaEngine = HDA_AllocateCaptureDmaEngine; + InterfaceHDA->AllocateRenderDmaEngine = HDA_AllocateRenderDmaEngine; + InterfaceHDA->ChangeBandwidthAllocation = HDA_ChangeBandwidthAllocation; + InterfaceHDA->AllocateDmaBuffer = HDA_AllocateDmaBuffer; + InterfaceHDA->FreeDmaBuffer = HDA_FreeDmaBuffer; + InterfaceHDA->FreeDmaEngine = HDA_FreeDmaEngine; + InterfaceHDA->SetDmaEngineState = HDA_SetDmaEngineState; + InterfaceHDA->GetWallClockRegister = HDA_GetWallClockRegister; + InterfaceHDA->GetLinkPositionRegister = HDA_GetLinkPositionRegister; + InterfaceHDA->RegisterEventCallback = HDA_RegisterEventCallback; + InterfaceHDA->UnregisterEventCallback = HDA_UnregisterEventCallback; + InterfaceHDA->GetDeviceInformation = HDA_GetDeviceInformation; + InterfaceHDA->GetResourceInformation = HDA_GetResourceInformation; + + InterfaceHDA->AllocateDmaBufferWithNotification = HDA_AllocateDmaBufferWithNotification; + InterfaceHDA->FreeDmaBufferWithNotification = HDA_FreeDmaBufferWithNotification; + InterfaceHDA->RegisterNotificationEvent = HDA_RegisterNotificationEvent; + InterfaceHDA->UnregisterNotificationEvent = HDA_UnregisterNotificationEvent; + } // FIXME - // implement support for GUID_HDAUDIO_BUS_INTERFACE_BDL, GUID_HDAUDIO_BUS_INTERFACE_V2 + // implement support for GUID_HDAUDIO_BUS_INTERFACE_BDL + UNIMPLEMENTED; return STATUS_NOT_SUPPORTED; } Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/fdo.cpp [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -127,6 +127,7 @@ /* get device extension */ DeviceExtension = (PHDA_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + ASSERT(DeviceExtension->IsFDO); /* reset response count */ Codec->ResponseCount = 0; @@ -249,6 +250,7 @@ ChildDeviceExtension->IsFDO = FALSE; ChildDeviceExtension->Codec = Entry; ChildDeviceExtension->AudioGroup = AudioGroup; + ChildDeviceExtension->FDO = DeviceObject; /* setup flags */ AudioGroup->ChildPDO->Flags |= DO_POWER_PAGABLE; Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.cpp [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -98,18 +98,14 @@ //ChildDeviceExtension = (PHDA_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT1("HDA_Pnp Minor: %u IsFDO%d\n", IoStack->MinorFunction, FDODeviceExtension->IsFDO); - if (FDODeviceExtension->IsFDO) { if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { - DPRINT1("IRP_MN_START_DEVICE\n"); Status = HDA_FDOStartDevice(DeviceObject, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { - DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS\n"); /* handle bus device relations */ if (IoStack->Parameters.QueryDeviceRelations.Type == BusRelations) { @@ -130,25 +126,21 @@ { if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { - DPRINT1("IRP_MN_START_DEVICE\n"); /* no op for pdo */ Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_BUS_INFORMATION) { - DPRINT1("IRP_MN_QUERY_BUS_INFORMATION\n"); /* query bus information */ Status = HDA_PDOQueryBusInformation(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) { - DPRINT1("IRP_MN_QUERY_PNP_DEVICE_STATE\n"); /* query pnp state */ Status = HDA_PDOQueryBusDevicePnpState(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { - DPRINT1("IRP_MN_QUERY_DEVICE_RELATIONS\n"); if (IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) { /* handle target device relations */ @@ -180,35 +172,29 @@ } else if (IoStack->MinorFunction == IRP_MN_QUERY_CAPABILITIES) { - DPRINT1("IRP_MN_QUERY_CAPABILITIES\n"); /* query capabilities */ Status = HDA_PDOQueryBusDeviceCapabilities(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCE_REQUIREMENTS) { - DPRINT1("IRP_MN_QUERY_RESOURCE_REQUIREMENTS\n"); /* no op */ Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCES) { - DPRINT1("IRP_MN_QUERY_RESOURCES\n"); /* no op */ Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_ID) { - DPRINT1("IRP_MN_QUERY_ID\n"); Status = HDA_PDOQueryId(DeviceObject, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_TEXT) { - DPRINT1("IRP_MN_QUERY_DEVICE_TEXT\n"); Status = HDA_PDOHandleQueryDeviceText(Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_INTERFACE) { - DPRINT1("IRP_MN_QUERY_INTERFACE\n"); Status = HDA_PDOHandleQueryInterface(DeviceObject, Irp); } else Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/hdaudbus.h [iso-8859-1] Thu Jul 2 11:07:39 2015 @@ -85,6 +85,7 @@ BOOLEAN IsFDO; PHDA_CODEC_ENTRY Codec; PHDA_CODEC_AUDIO_GROUP AudioGroup; + PDEVICE_OBJECT FDO; }HDA_PDO_DEVICE_EXTENSION, *PHDA_PDO_DEVICE_EXTENSION; @@ -131,6 +132,14 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +VOID +HDA_SendVerbs( + IN PDEVICE_OBJECT DeviceObject, + IN PHDA_CODEC_ENTRY Codec, + IN PULONG Verbs, + OUT PULONG Responses, + IN ULONG Count); + /* pdo.cpp*/ NTSTATUS

1 0

[pschweitzer] 68329: [NTFS_TEST] No need for such test anylonger, we have NTFSInfo now which is better :-)
by pschweitzer＠svn.reactos.org 01 Jul '15

01 Jul '15

Author: pschweitzer Date: Wed Jul 1 11:17:22 2015 New Revision: 68329 URL: http://svn.reactos.org/svn/reactos?rev=68329&view=rev Log: [NTFS_TEST] No need for such test anylonger, we have NTFSInfo now which is better :-) Removed: trunk/rostests/tests/ntfs/

1 0

[janderwald] 68328: [PORTCLS] - check if there are enough irp stack locations
by janderwald＠svn.reactos.org 01 Jul '15

01 Jul '15

Author: janderwald Date: Wed Jul 1 07:39:35 2015 New Revision: 68328 URL: http://svn.reactos.org/svn/reactos?rev=68328&view=rev Log: [PORTCLS] - check if there are enough irp stack locations Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Wed Jul 1 07:39:35 2015 @@ -548,7 +548,11 @@ // initialize the notification event KeInitializeEvent(&Event, NotificationEvent, FALSE); - IoCopyCurrentIrpStackLocationToNext(Irp); + // are there enough irp stack locations + if (Irp->CurrentLocation < Irp->StackCount + 1) + { + IoCopyCurrentIrpStackLocationToNext(Irp); + } IoSetCompletionRoutine(Irp, CompletionRoutine, (PVOID)&Event, TRUE, TRUE, TRUE);

1 0

[pschweitzer] 68327: [NTFS] Fix user buffer handling for FSCTL_GET_NTFS_VOLUME_DATA. It fixes NTFSInfo. We're just lacking a few information in the output data now CORE-8725
by pschweitzer＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: pschweitzer Date: Tue Jun 30 21:24:03 2015 New Revision: 68327 URL: http://svn.reactos.org/svn/reactos?rev=68327&view=rev Log: [NTFS] Fix user buffer handling for FSCTL_GET_NTFS_VOLUME_DATA. It fixes NTFSInfo. We're just lacking a few information in the output data now CORE-8725 Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Tue Jun 30 21:24:03 2015 @@ -569,7 +569,7 @@ PNTFS_VOLUME_DATA_BUFFER DataBuffer; PNTFS_ATTR_RECORD Attribute; - DataBuffer = (PNTFS_VOLUME_DATA_BUFFER)Irp->UserBuffer; + DataBuffer = (PNTFS_VOLUME_DATA_BUFFER)Irp->AssociatedIrp.SystemBuffer; Stack = IoGetCurrentIrpStackLocation(Irp); if (Stack->Parameters.FileSystemControl.OutputBufferLength < sizeof(NTFS_VOLUME_DATA_BUFFER) || @@ -608,6 +608,8 @@ Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); } + Irp->IoStatus.Information = sizeof(NTFS_VOLUME_DATA_BUFFER); + if (Stack->Parameters.FileSystemControl.OutputBufferLength >= sizeof(NTFS_EXTENDED_VOLUME_DATA) + sizeof(NTFS_VOLUME_DATA_BUFFER)) { PNTFS_EXTENDED_VOLUME_DATA ExtendedData = (PNTFS_EXTENDED_VOLUME_DATA)((ULONG_PTR)Irp->UserBuffer + sizeof(NTFS_VOLUME_DATA_BUFFER)); @@ -615,6 +617,7 @@ ExtendedData->ByteCount = sizeof(NTFS_EXTENDED_VOLUME_DATA); ExtendedData->MajorVersion = DeviceExt->NtfsInfo.MajorVersion; ExtendedData->MinorVersion = DeviceExt->NtfsInfo.MinorVersion; + Irp->IoStatus.Information += sizeof(NTFS_EXTENDED_VOLUME_DATA); } return STATUS_SUCCESS;

1 0

[pschweitzer] 68326: [NTFSINFO] Time to free some Sysinternals tool: ntfsinfo. To make it short, this tool dumps various information about a NTFS volume and its reserved meta-data files Our version...
by pschweitzer＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: pschweitzer Date: Tue Jun 30 21:03:55 2015 New Revision: 68326 URL: http://svn.reactos.org/svn/reactos?rev=68326&view=rev Log: [NTFSINFO] Time to free some Sysinternals tool: ntfsinfo. To make it short, this tool dumps various information about a NTFS volume and its reserved meta-data files Our version comes with three advantages compared to the Russinovich's tool: - It's FLOSS - It works properly on NT5+ (developed with W2K3 & W7) whereas R's cannot display meta-data files information - It will open a volume by default if none provided One issue so far: it doesn't work properly on ReactOS! CORE-8725 Added: trunk/rosapps/applications/cmdutils/ntfsinfo/ trunk/rosapps/applications/cmdutils/ntfsinfo/CMakeLists.txt (with props) trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.c (with props) trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.rc (with props) Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt Modified: trunk/rosapps/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/CMak… ============================================================================== --- trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rosapps/applications/cmdutils/CMakeLists.txt [iso-8859-1] Tue Jun 30 21:03:55 2015 @@ -1,5 +1,6 @@ add_subdirectory(appwiz) add_subdirectory(cat) +add_subdirectory(ntfsinfo) add_subdirectory(tee) add_subdirectory(touch) add_subdirectory(uptime) Added: trunk/rosapps/applications/cmdutils/ntfsinfo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/ntfs… ============================================================================== --- trunk/rosapps/applications/cmdutils/ntfsinfo/CMakeLists.txt (added) +++ trunk/rosapps/applications/cmdutils/ntfsinfo/CMakeLists.txt [iso-8859-1] Tue Jun 30 21:03:55 2015 @@ -0,0 +1,5 @@ +list(APPEND SOURCE ntfsinfo.c ntfsinfo.rc) +add_executable(ntfsinfo ${SOURCE}) +set_module_type(ntfsinfo win32cui UNICODE) +add_importlibs(ntfsinfo msvcrt kernel32 ntdll) +add_cd_file(TARGET ntfsinfo DESTINATION reactos/system32 FOR all) Propchange: trunk/rosapps/applications/cmdutils/ntfsinfo/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/ntfs… ============================================================================== --- trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.c (added) +++ trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.c [iso-8859-1] Tue Jun 30 21:03:55 2015 @@ -0,0 +1,212 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS NTFS Information tool + * FILE: cmdutils/ntfsinfo/ntfsinfo.c + * PURPOSE: Query information from NTFS volume using FSCTL + * PROGRAMMERS: Pierre Schweitzer <pierre(a)reactos.org> + */ + +#include <windows.h> +#include <tchar.h> +#include <stdio.h> + +typedef struct +{ + ULONG Type; + USHORT UsaOffset; + USHORT UsaCount; + ULONGLONG Lsn; +} NTFS_RECORD_HEADER, *PNTFS_RECORD_HEADER; + +#define NRH_FILE_TYPE 0x454C4946 +#define ATTRIBUTE_TYPE_DATA 0x80 +#define ATTRIBUTE_TYPE_END 0xFFFFFFFF + +typedef struct _FILE_RECORD_HEADER +{ + NTFS_RECORD_HEADER Ntfs; + USHORT SequenceNumber; + USHORT LinkCount; + USHORT AttributeOffset; + USHORT Flags; + ULONG BytesInUse; + ULONG BytesAllocated; + ULONGLONG BaseFileRecord; + USHORT NextAttributeNumber; +} FILE_RECORD_HEADER, *PFILE_RECORD_HEADER; + +typedef struct +{ + ULONG Type; + ULONG Length; + UCHAR IsNonResident; + UCHAR NameLength; + USHORT NameOffset; + USHORT Flags; + USHORT Instance; + union + { + struct + { + ULONG ValueLength; + USHORT ValueOffset; + UCHAR Flags; + UCHAR Reserved; + } Resident; + struct + { + ULONGLONG LowestVCN; + ULONGLONG HighestVCN; + USHORT MappingPairsOffset; + USHORT CompressionUnit; + UCHAR Reserved[4]; + LONGLONG AllocatedSize; + LONGLONG DataSize; + LONGLONG InitializedSize; + LONGLONG CompressedSize; + } NonResident; + }; +} NTFS_ATTR_RECORD, *PNTFS_ATTR_RECORD; + +static TCHAR * MetaDataFiles[] = { + _T("$MFT\t\t"), + _T("$MFTMirr\t"), + _T("$LogFile\t"), + _T("$Volume\t\t"), + _T("$AttrDef\t"), + _T("."), + _T("$Bitmap\t\t"), + _T("$Boot\t\t"), + _T("$BadClus\t"), + _T("$Quota\t\t"), + _T("$UpCase\t\t"), + _T("$Extended\t"), + NULL, +}; + +int +__cdecl +_tmain(int argc, const TCHAR *argv[]) +{ + TCHAR VolumeName[] = _T("\\\\.\\C:"); + HANDLE VolumeHandle; + NTFS_VOLUME_DATA_BUFFER VolumeInfo; + DWORD LengthReturned; + ULONGLONG VolumeSize; + ULONGLONG MftClusters; + UINT File = 0; + PNTFS_FILE_RECORD_OUTPUT_BUFFER OutputBuffer; + + if (argc > 1) + { + TCHAR Letter = argv[1][0]; + + if ((Letter >= 'A' && Letter <= 'Z') || + (Letter >= 'a' && Letter <= 'z')) + { + VolumeName[4] = Letter; + } + } + + VolumeHandle = CreateFile(VolumeName, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0 ); + if (VolumeHandle == INVALID_HANDLE_VALUE) + { + _ftprintf(stderr, _T("Failed opening the volume '%s' (%lx)\n"), VolumeName, GetLastError()); + return 1; + } + + if (!DeviceIoControl(VolumeHandle, FSCTL_GET_NTFS_VOLUME_DATA, NULL, 0, &VolumeInfo, sizeof(VolumeInfo), &LengthReturned, NULL)) + { + _ftprintf(stderr, _T("Failed requesting volume '%s' data (%lx)\n"), VolumeName, GetLastError()); + CloseHandle(VolumeHandle); + return 1; + } + + if (LengthReturned < sizeof(VolumeInfo)) + { + _ftprintf(stderr, _T("Failed reading volume '%s' data (%lx)\n"), VolumeName, GetLastError()); + CloseHandle(VolumeHandle); + return 1; + } + + _tprintf(_T("Volume Size\n-----------\n")); + VolumeSize = VolumeInfo.TotalClusters.QuadPart * VolumeInfo.BytesPerCluster; + _tprintf(_T("Volume size\t\t: %I64u MB\n"), VolumeSize >> 20); + _tprintf(_T("Total sectors\t\t: %I64u\n"), VolumeInfo.NumberSectors.QuadPart); + _tprintf(_T("Total clusters\t\t: %I64u\n"), VolumeInfo.TotalClusters.QuadPart); + _tprintf(_T("Free clusters\t\t: %I64u\n"), VolumeInfo.FreeClusters.QuadPart); + _tprintf(_T("Free space\t\t: %I64u MB (%u%% of drive)\n"), (VolumeInfo.FreeClusters.QuadPart * VolumeInfo.BytesPerCluster) >> 20, (VolumeInfo.FreeClusters.QuadPart * 100) / VolumeInfo.TotalClusters.QuadPart); + + _tprintf(_T("\nAllocation Size\n---------------\n")); + _tprintf(_T("Bytes per sector\t: %lu\n"), VolumeInfo.BytesPerSector); + _tprintf(_T("Bytes per cluster\t: %lu\n"), VolumeInfo.BytesPerCluster); + _tprintf(_T("Bytes per MFT record:\t: %lu\n"), VolumeInfo.BytesPerFileRecordSegment); + _tprintf(_T("Clusters per MFT record\t: %lu\n"), VolumeInfo.ClustersPerFileRecordSegment); + + _tprintf(_T("\nMFT Information\n---------------\n")); + _tprintf(_T("MFT size\t\t: %I64u MB (%u%% of drive)\n"), VolumeInfo.MftValidDataLength.QuadPart >> 20, (VolumeInfo.MftValidDataLength.QuadPart * 100) / VolumeSize); + _tprintf(_T("MFT start cluster\t: %I64u\n"), VolumeInfo.MftStartLcn.QuadPart); + _tprintf(_T("MFT zone clusters\t: %I64u - %I64u\n"), VolumeInfo.MftZoneStart.QuadPart, VolumeInfo.MftZoneEnd.QuadPart); + MftClusters = VolumeInfo.MftZoneEnd.QuadPart - VolumeInfo.MftZoneStart.QuadPart; + _tprintf(_T("MFT zone size\t\t: %I64u MB (%u%% of drive)\n"), (MftClusters * VolumeInfo.BytesPerCluster) >> 20, (MftClusters * 100) / VolumeInfo.TotalClusters.QuadPart); + _tprintf(_T("MFT mirror start\t: %I64u\n"), VolumeInfo.Mft2StartLcn.QuadPart); + + _tprintf(_T("\nMeta-Data files\n---------------\n")); + OutputBuffer = HeapAlloc(GetProcessHeap(), 0, VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER)); + while (MetaDataFiles[File] != NULL) + { + NTFS_FILE_RECORD_INPUT_BUFFER InputBuffer; + PFILE_RECORD_HEADER FileRecord; + PNTFS_ATTR_RECORD Attribute; + ULONGLONG Size = 0; + + if (File == 5) + { + ++File; + continue; + } + + InputBuffer.FileReferenceNumber.QuadPart = File; + if (!DeviceIoControl(VolumeHandle, FSCTL_GET_NTFS_FILE_RECORD, &InputBuffer, sizeof(InputBuffer), + OutputBuffer, VolumeInfo.BytesPerFileRecordSegment + sizeof(NTFS_FILE_RECORD_OUTPUT_BUFFER), + &LengthReturned, NULL)) + { + ++File; + continue; + } + + if (OutputBuffer->FileReferenceNumber.QuadPart != File) + { + ++File; + continue; + } + + FileRecord = (PFILE_RECORD_HEADER)OutputBuffer->FileRecordBuffer; + if (FileRecord->Ntfs.Type != NRH_FILE_TYPE) + { + ++File; + continue; + } + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->AttributeOffset); + while (Attribute < (PNTFS_ATTR_RECORD)((ULONG_PTR)FileRecord + FileRecord->BytesInUse) && + Attribute->Type != ATTRIBUTE_TYPE_END) + { + if (Attribute->Type == ATTRIBUTE_TYPE_DATA) + { + Size = (Attribute->IsNonResident) ? Attribute->NonResident.AllocatedSize : Attribute->Resident.ValueLength; + break; + } + + Attribute = (PNTFS_ATTR_RECORD)((ULONG_PTR)Attribute + Attribute->Length); + } + + _tprintf(_T("%s%I64u bytes\n"), MetaDataFiles[File], Size); + + ++File; + } + + HeapFree(GetProcessHeap(), 0, OutputBuffer); + CloseHandle(VolumeHandle); + return 0; +} Propchange: trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.rc URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/ntfs… ============================================================================== --- trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.rc (added) +++ trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.rc [iso-8859-1] Tue Jun 30 21:03:55 2015 @@ -0,0 +1,4 @@ +#define REACTOS_STR_FILE_DESCRIPTION "NTFS Information\0" +#define REACTOS_STR_INTERNAL_NAME "ntfsinfo\0" +#define REACTOS_STR_ORIGINAL_FILENAME "ntfsinfo.exe\0" +#include <reactos/version.rc> Propchange: trunk/rosapps/applications/cmdutils/ntfsinfo/ntfsinfo.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 68325: [HDAUDBUS] - fix small bug
by janderwald＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: janderwald Date: Tue Jun 30 19:06:36 2015 New Revision: 68325 URL: http://svn.reactos.org/svn/reactos?rev=68325&view=rev Log: [HDAUDBUS] - fix small bug Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp Modified: trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/hdaudbus… ============================================================================== --- trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/hdaudbus/pdo.cpp [iso-8859-1] Tue Jun 30 19:06:36 2015 @@ -100,7 +100,7 @@ Length = swprintf(DeviceName, L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X&REV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId, DeviceExtension->Codec->Major << 12 | DeviceExtension->Codec->Minor << 8 | DeviceExtension->Codec->Revision) + 1; Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X&DEV_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId, DeviceExtension->Codec->ProductId) + 1; Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup, DeviceExtension->Codec->VendorId) + 1; - Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X&VEN_%04X", DeviceExtension->AudioGroup->FunctionGroup) + 2; + Length += swprintf(&DeviceName[Length], L"HDAUDIO\\FUNC_%02X", DeviceExtension->AudioGroup->FunctionGroup) + 2; /* allocate result buffer*/ Device = (LPWSTR)AllocateItem(PagedPool, Length * sizeof(WCHAR));

1 0

[cfinck] 68324: [LOCALSPL] Bugfix: The RegEnum* functions take the buffer size _including_ the terminating null character as input and only return the actual data length _without_ the terminating n...
by cfinck＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: cfinck Date: Tue Jun 30 16:08:16 2015 New Revision: 68324 URL: http://svn.reactos.org/svn/reactos?rev=68324&view=rev Log: [LOCALSPL] Bugfix: The RegEnum* functions take the buffer size _including_ the terminating null character as input and only return the actual data length _without_ the terminating null character as output. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Tue Jun 30 16:08:16 2015 @@ -192,7 +192,7 @@ } // Get the name of this Print Processor. - cchPrintProcessorName = cchMaxSubKey; + cchPrintProcessorName = cchMaxSubKey + 1; lStatus = RegEnumKeyExW(hSubKey, i, pwszPrintProcessorName, &cchPrintProcessorName, NULL, NULL, NULL, NULL); if (lStatus != ERROR_SUCCESS) { @@ -498,7 +498,7 @@ { // RegEnumKeyExW sucks! Unlike similar API functions, it only returns the actual numbers of characters copied when you supply a buffer large enough. // So use pwszTemp with its size cchMaxSubKey for this. - cchPrintProcessor = cchMaxSubKey; + cchPrintProcessor = cchMaxSubKey + 1; dwErrorCode = (DWORD)RegEnumKeyExW(hSubKey, i, pwszTemp, &cchPrintProcessor, NULL, NULL, NULL, NULL); if (dwErrorCode != ERROR_SUCCESS) { @@ -524,7 +524,7 @@ for (i = 0; i < *pcReturned; i++) { // This isn't really correct, but doesn't cause any harm, because we've extensively checked the size of the supplied buffer above. - cchPrintProcessor = cchMaxSubKey; + cchPrintProcessor = cchMaxSubKey + 1; // Copy the Print Processor name. dwErrorCode = (DWORD)RegEnumKeyExW(hSubKey, i, (PWSTR)pCurrentOutputPrintProcessor, &cchPrintProcessor, NULL, NULL, NULL, NULL);

1 0

[cfinck] 68323: [LOCALSPL, WINPRINT] Bugfix: I want to dereference the pointer and then increment its value, not increment the pointer address.
by cfinck＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: cfinck Date: Tue Jun 30 16:02:26 2015 New Revision: 68323 URL: http://svn.reactos.org/svn/reactos?rev=68323&view=rev Log: [LOCALSPL, WINPRINT] Bugfix: I want to dereference the pointer and then increment its value, not increment the pointer address. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Tue Jun 30 16:02:26 2015 @@ -131,7 +131,7 @@ // Also calculate the offset in the output buffer of the pointer to this datatype string. *pCurrentOffset = *pcReturned * sizeof(DATATYPES_INFO_1W) + FIELD_OFFSET(DATATYPES_INFO_1W, pName); - *pcReturned++; + (*pcReturned)++; pCurrentOffset++; } @@ -198,7 +198,7 @@ goto Cleanup; } - // Create a new WINPRINT_HANDLE structure. and fill the relevant fields. + // Create a new WINPRINT_HANDLE structure and fill the relevant fields. pHandle = DllAllocSplMem(sizeof(WINPRINT_HANDLE)); // Check what datatype was given. Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/jobs.c [iso-8859-1] Tue Jun 30 16:02:26 2015 @@ -943,7 +943,7 @@ _LocalGetJobLevel2(pPrinterHandle, pJob, NULL, NULL, 0, pcbNeeded); // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. - *pcReturned++; + (*pcReturned)++; pNode = pNode->Next[0]; } @@ -976,7 +976,7 @@ goto Cleanup; // We stop either when there are no more jobs in the list or when the caller didn't request more, whatever comes first. - *pcReturned++; + (*pcReturned)++; pNode = pNode->Next[0]; } Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printers.c [iso-8859-1] Tue Jun 30 16:02:26 2015 @@ -347,7 +347,7 @@ cbDescription = cchComputerName * sizeof(WCHAR) + cbName + cbComment + sizeof(WCHAR); *pcbNeeded += sizeof(PRINTER_INFO_1W) + cchComputerName * sizeof(WCHAR) + cbName + cbComment + cbDescription; - *pcReturned++; + (*pcReturned)++; } // Check if the supplied buffer is large enough.

1 0

[cfinck] 68322: [LOCALSPL] Bugfix: The last entry in a doubly linked list (LIST_ENTRY structure) is actually the head element again, not NULL!
by cfinck＠svn.reactos.org 30 Jun '15

30 Jun '15

Author: cfinck Date: Tue Jun 30 15:54:42 2015 New Revision: 68322 URL: http://svn.reactos.org/svn/reactos?rev=68322&view=rev Log: [LOCALSPL] Bugfix: The last entry in a doubly linked list (LIST_ENTRY structure) is actually the head element again, not NULL! Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c Modified: branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/rea… ============================================================================== --- branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/win32ss/printing/providers/localspl/printprocessors.c [iso-8859-1] Tue Jun 30 15:54:42 2015 @@ -95,7 +95,7 @@ PLIST_ENTRY pEntry; PLOCAL_PRINT_PROCESSOR pPrintProcessor; - for (pEntry = _PrintProcessorList.Flink; pEntry; pEntry = pEntry->Flink) + for (pEntry = _PrintProcessorList.Flink; pEntry != &_PrintProcessorList; pEntry = pEntry->Flink) { pPrintProcessor = CONTAINING_RECORD(pEntry, LOCAL_PRINT_PROCESSOR, Entry);

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