Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 67991: [CDFS] Queue IRP_MJ_DIRECTORY_CONTROL IRPs.
by ekohl＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: ekohl Date: Mon Jun 1 15:04:50 2015 New Revision: 67991 URL: http://svn.reactos.org/svn/reactos?rev=67991&view=rev Log: [CDFS] Queue IRP_MJ_DIRECTORY_CONTROL IRPs. Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/dirctl.c trunk/reactos/drivers/filesystems/cdfs/dispatch.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Mon Jun 1 15:04:50 2015 @@ -85,8 +85,7 @@ DriverObject->MajorFunction[IRP_MJ_READ] = CdfsRead; DriverObject->MajorFunction[IRP_MJ_WRITE] = CdfsWrite; DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = CdfsFsdDispatch; - DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = - CdfsDirectoryControl; + DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = CdfsFsdDispatch; Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Jun 1 15:04:50 2015 @@ -338,12 +338,10 @@ /* dirctl.c */ -DRIVER_DISPATCH CdfsDirectoryControl; - -NTSTATUS -NTAPI -CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NTAPI +CdfsDirectoryControl( + PCDFS_IRP_CONTEXT IrpContext); /* dispatch.c */ @@ -452,13 +450,9 @@ /* fsctl.c */ -//DRIVER_DISPATCH CdfsFileSystemControl; - NTSTATUS NTAPI CdfsFileSystemControl( PCDFS_IRP_CONTEXT IrpContext); -// PDEVICE_OBJECT DeviceObject, -// PIRP Irp); /* misc.c */ Modified: trunk/reactos/drivers/filesystems/cdfs/dirctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dirctl.c [iso-8859-1] Mon Jun 1 15:04:50 2015 @@ -784,18 +784,23 @@ NTSTATUS NTAPI -CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +CdfsDirectoryControl( + PCDFS_IRP_CONTEXT IrpContext) { - PIO_STACK_LOCATION Stack; + PIRP Irp; + PDEVICE_OBJECT DeviceObject; NTSTATUS Status; DPRINT("CdfsDirectoryControl() called\n"); + + ASSERT(IrpContext); + + Irp = IrpContext->Irp; + DeviceObject = IrpContext->DeviceObject; + FsRtlEnterFileSystem(); - Stack = IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->MinorFunction) + switch (IrpContext->MinorFunction) { case IRP_MN_QUERY_DIRECTORY: Status = CdfsQueryDirectory(DeviceObject, @@ -808,7 +813,7 @@ break; default: - DPRINT1("CDFS: MinorFunction %u\n", Stack->MinorFunction); + DPRINT1("CDFS: MinorFunction %u\n", IrpContext->MinorFunction); Status = STATUS_INVALID_DEVICE_REQUEST; break; } @@ -817,7 +822,6 @@ { Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); } FsRtlExitFileSystem(); Modified: trunk/reactos/drivers/filesystems/cdfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] Mon Jun 1 15:04:50 2015 @@ -18,7 +18,7 @@ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: drivers/filesystem/cdfs/dispatch.c + * FILE: drivers/filesystems/cdfs/dispatch.c * PURPOSE: CDROM (ISO 9660) filesystem driver * PROGRAMMER: Pierre Schweitzer */ @@ -85,7 +85,7 @@ break; case IRP_MJ_DIRECTORY_CONTROL: -// Status = CdfsDirectoryControl(IrpContext); + Status = CdfsDirectoryControl(IrpContext); break; case IRP_MJ_READ:

1 0

[ekohl] 67990: [CDFS] Fix indentation and coding style. No code changes!
by ekohl＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: ekohl Date: Mon Jun 1 15:00:51 2015 New Revision: 67990 URL: http://svn.reactos.org/svn/reactos?rev=67990&view=rev Log: [CDFS] Fix indentation and coding style. No code changes! Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Mon Jun 1 15:00:51 2015 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel -* FILE: drivers/fs/cdfs/fsctl.c +* FILE: drivers/filesystems/cdfs/fsctl.c * PURPOSE: CDROM (ISO 9660) filesystem driver * PROGRAMMER: Art Yerkes * Eric Kohl @@ -41,9 +41,11 @@ } -static VOID -CdfsGetPVDData(PUCHAR Buffer, - PCDINFO CdInfo) +static +VOID +CdfsGetPVDData( + PUCHAR Buffer, + PCDINFO CdInfo) { PPVD Pvd; USHORT i; @@ -150,9 +152,11 @@ } -static VOID -CdfsGetSVDData(PUCHAR Buffer, - PCDINFO CdInfo) +static +VOID +CdfsGetSVDData( + PUCHAR Buffer, + PCDINFO CdInfo) { PSVD Svd; ULONG JolietLevel = 0; @@ -190,9 +194,11 @@ } -static NTSTATUS -CdfsGetVolumeData(PDEVICE_OBJECT DeviceObject, - PCDINFO CdInfo) +static +NTSTATUS +CdfsGetVolumeData( + PDEVICE_OBJECT DeviceObject, + PCDINFO CdInfo) { PUCHAR Buffer; NTSTATUS Status; @@ -210,12 +216,12 @@ Size = sizeof(Toc); Status = CdfsDeviceIoControl(DeviceObject, - IOCTL_CDROM_READ_TOC, - NULL, - 0, - &Toc, - &Size, - TRUE); + IOCTL_CDROM_READ_TOC, + NULL, + 0, + &Toc, + &Size, + TRUE); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Buffer, CDFS_TAG); @@ -223,7 +229,7 @@ } DPRINT("FirstTrack %u, LastTrack %u, TrackNumber %u\n", - Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); + Toc.FirstTrack, Toc.LastTrack, Toc.TrackData[0].TrackNumber); Offset = Toc.TrackData[0].Address[1] * 60 * 75; Offset += Toc.TrackData[0].Address[2] * 75; @@ -245,11 +251,11 @@ for (Sector = CDFS_PRIMARY_DESCRIPTOR_LOCATION; Sector < 100 && Buffer[0] != 255; Sector++) { /* Read the Primary Volume Descriptor (PVD) */ - Status = CdfsReadSectors (DeviceObject, - Sector + Offset, - 1, - Buffer, - TRUE); + Status = CdfsReadSectors(DeviceObject, + Sector + Offset, + 1, + Buffer, + TRUE); if (!NT_SUCCESS(Status)) { ExFreePoolWithTag(Buffer, CDFS_TAG); @@ -270,43 +276,45 @@ switch (VdHeader->VdType) { - case 0: - DPRINT("BootVolumeDescriptor found!\n"); - break; - - case 1: - DPRINT("PrimaryVolumeDescriptor found!\n"); - CdfsGetPVDData(Buffer, CdInfo); - break; - - case 2: - DPRINT("SupplementaryVolumeDescriptor found!\n"); - CdfsGetSVDData(Buffer, CdInfo); - break; - - case 3: - DPRINT("VolumePartitionDescriptor found!\n"); - break; - - case 255: - DPRINT("VolumeDescriptorSetTerminator found!\n"); - break; - - default: - DPRINT1("Unknown volume descriptor type %u found!\n", VdHeader->VdType); - break; + case 0: + DPRINT("BootVolumeDescriptor found!\n"); + break; + + case 1: + DPRINT("PrimaryVolumeDescriptor found!\n"); + CdfsGetPVDData(Buffer, CdInfo); + break; + + case 2: + DPRINT("SupplementaryVolumeDescriptor found!\n"); + CdfsGetSVDData(Buffer, CdInfo); + break; + + case 3: + DPRINT("VolumePartitionDescriptor found!\n"); + break; + + case 255: + DPRINT("VolumeDescriptorSetTerminator found!\n"); + break; + + default: + DPRINT1("Unknown volume descriptor type %u found!\n", VdHeader->VdType); + break; } } ExFreePoolWithTag(Buffer, CDFS_TAG); - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsMountVolume(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + return STATUS_SUCCESS; +} + + +static +NTSTATUS +CdfsMountVolume( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PDEVICE_EXTENSION DeviceExt = NULL; PDEVICE_OBJECT NewDeviceObject = NULL; @@ -337,12 +345,12 @@ } Status = IoCreateDevice(CdfsGlobalData->DriverObject, - sizeof(DEVICE_EXTENSION), - NULL, - FILE_DEVICE_CD_ROM_FILE_SYSTEM, - DeviceToMount->Characteristics, - FALSE, - &NewDeviceObject); + sizeof(DEVICE_EXTENSION), + NULL, + FILE_DEVICE_CD_ROM_FILE_SYSTEM, + DeviceToMount->Characteristics, + FALSE, + &NewDeviceObject); if (!NT_SUCCESS(Status)) goto ByeBye; @@ -350,7 +358,7 @@ NewDeviceObject->Flags &= ~DO_VERIFY_VOLUME; DeviceExt = (PVOID)NewDeviceObject->DeviceExtension; RtlZeroMemory(DeviceExt, - sizeof(DEVICE_EXTENSION)); + sizeof(DEVICE_EXTENSION)); Vpb->SerialNumber = CdInfo.SerialNumber; Vpb->VolumeLabelLength = CdInfo.VolumeLabelLength; @@ -373,7 +381,7 @@ ExInitializeResourceLite(&DeviceExt->DirResource); DeviceExt->StreamFileObject = IoCreateStreamFileObject(NULL, - DeviceExt->StorageDevice); + DeviceExt->StorageDevice); Fcb = CdfsCreateFCB(NULL); if (Fcb == NULL) @@ -388,8 +396,9 @@ Status = STATUS_INSUFFICIENT_RESOURCES; goto ByeBye; } + RtlZeroMemory(Ccb, - sizeof(CCB)); + sizeof(CCB)); DeviceExt->StreamFileObject->ReadAccess = TRUE; DeviceExt->StreamFileObject->WriteAccess = FALSE; @@ -414,10 +423,10 @@ _SEH2_TRY { CcInitializeCacheMap(DeviceExt->StreamFileObject, - (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), - TRUE, - &(CdfsGlobalData->CacheMgrCallbacks), - Fcb); + (PCC_FILE_SIZES)(&Fcb->RFCB.AllocationSize), + TRUE, + &(CdfsGlobalData->CacheMgrCallbacks), + Fcb); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -450,13 +459,15 @@ DPRINT("CdfsMountVolume() done (Status: %lx)\n", Status); - return(Status); -} - - -static NTSTATUS -CdfsVerifyVolume(PDEVICE_OBJECT DeviceObject, - PIRP Irp) + return Status; +} + + +static +NTSTATUS +CdfsVerifyVolume( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) { PDEVICE_EXTENSION DeviceExt; PIO_STACK_LOCATION Stack; @@ -466,7 +477,7 @@ PFCB Fcb; PVPB VpbToVerify; - DPRINT1 ("CdfsVerifyVolume() called\n"); + DPRINT("CdfsVerifyVolume() called\n"); DeviceExt = DeviceObject->DeviceExtension; @@ -474,12 +485,12 @@ VpbToVerify = Stack->Parameters.VerifyVolume.Vpb; FsRtlEnterFileSystem(); - ExAcquireResourceExclusiveLite (&DeviceExt->VcbResource, - TRUE); + ExAcquireResourceExclusiveLite(&DeviceExt->VcbResource, + TRUE); if (!(VpbToVerify->RealDevice->Flags & DO_VERIFY_VOLUME)) { - DPRINT1 ("Volume has been verified!\n"); + DPRINT1("Volume has been verified!\n"); ExReleaseResourceLite (&DeviceExt->VcbResource); FsRtlExitFileSystem(); return STATUS_SUCCESS; @@ -488,13 +499,13 @@ DPRINT1("Device object %p Device to verify %p\n", DeviceObject, VpbToVerify->RealDevice); Status = CdfsGetVolumeData(VpbToVerify->RealDevice, - &CdInfo); + &CdInfo); if (NT_SUCCESS(Status) && CdInfo.SerialNumber == VpbToVerify->SerialNumber && CdInfo.VolumeLabelLength == VpbToVerify->VolumeLabelLength && !wcsncmp(CdInfo.VolumeLabel, VpbToVerify->VolumeLabel, CdInfo.VolumeLabelLength)) { - DPRINT1 ("Same volume!\n"); + DPRINT1("Same volume!\n"); /* FIXME: Flush and purge metadata */ @@ -502,7 +513,7 @@ } else { - DPRINT1 ("Different volume!\n"); + DPRINT1("Different volume!\n"); /* FIXME: force volume dismount */ Entry = DeviceExt->FcbListHead.Flink; @@ -519,17 +530,18 @@ VpbToVerify->RealDevice->Flags &= ~DO_VERIFY_VOLUME; - ExReleaseResourceLite (&DeviceExt->VcbResource); + ExReleaseResourceLite(&DeviceExt->VcbResource); FsRtlExitFileSystem(); return Status; } -NTSTATUS NTAPI +NTSTATUS +NTAPI CdfsSetCompression( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp) + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) { PIO_STACK_LOCATION Stack; USHORT CompressionState; @@ -549,7 +561,8 @@ } -NTSTATUS NTAPI +NTSTATUS +NTAPI CdfsFileSystemControl( PCDFS_IRP_CONTEXT IrpContext) { @@ -570,39 +583,39 @@ switch (IrpContext->MinorFunction) { - case IRP_MN_KERNEL_CALL: - case IRP_MN_USER_FS_REQUEST: - switch (Stack->Parameters.DeviceIoControl.IoControlCode) - { - case FSCTL_SET_COMPRESSION: - DPRINT("CDFS: IRP_MN_USER_FS_REQUEST / FSCTL_SET_COMPRESSION\n"); - Status = CdfsSetCompression(DeviceObject, Irp); + case IRP_MN_KERNEL_CALL: + case IRP_MN_USER_FS_REQUEST: + switch (Stack->Parameters.DeviceIoControl.IoControlCode) + { + case FSCTL_SET_COMPRESSION: + DPRINT("CDFS: IRP_MN_USER_FS_REQUEST / FSCTL_SET_COMPRESSION\n"); + Status = CdfsSetCompression(DeviceObject, Irp); + break; + + default: + DPRINT1("CDFS: IRP_MN_USER_FS_REQUEST / Unknown IoControlCode 0x%x\n", + Stack->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_INVALID_DEVICE_REQUEST; + } break; + case IRP_MN_MOUNT_VOLUME: + DPRINT("CDFS: IRP_MN_MOUNT_VOLUME\n"); + Status = CdfsMountVolume(DeviceObject, Irp); + break; + + case IRP_MN_VERIFY_VOLUME: + DPRINT1("CDFS: IRP_MN_VERIFY_VOLUME\n"); + Status = CdfsVerifyVolume(DeviceObject, Irp); + break; + default: - DPRINT1("CDFS: IRP_MN_USER_FS_REQUEST / Unknown IoControlCode 0x%x\n", - Stack->Parameters.DeviceIoControl.IoControlCode); + DPRINT1("CDFS FSC: MinorFunction %u\n", Stack->MinorFunction); Status = STATUS_INVALID_DEVICE_REQUEST; - } - break; - - case IRP_MN_MOUNT_VOLUME: - DPRINT("CDFS: IRP_MN_MOUNT_VOLUME\n"); - Status = CdfsMountVolume(DeviceObject, Irp); - break; - - case IRP_MN_VERIFY_VOLUME: - DPRINT1("CDFS: IRP_MN_VERIFY_VOLUME\n"); - Status = CdfsVerifyVolume(DeviceObject, Irp); - break; - - default: - DPRINT1("CDFS FSC: MinorFunction %u\n", Stack->MinorFunction); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - return(Status); + break; + } + + return Status; } /* EOF */ Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Mon Jun 1 15:00:51 2015 @@ -19,7 +19,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: services/fs/vfat/volume.c + * FILE: drivers/filesystems/cdfs/volume.c * PURPOSE: CDROM (ISO 9660) filesystem driver * PROGRAMMER: Art Yerkes * Eric Kohl @@ -34,10 +34,12 @@ /* FUNCTIONS ****************************************************************/ -static NTSTATUS -CdfsGetFsVolumeInformation(PDEVICE_OBJECT DeviceObject, - PFILE_FS_VOLUME_INFORMATION FsVolumeInfo, - PULONG BufferLength) +static +NTSTATUS +CdfsGetFsVolumeInformation( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_VOLUME_INFORMATION FsVolumeInfo, + PULONG BufferLength) { DPRINT("CdfsGetFsVolumeInformation() called\n"); DPRINT("FsVolumeInfo = %p\n", FsVolumeInfo); @@ -59,8 +61,8 @@ FsVolumeInfo->VolumeSerialNumber = DeviceObject->Vpb->SerialNumber; FsVolumeInfo->VolumeLabelLength = DeviceObject->Vpb->VolumeLabelLength; memcpy(FsVolumeInfo->VolumeLabel, - DeviceObject->Vpb->VolumeLabel, - DeviceObject->Vpb->VolumeLabelLength); + DeviceObject->Vpb->VolumeLabel, + DeviceObject->Vpb->VolumeLabelLength); /* dummy entries */ FsVolumeInfo->VolumeCreationTime.QuadPart = 0; @@ -72,14 +74,16 @@ DPRINT("BufferLength %lu\n", *BufferLength); - return(STATUS_SUCCESS); -} - - -static NTSTATUS -CdfsGetFsAttributeInformation(PDEVICE_EXTENSION DeviceExt, - PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, - PULONG BufferLength) + return STATUS_SUCCESS; +} + + +static +NTSTATUS +CdfsGetFsAttributeInformation( + PDEVICE_EXTENSION DeviceExt, + PFILE_FS_ATTRIBUTE_INFORMATION FsAttributeInfo, + PULONG BufferLength) { DPRINT("CdfsGetFsAttributeInformation()\n"); DPRINT("FsAttributeInfo = %p\n", FsAttributeInfo); @@ -106,14 +110,15 @@ *BufferLength -= (sizeof(FILE_FS_ATTRIBUTE_INFORMATION) + 8); DPRINT("BufferLength %lu\n", *BufferLength); - return(STATUS_SUCCESS); + return STATUS_SUCCESS; } static NTSTATUS -CdfsGetFsSizeInformation(PDEVICE_OBJECT DeviceObject, - PFILE_FS_SIZE_INFORMATION FsSizeInfo, - PULONG BufferLength) +CdfsGetFsSizeInformation( + PDEVICE_OBJECT DeviceObject, + PFILE_FS_SIZE_INFORMATION FsSizeInfo, + PULONG BufferLength) { PDEVICE_EXTENSION DeviceExt; NTSTATUS Status = STATUS_SUCCESS; @@ -122,7 +127,7 @@ DPRINT("FsSizeInfo = %p\n", FsSizeInfo); if (*BufferLength < sizeof(FILE_FS_SIZE_INFORMATION)) - return(STATUS_BUFFER_OVERFLOW); + return STATUS_BUFFER_OVERFLOW; DeviceExt = DeviceObject->DeviceExtension; @@ -135,17 +140,16 @@ if (NT_SUCCESS(Status)) *BufferLength -= sizeof(FILE_FS_SIZE_INFORMATION); - return(Status); -} - - -static NTSTATUS -CdfsGetFsDeviceInformation -( + return Status; +} + + +static +NTSTATUS +CdfsGetFsDeviceInformation( PDEVICE_OBJECT DeviceObject, PFILE_FS_DEVICE_INFORMATION FsDeviceInfo, - PULONG BufferLength -) + PULONG BufferLength) { DPRINT("CdfsGetFsDeviceInformation()\n"); DPRINT("FsDeviceInfo = %p\n", FsDeviceInfo); @@ -153,7 +157,7 @@ DPRINT("Required length %lu\n", sizeof(FILE_FS_DEVICE_INFORMATION)); if (*BufferLength < sizeof(FILE_FS_DEVICE_INFORMATION)) - return(STATUS_BUFFER_OVERFLOW); + return STATUS_BUFFER_OVERFLOW; FsDeviceInfo->DeviceType = FILE_DEVICE_CD_ROM; FsDeviceInfo->Characteristics = DeviceObject->Characteristics; @@ -163,11 +167,12 @@ *BufferLength -= sizeof(FILE_FS_DEVICE_INFORMATION); DPRINT("BufferLength %lu\n", *BufferLength); - return(STATUS_SUCCESS); -} - - -NTSTATUS NTAPI + return STATUS_SUCCESS; +} + + +NTSTATUS +NTAPI CdfsQueryVolumeInformation( PCDFS_IRP_CONTEXT IrpContext) { @@ -195,32 +200,32 @@ switch (FsInformationClass) { - case FileFsVolumeInformation: - Status = CdfsGetFsVolumeInformation(DeviceObject, - SystemBuffer, - &BufferLength); + case FileFsVolumeInformation: + Status = CdfsGetFsVolumeInformation(DeviceObject, + SystemBuffer, + &BufferLength); + break; + + case FileFsAttributeInformation: + Status = CdfsGetFsAttributeInformation(DeviceObject->DeviceExtension, + SystemBuffer, + &BufferLength); + break; + + case FileFsSizeInformation: + Status = CdfsGetFsSizeInformation(DeviceObject, + SystemBuffer, + &BufferLength); break; - case FileFsAttributeInformation: - Status = CdfsGetFsAttributeInformation(DeviceObject->DeviceExtension, - SystemBuffer, - &BufferLength); - break; - - case FileFsSizeInformation: - Status = CdfsGetFsSizeInformation(DeviceObject, - SystemBuffer, - &BufferLength); - break; - - case FileFsDeviceInformation: - Status = CdfsGetFsDeviceInformation(DeviceObject, - SystemBuffer, - &BufferLength); - break; - - default: - Status = STATUS_NOT_SUPPORTED; + case FileFsDeviceInformation: + Status = CdfsGetFsDeviceInformation(DeviceObject, + SystemBuffer, + &BufferLength); + break; + + default: + Status = STATUS_NOT_SUPPORTED; } Irp->IoStatus.Status = Status; @@ -230,11 +235,12 @@ else Irp->IoStatus.Information = 0; - return(Status); -} - - -NTSTATUS NTAPI + return Status; +} + + +NTSTATUS +NTAPI CdfsSetVolumeInformation( PCDFS_IRP_CONTEXT IrpContext) { @@ -248,7 +254,7 @@ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; - return(STATUS_NOT_SUPPORTED); + return STATUS_NOT_SUPPORTED; } /* EOF */

1 0

[ekohl] 67989: [CDFS] Do not complete an IRP that will be passed down to a lower driver.
by ekohl＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: ekohl Date: Mon Jun 1 14:26:58 2015 New Revision: 67989 URL: http://svn.reactos.org/svn/reactos?rev=67989&view=rev Log: [CDFS] Do not complete an IRP that will be passed down to a lower driver. Modified: trunk/reactos/drivers/filesystems/cdfs/devctrl.c Modified: trunk/reactos/drivers/filesystems/cdfs/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/devctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/devctrl.c [iso-8859-1] Mon Jun 1 14:26:58 2015 @@ -25,6 +25,8 @@ PVCB Vcb = NULL; PFILE_OBJECT FileObject; PIO_STACK_LOCATION Stack; + + DPRINT("CdfsDeviceControl()\n"); ASSERT(IrpContext); @@ -59,6 +61,10 @@ /* Pass it to storage driver */ IoSkipCurrentIrpStackLocation(Irp); Vcb = (PVCB)Stack->DeviceObject->DeviceExtension; + + /* Lower driver will complete - we don't have to */ + IrpContext->Flags &= ~IRPCONTEXT_COMPLETE; + Status = IoCallDriver(Vcb->StorageDevice, Irp); }

1 0

[ekohl] 67988: [CDFS] - Move the fastio code to a separate file. - Add Pierres IRP-Queue code and use it for IRP_MJ_QUERY_VOLUME_INFORMATION, IRP_MJ_SET_VOLUME_INFORMATION, IRP_MJ_QUERY_INFORMATION...
by ekohl＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: ekohl Date: Mon Jun 1 13:13:18 2015 New Revision: 67988 URL: http://svn.reactos.org/svn/reactos?rev=67988&view=rev Log: [CDFS] - Move the fastio code to a separate file. - Add Pierres IRP-Queue code and use it for IRP_MJ_QUERY_VOLUME_INFORMATION, IRP_MJ_SET_VOLUME_INFORMATION, IRP_MJ_QUERY_INFORMATION, IRP_MJ_SET_INFORMATION, IRP_MJ_DEVICE_CONTROL and IRP_MJ_FILE_SYSTEM_CONTROL requests. Added: trunk/reactos/drivers/filesystems/cdfs/dispatch.c (with props) trunk/reactos/drivers/filesystems/cdfs/fastio.c (with props) Modified: trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt trunk/reactos/drivers/filesystems/cdfs/cdfs.c trunk/reactos/drivers/filesystems/cdfs/cdfs.h trunk/reactos/drivers/filesystems/cdfs/devctrl.c trunk/reactos/drivers/filesystems/cdfs/finfo.c trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/cdfs/misc.c trunk/reactos/drivers/filesystems/cdfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/C… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -9,6 +9,8 @@ create.c devctrl.c dirctl.c + dispatch.c + fastio.c fcb.c finfo.c fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -84,26 +84,24 @@ DriverObject->MajorFunction[IRP_MJ_CREATE] = CdfsCreate; DriverObject->MajorFunction[IRP_MJ_READ] = CdfsRead; DriverObject->MajorFunction[IRP_MJ_WRITE] = CdfsWrite; - DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = - CdfsFileSystemControl; + DriverObject->MajorFunction[IRP_MJ_FILE_SYSTEM_CONTROL] = CdfsFsdDispatch; DriverObject->MajorFunction[IRP_MJ_DIRECTORY_CONTROL] = CdfsDirectoryControl; - DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = - CdfsQueryInformation; - DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = - CdfsSetInformation; - DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = - CdfsQueryVolumeInformation; - DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = - CdfsSetVolumeInformation; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = - CdfsDeviceControl; + DriverObject->MajorFunction[IRP_MJ_QUERY_INFORMATION] = CdfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_SET_INFORMATION] = CdfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_QUERY_VOLUME_INFORMATION] = CdfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_SET_VOLUME_INFORMATION] = CdfsFsdDispatch; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = CdfsFsdDispatch; CdfsGlobalData->FastIoDispatch.SizeOfFastIoDispatch = sizeof(FAST_IO_DISPATCH); CdfsGlobalData->FastIoDispatch.FastIoCheckIfPossible = CdfsFastIoCheckIfPossible; CdfsGlobalData->FastIoDispatch.FastIoRead = CdfsFastIoRead; CdfsGlobalData->FastIoDispatch.FastIoWrite = CdfsFastIoWrite; DriverObject->FastIoDispatch = &CdfsGlobalData->FastIoDispatch; + + /* Initialize lookaside list for IRP contexts */ + ExInitializeNPagedLookasideList(&CdfsGlobalData->IrpContextLookasideList, + NULL, NULL, 0, sizeof(CDFS_IRP_CONTEXT), 'PRIC', 0); DriverObject->DriverUnload = NULL; @@ -122,98 +120,3 @@ } -BOOLEAN NTAPI -CdfsAcquireForLazyWrite(IN PVOID Context, - IN BOOLEAN Wait) -{ - PFCB Fcb = (PFCB)Context; - ASSERT(Fcb); - DPRINT("CdfsAcquireForLazyWrite(): Fcb %p\n", Fcb); - - if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) - { - DPRINT("CdfsAcquireForLazyWrite(): ExReleaseResourceLite failed.\n"); - return FALSE; - } - return TRUE; -} - -VOID NTAPI -CdfsReleaseFromLazyWrite(IN PVOID Context) -{ - PFCB Fcb = (PFCB)Context; - ASSERT(Fcb); - DPRINT("CdfsReleaseFromLazyWrite(): Fcb %p\n", Fcb); - - ExReleaseResourceLite(&(Fcb->MainResource)); -} - -BOOLEAN -NTAPI -CdfsFastIoCheckIfPossible( - _In_ PFILE_OBJECT FileObject, - _In_ PLARGE_INTEGER FileOffset, - _In_ ULONG Length, - _In_ BOOLEAN Wait, - _In_ ULONG LockKey, - _In_ BOOLEAN CheckForReadOperation, - _Out_ PIO_STATUS_BLOCK IoStatus, - _In_ PDEVICE_OBJECT DeviceObject) -{ - /* Deny FastIo */ - UNREFERENCED_PARAMETER(FileObject); - UNREFERENCED_PARAMETER(FileOffset); - UNREFERENCED_PARAMETER(Length); - UNREFERENCED_PARAMETER(Wait); - UNREFERENCED_PARAMETER(LockKey); - UNREFERENCED_PARAMETER(CheckForReadOperation); - UNREFERENCED_PARAMETER(IoStatus); - UNREFERENCED_PARAMETER(DeviceObject); - return FALSE; -} - -BOOLEAN -NTAPI -CdfsFastIoRead( - _In_ PFILE_OBJECT FileObject, - _In_ PLARGE_INTEGER FileOffset, - _In_ ULONG Length, - _In_ BOOLEAN Wait, - _In_ ULONG LockKey, - _Out_ PVOID Buffer, - _Out_ PIO_STATUS_BLOCK IoStatus, - _In_ PDEVICE_OBJECT DeviceObject) -{ - DBG_UNREFERENCED_PARAMETER(FileObject); - DBG_UNREFERENCED_PARAMETER(FileOffset); - DBG_UNREFERENCED_PARAMETER(Length); - DBG_UNREFERENCED_PARAMETER(Wait); - DBG_UNREFERENCED_PARAMETER(LockKey); - DBG_UNREFERENCED_PARAMETER(Buffer); - DBG_UNREFERENCED_PARAMETER(IoStatus); - DBG_UNREFERENCED_PARAMETER(DeviceObject); - return FALSE; -} - -BOOLEAN -NTAPI -CdfsFastIoWrite( - _In_ PFILE_OBJECT FileObject, - _In_ PLARGE_INTEGER FileOffset, - _In_ ULONG Length, - _In_ BOOLEAN Wait, - _In_ ULONG LockKey, - _In_ PVOID Buffer, - _Out_ PIO_STATUS_BLOCK IoStatus, - _In_ PDEVICE_OBJECT DeviceObject) -{ - DBG_UNREFERENCED_PARAMETER(FileObject); - DBG_UNREFERENCED_PARAMETER(FileOffset); - DBG_UNREFERENCED_PARAMETER(Length); - DBG_UNREFERENCED_PARAMETER(Wait); - DBG_UNREFERENCED_PARAMETER(LockKey); - DBG_UNREFERENCED_PARAMETER(Buffer); - DBG_UNREFERENCED_PARAMETER(IoStatus); - DBG_UNREFERENCED_PARAMETER(DeviceObject); - return FALSE; -} Modified: trunk/reactos/drivers/filesystems/cdfs/cdfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/cdfs.h [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -238,17 +238,46 @@ #define CDFS_SEARCH_PATTERN_TAG 'eedC' #define CDFS_FILENAME_TAG 'nFdC' -typedef struct +typedef struct _CDFS_GLOBAL_DATA { PDRIVER_OBJECT DriverObject; PDEVICE_OBJECT DeviceObject; ULONG Flags; CACHE_MANAGER_CALLBACKS CacheMgrCallbacks; FAST_IO_DISPATCH FastIoDispatch; + NPAGED_LOOKASIDE_LIST IrpContextLookasideList; } CDFS_GLOBAL_DATA, *PCDFS_GLOBAL_DATA; +#define IRPCONTEXT_CANWAIT 0x1 +#define IRPCONTEXT_COMPLETE 0x2 +#define IRPCONTEXT_QUEUE 0x4 + +typedef struct _CDFS_IRP_CONTEXT +{ +// NTFSIDENTIFIER Identifier; + ULONG Flags; + PIO_STACK_LOCATION Stack; + UCHAR MajorFunction; + UCHAR MinorFunction; + WORK_QUEUE_ITEM WorkQueueItem; + PIRP Irp; + BOOLEAN IsTopLevel; + PDEVICE_OBJECT DeviceObject; + PFILE_OBJECT FileObject; + NTSTATUS SavedExceptionCode; + CCHAR PriorityBoost; +} CDFS_IRP_CONTEXT, *PCDFS_IRP_CONTEXT; + + extern PCDFS_GLOBAL_DATA CdfsGlobalData; +/* cdfs.c */ + +NTSTATUS +NTAPI +DriverEntry( + PDRIVER_OBJECT DriverObject, + PUNICODE_STRING RegistryPath); /* cleanup.c */ @@ -303,11 +332,9 @@ /* devctrl.c */ -DRIVER_DISPATCH CdfsDeviceControl; - NTSTATUS NTAPI -CdfsDeviceControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +CdfsDeviceControl( + PCDFS_IRP_CONTEXT IrpContext); /* dirctl.c */ @@ -318,6 +345,29 @@ CdfsDirectoryControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); +/* dispatch.c */ + +DRIVER_DISPATCH CdfsFsdDispatch; +NTSTATUS +NTAPI +CdfsFsdDispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); + +/* fastio.c */ + +BOOLEAN +NTAPI +CdfsAcquireForLazyWrite(IN PVOID Context, + IN BOOLEAN Wait); + +VOID +NTAPI +CdfsReleaseFromLazyWrite(IN PVOID Context); + +FAST_IO_CHECK_IF_POSSIBLE CdfsFastIoCheckIfPossible; +FAST_IO_READ CdfsFastIoRead; +FAST_IO_WRITE CdfsFastIoWrite; /* fcb.c */ @@ -389,31 +439,38 @@ /* finfo.c */ -DRIVER_DISPATCH CdfsQueryInformation; - -NTSTATUS -NTAPI -CdfsQueryInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -DRIVER_DISPATCH CdfsSetInformation; - -NTSTATUS -NTAPI -CdfsSetInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +NTSTATUS +NTAPI +CdfsQueryInformation( + PCDFS_IRP_CONTEXT IrpContext); + +NTSTATUS +NTAPI +CdfsSetInformation( + PCDFS_IRP_CONTEXT IrpContext); /* fsctl.c */ -DRIVER_DISPATCH CdfsFileSystemControl; +//DRIVER_DISPATCH CdfsFileSystemControl; NTSTATUS NTAPI -CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp); +CdfsFileSystemControl( + PCDFS_IRP_CONTEXT IrpContext); +// PDEVICE_OBJECT DeviceObject, +// PIRP Irp); /* misc.c */ + +BOOLEAN +CdfsIsIrpTopLevel( + PIRP Irp); + +PCDFS_IRP_CONTEXT +CdfsAllocateIrpContext( + PDEVICE_OBJECT DeviceObject, + PIRP Irp); VOID CdfsSwapString(PWCHAR Out, @@ -454,35 +511,14 @@ /* volinfo.c */ -DRIVER_DISPATCH CdfsQueryVolumeInformation; - -NTSTATUS -NTAPI -CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -DRIVER_DISPATCH CdfsSetVolumeInformation; - -NTSTATUS -NTAPI -CdfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp); - -/* cdfs.c */ - -NTSTATUS NTAPI -DriverEntry(PDRIVER_OBJECT DriverObject, - PUNICODE_STRING RegistryPath); - -BOOLEAN NTAPI -CdfsAcquireForLazyWrite(IN PVOID Context, - IN BOOLEAN Wait); - -VOID NTAPI -CdfsReleaseFromLazyWrite(IN PVOID Context); - -FAST_IO_CHECK_IF_POSSIBLE CdfsFastIoCheckIfPossible; -FAST_IO_READ CdfsFastIoRead; -FAST_IO_WRITE CdfsFastIoWrite; +NTSTATUS +NTAPI +CdfsQueryVolumeInformation( + PCDFS_IRP_CONTEXT IrpContext); + +NTSTATUS +NTAPI +CdfsSetVolumeInformation( + PCDFS_IRP_CONTEXT IrpContext); #endif /* CDFS_H */ Modified: trunk/reactos/drivers/filesystems/cdfs/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/devctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/devctrl.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -17,16 +17,19 @@ /* FUNCTIONS ****************************************************************/ NTSTATUS NTAPI -CdfsDeviceControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) +CdfsDeviceControl( + PCDFS_IRP_CONTEXT IrpContext) { + PIRP Irp; NTSTATUS Status; PVCB Vcb = NULL; PFILE_OBJECT FileObject; - PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp); + PIO_STACK_LOCATION Stack; - UNREFERENCED_PARAMETER(DeviceObject); + ASSERT(IrpContext); + Irp = IrpContext->Irp; + Stack = IrpContext->Stack; FileObject = Stack->FileObject; Irp->IoStatus.Information = 0; @@ -35,7 +38,6 @@ { DPRINT1("FIXME: CdfsDeviceControl called without FileObject!\n"); Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; - IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_DEVICE_REQUEST; } @@ -43,7 +45,6 @@ if (!(FileObject->RelatedFileObject == NULL || FileObject->RelatedFileObject->FsContext2 != NULL)) { Irp->IoStatus.Status = STATUS_INVALID_PARAMETER; - IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_PARAMETER; } @@ -52,7 +53,6 @@ /* We should handle this one, but we don't! */ Status = STATUS_NOT_IMPLEMENTED; Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); } else { Added: trunk/reactos/drivers/filesystems/cdfs/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/d… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/dispatch.c (added) +++ trunk/reactos/drivers/filesystems/cdfs/dispatch.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -0,0 +1,186 @@ +/* + * ReactOS kernel + * Copyright (C) 2008 ReactOS Team + * + * 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystem/cdfs/dispatch.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Pierre Schweitzer + */ + +/* INCLUDES *****************************************************************/ + +#include "cdfs.h" + +#define NDEBUG +#include <debug.h> + +static LONG QueueCount = 0; + +/* FUNCTIONS ****************************************************************/ + +static WORKER_THREAD_ROUTINE CdfsDoRequest; + +static +NTSTATUS +CdfsQueueRequest(PCDFS_IRP_CONTEXT IrpContext) +{ + InterlockedIncrement(&QueueCount); + DPRINT("CdfsQueueRequest(IrpContext %p), %d\n", IrpContext, QueueCount); + + ASSERT(!(IrpContext->Flags & IRPCONTEXT_QUEUE) && + (IrpContext->Flags & IRPCONTEXT_COMPLETE)); + IrpContext->Flags |= IRPCONTEXT_CANWAIT; + IoMarkIrpPending(IrpContext->Irp); + ExInitializeWorkItem(&IrpContext->WorkQueueItem, CdfsDoRequest, IrpContext); + ExQueueWorkItem(&IrpContext->WorkQueueItem, CriticalWorkQueue); + + return STATUS_PENDING; +} + +static +NTSTATUS +CdfsDispatch(PCDFS_IRP_CONTEXT IrpContext) +{ + PIRP Irp = IrpContext->Irp; + NTSTATUS Status = STATUS_UNSUCCESSFUL; + + DPRINT("CdfsDispatch()\n"); + + FsRtlEnterFileSystem(); + + CdfsIsIrpTopLevel(Irp); + + switch (IrpContext->MajorFunction) + { + case IRP_MJ_QUERY_VOLUME_INFORMATION: + Status = CdfsQueryVolumeInformation(IrpContext); + break; + + case IRP_MJ_SET_VOLUME_INFORMATION: + Status = CdfsSetVolumeInformation(IrpContext); + break; + + case IRP_MJ_QUERY_INFORMATION: + Status = CdfsQueryInformation(IrpContext); + break; + + case IRP_MJ_SET_INFORMATION: + Status = CdfsSetInformation(IrpContext); + break; + + case IRP_MJ_DIRECTORY_CONTROL: +// Status = CdfsDirectoryControl(IrpContext); + break; + + case IRP_MJ_READ: +// Status = CdfsRead(IrpContext); + break; + + case IRP_MJ_DEVICE_CONTROL: + Status = CdfsDeviceControl(IrpContext); + break; + + case IRP_MJ_WRITE: +// Status = CdfsWrite(IrpContext); + break; + + case IRP_MJ_CLOSE: +// Status = CdfsClose(IrpContext); + break; + + case IRP_MJ_CREATE: +// Status = CdfsCreate(IrpContext); + break; + + case IRP_MJ_FILE_SYSTEM_CONTROL: + Status = CdfsFileSystemControl(IrpContext); + break; + } + + ASSERT((!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || + ((IrpContext->Flags & IRPCONTEXT_COMPLETE) && !(IrpContext->Flags & IRPCONTEXT_QUEUE)) || + (!(IrpContext->Flags & IRPCONTEXT_COMPLETE) && (IrpContext->Flags & IRPCONTEXT_QUEUE))); + + if (IrpContext->Flags & IRPCONTEXT_COMPLETE) + { + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IrpContext->PriorityBoost); + } + + if (IrpContext->Flags & IRPCONTEXT_QUEUE) + { + /* Reset our status flags before queueing the IRP */ + IrpContext->Flags |= IRPCONTEXT_COMPLETE; + IrpContext->Flags &= ~IRPCONTEXT_QUEUE; + Status = CdfsQueueRequest(IrpContext); + } + else + { + ExFreeToNPagedLookasideList(&CdfsGlobalData->IrpContextLookasideList, IrpContext); + } + + IoSetTopLevelIrp(NULL); + FsRtlExitFileSystem(); + + return Status; +} + +static +VOID +NTAPI +CdfsDoRequest(PVOID IrpContext) +{ + InterlockedDecrement(&QueueCount); + DPRINT("CdfsDoRequest(IrpContext %p), MajorFunction %x, %d\n", + IrpContext, ((PCDFS_IRP_CONTEXT)IrpContext)->MajorFunction, QueueCount); + CdfsDispatch((PCDFS_IRP_CONTEXT)IrpContext); +} + +/* + * FUNCTION: This function manages IRP for various major functions + * ARGUMENTS: + * DriverObject = object describing this driver + * Irp = IRP to be passed to internal functions + * RETURNS: Status of I/O Request + */ +NTSTATUS +NTAPI +CdfsFsdDispatch( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCDFS_IRP_CONTEXT IrpContext = NULL; + NTSTATUS Status; + + DPRINT("CdfsFsdDispatch()\n"); + + IrpContext = CdfsAllocateIrpContext(DeviceObject, Irp); + if (IrpContext == NULL) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + else + { + Status = CdfsDispatch(IrpContext); + } + + return Status; +} Propchange: trunk/reactos/drivers/filesystems/cdfs/dispatch.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/filesystems/cdfs/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fastio.c (added) +++ trunk/reactos/drivers/filesystems/cdfs/fastio.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -0,0 +1,116 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS kernel + * FILE: drivers/filesystems/cdfs/fastio.c + * PURPOSE: CDROM (ISO 9660) filesystem driver + * PROGRAMMER: Pierre Schweitzer + */ + +/* INCLUDES *****************************************************************/ + +#include "cdfs.h" + +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +CdfsAcquireForLazyWrite( + _In_ PVOID Context, + _In_ BOOLEAN Wait) +{ + PFCB Fcb = (PFCB)Context; + ASSERT(Fcb); + DPRINT("CdfsAcquireForLazyWrite(): Fcb %p\n", Fcb); + + if (!ExAcquireResourceExclusiveLite(&(Fcb->MainResource), Wait)) + { + DPRINT("CdfsAcquireForLazyWrite(): ExReleaseResourceLite failed.\n"); + return FALSE; + } + return TRUE; +} + +VOID +NTAPI +CdfsReleaseFromLazyWrite( + _In_ PVOID Context) +{ + PFCB Fcb = (PFCB)Context; + ASSERT(Fcb); + DPRINT("CdfsReleaseFromLazyWrite(): Fcb %p\n", Fcb); + + ExReleaseResourceLite(&(Fcb->MainResource)); +} + +BOOLEAN +NTAPI +CdfsFastIoCheckIfPossible( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ BOOLEAN CheckForReadOperation, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + /* Deny FastIo */ + UNREFERENCED_PARAMETER(FileObject); + UNREFERENCED_PARAMETER(FileOffset); + UNREFERENCED_PARAMETER(Length); + UNREFERENCED_PARAMETER(Wait); + UNREFERENCED_PARAMETER(LockKey); + UNREFERENCED_PARAMETER(CheckForReadOperation); + UNREFERENCED_PARAMETER(IoStatus); + UNREFERENCED_PARAMETER(DeviceObject); + return FALSE; +} + +BOOLEAN +NTAPI +CdfsFastIoRead( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _Out_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + DBG_UNREFERENCED_PARAMETER(FileObject); + DBG_UNREFERENCED_PARAMETER(FileOffset); + DBG_UNREFERENCED_PARAMETER(Length); + DBG_UNREFERENCED_PARAMETER(Wait); + DBG_UNREFERENCED_PARAMETER(LockKey); + DBG_UNREFERENCED_PARAMETER(Buffer); + DBG_UNREFERENCED_PARAMETER(IoStatus); + DBG_UNREFERENCED_PARAMETER(DeviceObject); + return FALSE; +} + +BOOLEAN +NTAPI +CdfsFastIoWrite( + _In_ PFILE_OBJECT FileObject, + _In_ PLARGE_INTEGER FileOffset, + _In_ ULONG Length, + _In_ BOOLEAN Wait, + _In_ ULONG LockKey, + _In_ PVOID Buffer, + _Out_ PIO_STATUS_BLOCK IoStatus, + _In_ PDEVICE_OBJECT DeviceObject) +{ + DBG_UNREFERENCED_PARAMETER(FileObject); + DBG_UNREFERENCED_PARAMETER(FileOffset); + DBG_UNREFERENCED_PARAMETER(Length); + DBG_UNREFERENCED_PARAMETER(Wait); + DBG_UNREFERENCED_PARAMETER(LockKey); + DBG_UNREFERENCED_PARAMETER(Buffer); + DBG_UNREFERENCED_PARAMETER(IoStatus); + DBG_UNREFERENCED_PARAMETER(DeviceObject); + return FALSE; +} Propchange: trunk/reactos/drivers/filesystems/cdfs/fastio.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/filesystems/cdfs/finfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/finfo.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -334,9 +334,11 @@ * FUNCTION: Retrieve the specified file information */ NTSTATUS NTAPI -CdfsQueryInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ +CdfsQueryInformation( + PCDFS_IRP_CONTEXT IrpContext) +{ + PIRP Irp; + PDEVICE_OBJECT DeviceObject; FILE_INFORMATION_CLASS FileInformationClass; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; @@ -348,7 +350,9 @@ DPRINT("CdfsQueryInformation() called\n"); - Stack = IoGetCurrentIrpStackLocation(Irp); + Irp = IrpContext->Irp; + DeviceObject = IrpContext->DeviceObject; + Stack = IrpContext->Stack; FileInformationClass = Stack->Parameters.QueryFile.FileInformationClass; FileObject = Stack->FileObject; Fcb = FileObject->FsContext; @@ -423,8 +427,6 @@ else Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); } @@ -452,9 +454,10 @@ * FUNCTION: Set the specified file information */ NTSTATUS NTAPI -CdfsSetInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ +CdfsSetInformation( + PCDFS_IRP_CONTEXT IrpContext) +{ + PIRP Irp; FILE_INFORMATION_CLASS FileInformationClass; PIO_STACK_LOCATION Stack; PFILE_OBJECT FileObject; @@ -462,11 +465,10 @@ NTSTATUS Status = STATUS_SUCCESS; - UNREFERENCED_PARAMETER(DeviceObject); - DPRINT("CdfsSetInformation() called\n"); - Stack = IoGetCurrentIrpStackLocation(Irp); + Irp = IrpContext->Irp; + Stack = IrpContext->Stack; FileInformationClass = Stack->Parameters.SetFile.FileInformationClass; FileObject = Stack->FileObject; @@ -492,8 +494,6 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; } Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -550,17 +550,25 @@ NTSTATUS NTAPI -CdfsFileSystemControl(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ +CdfsFileSystemControl( + PCDFS_IRP_CONTEXT IrpContext) +{ + PIRP Irp; + PDEVICE_OBJECT DeviceObject; PIO_STACK_LOCATION Stack; NTSTATUS Status; DPRINT("CdfsFileSystemControl() called\n"); - Stack = IoGetCurrentIrpStackLocation(Irp); - - switch (Stack->MinorFunction) + ASSERT(IrpContext); + + DeviceObject = IrpContext->DeviceObject; + Irp = IrpContext->Irp; + Stack = IrpContext->Stack; + + Irp->IoStatus.Information = 0; + + switch (IrpContext->MinorFunction) { case IRP_MN_KERNEL_CALL: case IRP_MN_USER_FS_REQUEST: @@ -594,11 +602,6 @@ break; } - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return(Status); } Modified: trunk/reactos/drivers/filesystems/cdfs/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/m… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/misc.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -34,6 +34,78 @@ /* FUNCTIONS ****************************************************************/ +/* + * FUNCTION: Used with IRP to set them to TopLevelIrp field + * ARGUMENTS: + * Irp = The IRP to set + * RETURNS: TRUE if top level was null, else FALSE + */ +BOOLEAN +CdfsIsIrpTopLevel( + PIRP Irp) +{ + BOOLEAN ReturnCode = FALSE; + + DPRINT("CdfsIsIrpTopLevel()\n"); + + if (IoGetTopLevelIrp() == NULL) + { + IoSetTopLevelIrp(Irp); + ReturnCode = TRUE; + } + + return ReturnCode; +} + + +/* + * FUNCTION: Allocate and fill a CDFS_IRP_CONTEXT struct in order to use it for IRP + * ARGUMENTS: + * DeviceObject = Used to fill in struct + * Irp = The IRP that need IRP_CONTEXT struct + * RETURNS: NULL or PCDFS_IRP_CONTEXT + */ +PCDFS_IRP_CONTEXT +CdfsAllocateIrpContext( + PDEVICE_OBJECT DeviceObject, + PIRP Irp) +{ + PCDFS_IRP_CONTEXT IrpContext; + + DPRINT("CdfsAllocateIrpContext()\n"); + + IrpContext = (PCDFS_IRP_CONTEXT)ExAllocateFromNPagedLookasideList(&CdfsGlobalData->IrpContextLookasideList); + if (IrpContext == NULL) + return NULL; + + RtlZeroMemory(IrpContext, sizeof(CDFS_IRP_CONTEXT)); + +// IrpContext->Identifier.Type = NTFS_TYPE_IRP_CONTEST; +// IrpContext->Identifier.Size = sizeof(NTFS_IRP_CONTEXT); + IrpContext->Irp = Irp; + IrpContext->DeviceObject = DeviceObject; + IrpContext->Stack = IoGetCurrentIrpStackLocation(Irp); + IrpContext->MajorFunction = IrpContext->Stack->MajorFunction; + IrpContext->MinorFunction = IrpContext->Stack->MinorFunction; + IrpContext->FileObject = IrpContext->Stack->FileObject; + IrpContext->IsTopLevel = (IoGetTopLevelIrp() == Irp); + IrpContext->PriorityBoost = IO_NO_INCREMENT; + IrpContext->Flags = IRPCONTEXT_COMPLETE; + + if (IrpContext->MajorFunction == IRP_MJ_FILE_SYSTEM_CONTROL || + IrpContext->MajorFunction == IRP_MJ_DEVICE_CONTROL || + IrpContext->MajorFunction == IRP_MJ_SHUTDOWN || + (IrpContext->MajorFunction != IRP_MJ_CLEANUP && + IrpContext->MajorFunction != IRP_MJ_CLOSE && + IoIsOperationSynchronous(Irp))) + { + IrpContext->Flags |= IRPCONTEXT_CANWAIT; + } + + return IrpContext; +} + + VOID CdfsSwapString(PWCHAR Out, PUCHAR In, Modified: trunk/reactos/drivers/filesystems/cdfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/volinfo.c [iso-8859-1] Mon Jun 1 13:13:18 2015 @@ -168,9 +168,11 @@ NTSTATUS NTAPI -CdfsQueryVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ +CdfsQueryVolumeInformation( + PCDFS_IRP_CONTEXT IrpContext) +{ + PIRP Irp; + PDEVICE_OBJECT DeviceObject; FS_INFORMATION_CLASS FsInformationClass; PIO_STACK_LOCATION Stack; NTSTATUS Status = STATUS_SUCCESS; @@ -179,7 +181,11 @@ DPRINT("CdfsQueryVolumeInformation() called\n"); - Stack = IoGetCurrentIrpStackLocation(Irp); + ASSERT(IrpContext); + + Irp = IrpContext->Irp; + DeviceObject = IrpContext->DeviceObject; + Stack = IrpContext->Stack; FsInformationClass = Stack->Parameters.QueryVolume.FsInformationClass; BufferLength = Stack->Parameters.QueryVolume.Length; SystemBuffer = Irp->AssociatedIrp.SystemBuffer; @@ -223,23 +229,24 @@ Stack->Parameters.QueryVolume.Length - BufferLength; else Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); return(Status); } NTSTATUS NTAPI -CdfsSetVolumeInformation(PDEVICE_OBJECT DeviceObject, - PIRP Irp) -{ +CdfsSetVolumeInformation( + PCDFS_IRP_CONTEXT IrpContext) +{ + PIRP Irp; + DPRINT("CdfsSetVolumeInformation() called\n"); - UNREFERENCED_PARAMETER(DeviceObject); - + ASSERT(IrpContext); + + Irp = IrpContext->Irp; Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); return(STATUS_NOT_SUPPORTED); }

1 0

[akhaldi] 67987: [KERNEL32] Apply Wine commit 81dc0fe by Daniel Jelinski: Implement CAL_ICALINTVALUE in GetCalendarInfo. CORE-9246
by akhaldi＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: akhaldi Date: Mon Jun 1 10:00:31 2015 New Revision: 67987 URL: http://svn.reactos.org/svn/reactos?rev=67987&view=rev Log: [KERNEL32] Apply Wine commit 81dc0fe by Daniel Jelinski: Implement CAL_ICALINTVALUE in GetCalendarInfo. CORE-9246 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lcformat.c [iso-8859-1] Mon Jun 1 10:00:31 2015 @@ -2138,8 +2138,10 @@ * for the CALTYPES not requiring GetLocaleInfoA */ switch (CalType & ~(CAL_NOUSEROVERRIDE|CAL_RETURN_NUMBER|CAL_USE_CP_ACP)) { case CAL_ICALINTVALUE: - FIXME("Unimplemented caltype %d\n", CalType & 0xffff); - return 0; + if (CalType & CAL_RETURN_NUMBER) + return GetLocaleInfoW(Locale, LOCALE_RETURN_NUMBER | LOCALE_ICALENDARTYPE, + (LPWSTR)lpValue, 2); + return GetLocaleInfoW(Locale, LOCALE_ICALENDARTYPE, lpCalData, cchData); case CAL_SCALNAME: FIXME("Unimplemented caltype %d\n", CalType & 0xffff); return 0;

1 0

[akhaldi] 67986: [KERNEL32] Sync CompareStringW() with Wine Staging 1.7.37. CORE-9246
by akhaldi＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: akhaldi Date: Mon Jun 1 09:56:53 2015 New Revision: 67986 URL: http://svn.reactos.org/svn/reactos?rev=67986&view=rev Log: [KERNEL32] Sync CompareStringW() with Wine Staging 1.7.37. CORE-9246 Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c Modified: trunk/reactos/dll/win32/kernel32/winnls/string/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/winnls/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/winnls/string/lang.c [iso-8859-1] Mon Jun 1 09:56:53 2015 @@ -1759,10 +1759,16 @@ * * See CompareStringA. */ -INT WINAPI CompareStringW(LCID lcid, DWORD style, +INT WINAPI CompareStringW(LCID lcid, DWORD flags, LPCWSTR str1, INT len1, LPCWSTR str2, INT len2) { + static const DWORD supported_flags = NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS|SORT_STRINGSORT + |NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP + |NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; + static DWORD semistub_flags = NORM_LINGUISTIC_CASING|LINGUISTIC_IGNORECASE|0x10000000; + /* 0x10000000 is related to diacritics in Arabic, Japanese, and Hebrew */ INT ret; + if (!str1 || !str2) { @@ -1770,21 +1776,22 @@ return 0; } - if( style & ~(NORM_IGNORECASE|NORM_IGNORENONSPACE|NORM_IGNORESYMBOLS| - SORT_STRINGSORT|NORM_IGNOREKANATYPE|NORM_IGNOREWIDTH|LOCALE_USE_CP_ACP|0x10000000) ) + if (flags & ~supported_flags) { SetLastError(ERROR_INVALID_FLAGS); return 0; } - /* this style is related to diacritics in Arabic, Japanese, and Hebrew */ - if (style & 0x10000000) - WARN("Ignoring unknown style 0x10000000\n"); + if (flags & semistub_flags) + { + FIXME("semi-stub behavior for flag(s) 0x%x\n", flags & semistub_flags); + semistub_flags &= ~flags; + } if (len1 < 0) len1 = strlenW(str1); if (len2 < 0) len2 = strlenW(str2); - ret = wine_compare_string(style, str1, len1, str2, len2); + ret = wine_compare_string(flags, str1, len1, str2, len2); if (ret) /* need to translate result */ return (ret < 0) ? CSTR_LESS_THAN : CSTR_GREATER_THAN; @@ -1798,7 +1805,7 @@ * * PARAMS * lcid [I] LCID for the comparison - * style [I] Flags for the comparison (NORM_ constants from "winnls.h"). + * flags [I] Flags for the comparison (NORM_ constants from "winnls.h"). * str1 [I] First string to compare * len1 [I] Length of str1, or -1 if str1 is NUL terminated * str2 [I] Second string to compare

1 0

[akhaldi] 67985: [DEVMGMT_NEW] Revert r67976 as requested by Ged.
by akhaldi＠svn.reactos.org 01 Jun '15

01 Jun '15

Author: akhaldi Date: Mon Jun 1 09:25:46 2015 New Revision: 67985 URL: http://svn.reactos.org/svn/reactos?rev=67985&view=rev Log: [DEVMGMT_NEW] Revert r67976 as requested by Ged. Added: trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/Resource.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/stdafx.h trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h - copied unchanged from r67975, trunk/reactos/base/applications/mscutils/devmgmt_new/targetver.h Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -1,5 +1,4 @@ add_subdirectory(devmgmt) -add_subdirectory(devmgmt_new) add_subdirectory(eventvwr) add_subdirectory(servman) Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt (removed) @@ -1,19 +0,0 @@ -project(DEVMGMT_NEW) - -set_cpp(WITH_RUNTIME) - -include_directories(${REACTOS_SOURCE_DIR}/lib/atl) - -list(APPEND SOURCE - Devices.cpp - DeviceView.cpp - devmgmt.cpp - MainWindow.cpp - precomp.h) - -add_executable(devmgmt_new ${SOURCE} devmgmt.rc) -target_link_libraries(devmgmt_new uuid atlnew wine) -set_module_type(devmgmt_new win32gui UNICODE) -add_importlibs(devmgmt_new setupapi gdi32 user32 comctl32 advapi32 ole32 devmgr msvcrt uxtheme kernel32) -add_pch(devmgmt_new precomp.h SOURCE) -add_cd_file(TARGET devmgmt_new DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,7 +8,8 @@ */ -#include "precomp.h" +#include "stdafx.h" +#include "devmgmt.h" #include "DeviceView.h" @@ -18,7 +19,6 @@ #define CLASS_NAME_LEN 256 #define CLASS_DESC_LEN 256 -extern "C" INT_PTR WINAPI DevicePropertiesExW( @@ -191,7 +191,12 @@ HANDLE hThread; /* Run on a new thread to keep the gui responsive */ - hThread = CreateThread(NULL, 0, ListDevicesThread, this, 0, NULL); + hThread = (HANDLE)_beginthreadex(NULL, + 0, + &ListDevicesThread, + this, + 0, + NULL); if (hThread) CloseHandle(hThread); } @@ -243,7 +248,7 @@ /* PRIVATE METHODS ********************************************/ -DWORD CALLBACK CDeviceView::ListDevicesThread(PVOID Param) +unsigned int __stdcall CDeviceView::ListDevicesThread(void *Param) { CDeviceView *This = (CDeviceView *)Param; @@ -372,7 +377,7 @@ ClassDescription, NULL, ClassImage, - OverlayImage); + 0); /* Don't add it again */ AddedParent = TRUE; @@ -471,6 +476,8 @@ WCHAR DeviceName[DEVICE_NAME_LEN]; LPTSTR DeviceId = NULL; INT ClassImage; + BOOL IsUnknown = FALSE; + BOOL IsHidden = FALSE; ULONG DeviceStatus = 0; ULONG ProblemNumber = 0; UINT OverlayImage = 0; @@ -510,7 +517,7 @@ DeviceName, (LPARAM)DeviceId, ClassImage, - OverlayImage); + 0); if (hDevItem) @@ -563,7 +570,7 @@ DeviceName, (LPARAM)DeviceId, ClassImage, - OverlayImage); + 0); if (hDevItem) { /* Check if this child has any children itself */ Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/DeviceView.h [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -81,7 +81,9 @@ } private: - static DWORD CALLBACK ListDevicesThread(PVOID Param); + static unsigned int __stdcall ListDevicesThread( + void *Param + ); BOOL ListDevicesByConnection( ); Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/Devices.cpp [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -7,7 +7,8 @@ * */ -#include "precomp.h" +#include "stdafx.h" +#include "devmgmt.h" #include "Devices.h" @@ -66,7 +67,7 @@ _Out_ PINT RootImageIndex ) { - StringCbCopy(RootName, RootNameSize, m_RootName); + wcscpy_s(RootName, RootNameSize, m_RootName); *RootImageIndex = m_RootImageIndex; return TRUE; @@ -324,7 +325,7 @@ if (Success != ERROR_SUCCESS) { /* Use the class name as the description */ - StringCbCopy(ClassDesc, ClassDescSize, ClassName); + wcscpy_s(ClassDesc, ClassDescSize, ClassName); } /* Get the image index for this class */ @@ -484,7 +485,7 @@ if (bSuccess == FALSE && bUnknown == TRUE) { /* We add in our own text */ - StringCbCopy(DeviceName, 256, L"Unknown device"); + wcscpy_s(DeviceName, 256, L"Unknown device"); bSuccess = TRUE; } @@ -569,7 +570,7 @@ if (ptr) { /* This must be an inf based descriptor, the desc is after the semi colon */ - StringCbCopy(ResourceDescriptor, ResourceDescriptorSize, ++ptr); + wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ++ptr); dwError = ERROR_SUCCESS; } else @@ -603,7 +604,7 @@ /* Load the string from the dll */ if (LoadStringW(hModule, ResourceId, ResString, 256)) { - StringCbCopy(ResourceDescriptor, ResourceDescriptorSize, ResString); + wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ResString); dwError = ERROR_SUCCESS; } else Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.cpp [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -7,7 +7,8 @@ * */ -#include "precomp.h" +#include "stdafx.h" +#include "devmgmt.h" #include "MainWindow.h" @@ -47,10 +48,10 @@ /* PUBLIC METHODS **********************************************/ CMainWindow::CMainWindow(void) : + m_ToolbarhImageList(NULL), m_hMainWnd(NULL), m_hStatusBar(NULL), m_hToolBar(NULL), - m_ToolbarhImageList(NULL), m_CmdShow(0) { m_szMainWndClass = L"DevMgmtWndClass"; @@ -66,6 +67,7 @@ CMainWindow::Initialize(LPCTSTR lpCaption, int nCmdShow) { + CAtlString szCaption; WNDCLASSEXW wc = {0}; /* Store the show window value */ @@ -169,6 +171,7 @@ CMainWindow::UpdateDevicesDisplay(ListDevices List) { UINT CheckId; + BOOL bSuccess; /* Set the new type*/ m_DeviceView->SetDeviceListType(List); @@ -184,7 +187,7 @@ } /* Set the new check item */ - CheckMenuRadioItem(m_hMenu, + bSuccess = CheckMenuRadioItem(m_hMenu, IDC_DEVBYTYPE, IDC_RESBYCONN, CheckId, @@ -327,17 +330,17 @@ IN HINSTANCE hInstance, IN UINT uID) { - WCHAR szMessage[4096]; + CAtlString szMessage; BOOL bRet = FALSE; /* Load the string */ - if (LoadStringW(hInstance, uID, szMessage, _countof(szMessage))) + if (szMessage.LoadStringW(hInstance, uID)) { /* Send the message to the status bar */ bRet = (BOOL)SendMessageW(hStatusBar, SB_SETTEXT, (WPARAM)PartId, - (LPARAM)szMessage); + (LPARAM)szMessage.GetBuffer()); } return bRet; Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/MainWindow.h [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -9,7 +9,7 @@ class CMainWindow { - PCWSTR m_szMainWndClass; + CAtlString m_szMainWndClass; CDeviceView *m_DeviceView; HWND m_hMainWnd; HWND m_hStatusBar; Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -1,4 +1,5 @@ -#include "precomp.h" +#include "stdafx.h" +#include "devmgmt.h" #include "MainWindow.h" HINSTANCE g_hInstance = NULL; @@ -13,7 +14,7 @@ CMainWindow MainWindow; INITCOMMONCONTROLSEX icex; HANDLE hMutex; - WCHAR szAppName[256]; + CAtlString szAppName; int Ret = 1; @@ -36,7 +37,7 @@ InitCommonControlsEx(&icex); /* Load the application name */ - if (LoadStringW(g_hInstance, IDS_APPNAME, szAppName, _countof(szAppName))) + if (szAppName.LoadStringW(g_hInstance, IDS_APPNAME)) { /* Initialize the main window */ if (MainWindow.Initialize(szAppName, nCmdShow)) Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available. Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,7 +8,6 @@ END POPUP "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "ÐÑÐ¿ÐµÑÐ°ÑÐ²Ð°Ð½Ðµ", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_PROP, GRAYED @@ -39,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -55,6 +54,7 @@ IDS_TOOLTIP_PROP "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" IDS_TOOLTIP_REFRESH "ÐÐ¿ÑÐµÑÐ½ÑÐ²Ð°Ð½Ðµ" IDS_TOOLTIP_HELP "ÐÐ¾Ð¼Ð¾Ñ" + IDS_TOOLTIP_EXIT "ÐÐ·ÑÐ¾Ð´" END /* Hints */ @@ -68,11 +68,6 @@ IDS_HINT_HELP " ÐÐ¾ÐºÐ°Ð·Ð²Ð° Ð¿Ð¾Ð¼Ð¾ÑÐµÐ½ Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ." IDS_HINT_ABOUT " ÐÐ° ÑÐ¿ÑÐ°Ð²Ð¸ÑÐµÐ»Ñ Ð½Ð° ÑÑÑÑÐ¹ÑÑÐ²Ð°ÑÐ° Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " ÐÑÐ·ÑÑÐ°Ð½Ð¾Ð²ÑÐ²Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ° Ð´Ð¾ Ð¾Ð±Ð¸ÑÐ°Ð¹Ð½Ð¸Ñ Ð¼Ñ ÑÐ°Ð¼ÐµÑ." IDS_HINT_SYS_MOVE " ÐÑÐµÐ¼ÐµÑÑÐ²Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." IDS_HINT_SYS_SIZE " ÐÑÐµÐ¾ÑÐ°Ð·Ð¼ÐµÑÑÐ²Ð° Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑÐ°." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "Aktion" BEGIN - MENUITEM "Nach HardwareÃ¤nderungen suchen", IDC_REFRESH - MENUITEM "Drucken", IDC_PRINT, GRAYED + MENUITEM "Drucken", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Eigenschaften", IDC_PROP, GRAYED END POPUP "Ansicht" BEGIN - MENUITEM "GerÃ¤te nach Typ", IDC_DEVBYTYPE - MENUITEM "GerÃ¤te nach Verbindung", IDC_DEVBYCONN - MENUITEM "Ressourcen nach Typ", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressourcen nach Verbindung", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Ausgeblendete GerÃ¤te anzeigen", IDC_SHOWHIDDEN + MENUITEM "GerÃ¤te nach Typ", IDC_DEVBYTYPE, CHECKED + MENUITEM "GerÃ¤te nach Verbindung", IDC_STATIC, GRAYED + MENUITEM "Resourcen nach Typ", IDC_STATIC, GRAYED + MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED END POPUP "&?" BEGIN @@ -41,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "GerÃ¤te-Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "GerÃ¤te-Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "SchlieÃen", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "Eigenschaften" IDS_TOOLTIP_REFRESH "Aktualisieren" IDS_TOOLTIP_HELP "Hilfe" + IDS_TOOLTIP_EXIT "Beenden" END /* Hints */ @@ -70,11 +68,6 @@ IDS_HINT_HELP " Hilfe-Fenster anzeigen." IDS_HINT_ABOUT " Ãber ReactOS GerÃ¤te-Manager." - IDS_HINT_DEV_BY_TYPE "GerÃ¤te nach Typ anzeigen" - IDS_HINT_DEV_BY_CONN "GerÃ¤te nach Verbindung anzeigen" - IDS_HINT_RES_BY_TYPE "Resourcen nach Typ anzeigen" - IDS_HINT_RES_BY_CONN "Resourcen nach Verbindung anzeigen" - IDS_HINT_SYS_RESTORE " Dieses Fenster auf normale GrÃ¶Ãe wiederherstellen." IDS_HINT_SYS_MOVE " Dieses Fenster verschieben." IDS_HINT_SYS_SIZE " GrÃ¶Ãe dieses Fensters Ã¤ndern." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/el-GR.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "ÎÎ½ÎÏÎ³ÎµÎ¹Î±" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "ÎÎºÏÏÏÏÏÎ·", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ", IDC_PROP, GRAYED END POPUP "ÎÎ¼ÏÎ¬Î½Î¹ÏÎ·" BEGIN - MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_DEVBYTYPE - MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_DEVBYCONN - MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_RESBYTYPE, GRAYED - MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_DEVBYTYPE, CHECKED + MENUITEM "Î£ÏÏÎºÎµÏÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_STATIC, GRAYED + MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÏÎ¿", IDC_STATIC, GRAYED + MENUITEM "Î Î·Î³ÎÏ Î±Î½Î¬ ÏÏÎ½Î´ÎµÏÎ·", IDC_STATIC, GRAYED END POPUP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" BEGIN @@ -41,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ" IDS_TOOLTIP_REFRESH "ÎÎ½Î±Î½ÎÏÏÎ·" IDS_TOOLTIP_HELP "ÎÎ¿Î®Î¸ÎµÎ¹Î±" + IDS_TOOLTIP_EXIT "ÎÎ¾Î¿Î´Î¿Ï" END /* Hints */ @@ -70,11 +68,6 @@ IDS_HINT_HELP " ÎÎ¼ÏÎ¬Î½Î¹ÏÎ· ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï Î²Î¿Î®Î¸ÎµÎ¹Î±Ï." IDS_HINT_ABOUT " Î£ÏÎµÏÎ¹ÎºÎ¬ Î¼Îµ ÏÎ· ÎÎ¹Î±ÏÎµÎ¯ÏÎ¹ÏÎ· Î£ÏÏÎºÎµÏÏÎ½ ÏÎ¿Ï ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " ÎÏÎ±Î½Î±ÏÎÏÎµÎ¹ ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿ Î±ÏÏÏ ÏÏÎ¿ ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿ ÏÎ¿Ï Î¼ÎÎ³ÎµÎ¸Î¿Ï." IDS_HINT_SYS_MOVE " ÎÎµÏÎ±ÎºÎ¹Î½ÎµÎ¯ Î±ÏÏÏ ÏÎ¿ ÏÎ±ÏÎ¬Î¸ÏÏÎ¿." IDS_HINT_SYS_SIZE " ÎÎ»Î»Î¬Î¶ÎµÎ¹ ÏÎ¿ Î¼ÎÎ³ÎµÎ¸Î¿Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï ÏÎ±ÏÎ±Î¸ÏÏÎ¿Ï." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/en-US.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,7 +8,7 @@ END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH + MENUITEM "Scan for hardware changes" IDC_REFRESH MENUITEM "Print", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Properties", IDC_PROP, GRAYED Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/es-ES.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -14,19 +14,16 @@ END POPUP "AcciÃ³n" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Imprimir", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Propiedades", IDC_PROP, GRAYED END POPUP "Ver" BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por conexiÃ³n", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por conexiÃ³n", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE, CHECKED + MENUITEM "Dispositivos por conexiÃ³n", IDC_STATIC, GRAYED + MENUITEM "Recursos por tipo", IDC_STATIC, GRAYED + MENUITEM "Recursos por conexiÃ³n", IDC_STATIC, GRAYED END POPUP "Ayuda" BEGIN @@ -47,7 +44,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Administrador de dispositivos v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Administrador de dispositivos v0.1\nCopyright (C) 2006\nCreado por Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -63,6 +60,7 @@ IDS_TOOLTIP_PROP "Propiedades" IDS_TOOLTIP_REFRESH "Actualizar" IDS_TOOLTIP_HELP "Ayuda" + IDS_TOOLTIP_EXIT "Salir" END /* Hints */ @@ -76,11 +74,6 @@ IDS_HINT_HELP " Mostrar la ventana de ayuda." IDS_HINT_ABOUT " Acerca del Administrador de dispositivos de ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Devuelve esta ventana al tamaÃ±o normal." IDS_HINT_SYS_MOVE " Mueve esta ventana." IDS_HINT_SYS_SIZE " Redimensiona esta ventana." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/fr-FR.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "Action" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Imprimer", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "PropriÃ©tÃ©s", IDC_PROP, GRAYED END POPUP "Affichage" BEGIN - MENUITEM "PÃ©riphÃ©riques par type", IDC_DEVBYTYPE - MENUITEM "PÃ©riphÃ©riques par connexion", IDC_DEVBYCONN - MENUITEM "Ressources par type", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressources par connexion", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "PÃ©riphÃ©riques par type", IDC_DEVBYTYPE, CHECKED + MENUITEM "PÃ©riphÃ©riques par connexion", IDC_STATIC, GRAYED + MENUITEM "Ressources par type", IDC_STATIC, GRAYED + MENUITEM "Ressources par connexion", IDC_STATIC, GRAYED END POPUP "Aide" BEGIN @@ -41,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.2\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Gestionnaire de PÃ©riphÃ©riques v0.1\nCopyright (C) 2006\npar Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Fermer", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "PropriÃ©tÃ©s" IDS_TOOLTIP_REFRESH "Actualiser" IDS_TOOLTIP_HELP "Aide" + IDS_TOOLTIP_EXIT "Quitter" END /* Hints */ @@ -70,11 +68,6 @@ IDS_HINT_HELP " Affiche la fenÃªtre d'aide." IDS_HINT_ABOUT " Ã propos du Gestionnaire de PÃ©riphÃ©riques de ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Restaure cette fenÃªtre Ã sa taille normale." IDS_HINT_SYS_MOVE " Bouge cette fenÃªtre." IDS_HINT_SYS_SIZE " Redimensionne cette fenÃªtre." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/he-IL.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "×¤×¢××××ª" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "×××¤×¡", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "×××¤××× ××", IDC_PROP, GRAYED END POPUP "×ª×¦×××" BEGIN - MENUITEM "××ª×§× ×× ××¤× ×¡××", IDC_DEVBYTYPE - MENUITEM "××ª×§× ×× ××¤× ×××××¨", IDC_DEVBYCONN - MENUITEM "××©×××× ××¤× ×¡××", IDC_RESBYTYPE, GRAYED - MENUITEM "××©×××× ××¤× ×××××¨", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "××ª×§× ×× ××¤× ×¡××", IDC_DEVBYTYPE, CHECKED + MENUITEM "××ª×§× ×× ××¤× ×××××¨", IDC_STATIC, GRAYED + MENUITEM "××©×××× ××¤× ×¡××", IDC_STATIC, GRAYED + MENUITEM "××©×××× ××¤× ×××××¨", IDC_STATIC, GRAYED END POPUP "×¢××¨×" BEGIN @@ -41,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "×¡×××¨", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "×××¤××× ××" IDS_TOOLTIP_REFRESH "×¨×¢× ×" IDS_TOOLTIP_HELP "×¢××¨×" + IDS_TOOLTIP_EXIT "××¦×××" END /* Hints */ @@ -70,11 +68,6 @@ IDS_HINT_HELP " Display help window." IDS_HINT_ABOUT " ×××××ª ×× ×× ×××ª×§× ×× ×©× ReactOS" - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Restores this window to normal size." IDS_HINT_SYS_MOVE " Moves this window." IDS_HINT_SYS_SIZE " Resizes this window." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/id-ID.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "Aksi" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Cetak", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Properti", IDC_PROP, GRAYED END POPUP "Lihat" BEGIN - MENUITEM "Device dengan tipe", IDC_DEVBYTYPE - MENUITEM "Device dengan koneksi", IDC_DEVBYCONN - MENUITEM "Resource dengan tipe", IDC_RESBYTYPE, GRAYED - MENUITEM "Resource dengan koneksi", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Device dengan tipe", IDC_DEVBYTYPE, CHECKED + MENUITEM "Device dengan koneksi", IDC_STATIC, GRAYED + MENUITEM "Resource dengan tipe", IDC_STATIC, GRAYED + MENUITEM "Resource dengan koneksi", IDC_STATIC, GRAYED END POPUP "Bantuan" BEGIN @@ -41,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Manajer Device v0.1\nHak Cipta (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Manajer Device v0.1\nHak Cipta (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Tutup", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "Properti" IDS_TOOLTIP_REFRESH "Segarkan" IDS_TOOLTIP_HELP "Bantuan" + IDS_TOOLTIP_EXIT "Keluar" END /* Hints */ @@ -70,11 +68,6 @@ IDS_HINT_HELP " Menampilkan jendela bantuan." IDS_HINT_ABOUT " Tentang Manajer Device ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Menyimpan kembali jendela ini ke ukuran normal." IDS_HINT_SYS_MOVE " Memindahkan jendela ini." IDS_HINT_SYS_SIZE " Mengukur ulang jendela ini." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/it-IT.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "Azioni" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Stampa", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "ProprietÃ ", IDC_PROP, GRAYED END POPUP "Visualizza" BEGIN - MENUITEM "Dispositivi per tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivi per connessione", IDC_DEVBYCONN - MENUITEM "Risorse per tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Risorse per connessione", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Dispositivi per tipo", IDC_DEVBYTYPE, CHECKED + MENUITEM "Dispositivi per connessione", IDC_STATIC, GRAYED + MENUITEM "Risorse per tipo", IDC_STATIC, GRAYED + MENUITEM "Risorse per connessione", IDC_STATIC, GRAYED END POPUP "Aiuto" BEGIN @@ -41,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gestione dispositivi v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Gestione dispositivi v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "ProprietÃ " IDS_TOOLTIP_REFRESH "Aggiorna" IDS_TOOLTIP_HELP "Aiuto" + IDS_TOOLTIP_EXIT "Esci" END /* Hints */ @@ -70,11 +68,6 @@ IDS_HINT_HELP " Visualizza la finestra di aiuto." IDS_HINT_ABOUT " Informazioni su Gestione dispositivi di ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Ripristina la dimensione normale di questa finestra." IDS_HINT_SYS_MOVE " Muove questa finestra." IDS_HINT_SYS_SIZE " Cambia la dimensione di questa finestra." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ja-JP.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "æä½" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "å°å·", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "ããããã£", IDC_PROP, GRAYED END - POPUP "è¡¨\\ç¤º" + POPUP "è¡¨\ç¤º" BEGIN - MENUITEM "ããã¤ã¹ (ç¨®é¡å¥)", IDC_DEVBYTYPE - MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_DEVBYCONN - MENUITEM "ãªã½\\ã¼ã¹ (ç¨®é¡å¥)", IDC_RESBYTYPE, GRAYED - MENUITEM "ãªã½\\ã¼ã¹ (æ¥ç¶å¥)", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "ããã¤ã¹ (ç¨®é¡å¥)", IDC_DEVBYTYPE, CHECKED + MENUITEM "ããã¤ã¹ (æ¥ç¶å¥)", IDC_STATIC, GRAYED + MENUITEM "ãªã½\ã¼ã¹ (ç¨®é¡å¥)", IDC_STATIC, GRAYED + MENUITEM "ãªã½\ã¼ã¹ (æ¥ç¶å¥)", IDC_STATIC, GRAYED END POPUP "ãã«ã" BEGIN @@ -41,7 +38,7 @@ FONT 9, "MS UI Gothic",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "ããã¤ã¹ ããã¼ã¸ã£ v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "ããã¤ã¹ ããã¼ã¸ã£ v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "éãã", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "ããããã£" IDS_TOOLTIP_REFRESH "æ´æ°" IDS_TOOLTIP_HELP "ãã«ã" + IDS_TOOLTIP_EXIT "çµäº" END /* Hints */ @@ -67,13 +65,8 @@ IDS_HINT_EXIT " ãã®ããã°ã©ã ãçµäºãã¾ãã" IDS_HINT_REFRESH " ãµã¼ãã¹ã®ãªã¹ããæ´æ°ãã¾ãã" IDS_HINT_PROP " ç¾å¨é¸æããã¦ããã·ã¼ãã®ããããã£ãéãã¾ãã" - IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨\\ç¤ºãã¾ãã" - IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨\\ç¤ºãã¾ãã" - - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" + IDS_HINT_HELP " ãã«ã ã¦ã£ã³ãã¦ãè¡¨\ç¤ºãã¾ãã" + IDS_HINT_ABOUT " ReactOS ããã¤ã¹ ããã¼ã¸ã£ã«ã¤ãã¦è¡¨\ç¤ºãã¾ãã" IDS_HINT_SYS_RESTORE " ãã®ã¦ã£ã³ãã¦ãéå¸¸ã®å¤§ããã«å¾©åãã¾ãã" IDS_HINT_SYS_MOVE " ãã®ã¦ã£ã³ãã¦ãç§»åãã¾ãã" Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ko-KR.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -11,19 +11,16 @@ END POPUP "ì¡ì" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "íë¦°í¸", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "ìì±", IDC_PROP, GRAYED END POPUP "ë³´ê¸°" BEGIN - MENUITEM "Devices by type", IDC_DEVBYTYPE - MENUITEM "Devices by connection", IDC_DEVBYCONN - MENUITEM "Resources by type", IDC_RESBYTYPE, GRAYED - MENUITEM "Resources by connection", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Devices by type", IDC_DEVBYTYPE, CHECKED + MENUITEM "Devices by connection", IDC_STATIC, GRAYED + MENUITEM "Resources by type", IDC_STATIC, GRAYED + MENUITEM "Resources by connection", IDC_STATIC, GRAYED END POPUP "ëìë§" BEGIN @@ -44,7 +41,7 @@ FONT 9,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -60,6 +57,7 @@ IDS_TOOLTIP_PROP "ìì±" IDS_TOOLTIP_REFRESH "ìë¡ ê³ ì¹¨" IDS_TOOLTIP_HELP "ëìë§" + IDS_TOOLTIP_EXIT "ì¢ë£" END /* Hints */ @@ -73,11 +71,6 @@ IDS_HINT_HELP " ëìë§ì ì½ëë¤." IDS_HINT_ABOUT " ReactOS ì¥ì¹ ê´ë¦¬ìì ëí´." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " ì´ ì°½ì ë³´íµ í¬ê¸°ë¡ ë§ì¶¤ëë¤." IDS_HINT_SYS_MOVE " ì°½ì ìì§ìëë¤." IDS_HINT_SYS_SIZE " ì°½ì í¬ê¸°ë¥¼ ë³ê²½í©ëë¤." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/no-NO.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -8,19 +8,16 @@ END POPUP "Handling" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Skriv ut", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Egenskaper", IDC_PROP, GRAYED END POPUP "Vis" BEGIN - MENUITEM "Enheter etter type", IDC_DEVBYTYPE - MENUITEM "Enheter etter tilkobling", IDC_DEVBYCONN - MENUITEM "Ressurser etter type", IDC_RESBYTYPE, GRAYED - MENUITEM "Ressurser etter tilkobling", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Enheter etter type", IDC_DEVBYTYPE, CHECKED + MENUITEM "Enheter etter tilkobling", IDC_STATIC, GRAYED + MENUITEM "Ressurser etter type", IDC_STATIC, GRAYED + MENUITEM "Ressurser etter tilkobling", IDC_STATIC, GRAYED END POPUP "Hjelp" BEGIN @@ -41,7 +38,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Enhetsbehandler v0.1\nEnerett (C) 2012\nlaget av Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Enhetsbehandler v0.1\nEnerett (C) 2006\nlaget av Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Lukk", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -57,6 +54,7 @@ IDS_TOOLTIP_PROP "Egenskaper" IDS_TOOLTIP_REFRESH "Oppdater" IDS_TOOLTIP_HELP "Hjelp" + IDS_TOOLTIP_EXIT "Avslutt" END /* Hints */ @@ -70,11 +68,6 @@ IDS_HINT_HELP " Vis hjelp vinduet." IDS_HINT_ABOUT " Om ReactOS Enhetsbehandler." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Gjenopprett dette vinduet til vanlig stÃ¸rrelse." IDS_HINT_SYS_MOVE " Flytt dette vinduet." IDS_HINT_SYS_SIZE " Endre stÃ¸rrelse pÃ¥ dette vinduet." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pl-PL.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -15,19 +15,16 @@ END POPUP "&Akcja" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "&Drukuj", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "&WÅaÅciwoÅci", IDC_PROP, GRAYED END POPUP "&Widok" BEGIN - MENUITEM "UrzÄdzenia w&edÅug typu", IDC_DEVBYTYPE - MENUITEM "Ur&zÄdzenia wedÅug poÅÄczenia", IDC_DEVBYCONN - MENUITEM "Zaso&by wedÅug typu", IDC_RESBYTYPE, GRAYED - MENUITEM "Za&soby wedÅug poÅÄczenia", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "UrzÄdzenia w&edÅug typu", IDC_DEVBYTYPE, CHECKED + MENUITEM "Ur&zÄdzenia wedÅug poÅÄczenia", IDC_STATIC, GRAYED + MENUITEM "Zaso&by wedÅug typu", IDC_STATIC, GRAYED + MENUITEM "Za&soby wedÅug poÅÄczenia", IDC_STATIC, GRAYED END POPUP "Pomo&c" BEGIN @@ -48,7 +45,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "MenedÅ¼er urzÄdzeÅ v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "MenedÅ¼er urzÄdzeÅ v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Zamknij", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -64,6 +61,7 @@ IDS_TOOLTIP_PROP "WÅaÅciwoÅci" IDS_TOOLTIP_REFRESH "OdÅwieÅ¼" IDS_TOOLTIP_HELP "Pomoc" + IDS_TOOLTIP_EXIT "WyjÅcie" END /* Hints */ @@ -77,11 +75,6 @@ IDS_HINT_HELP " Otwiera pomoc." IDS_HINT_ABOUT " Informacje o MenedÅ¼erze urzÄdzeÅ ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Przywraca okno do normalnych rozmiarÃ³w." IDS_HINT_SYS_MOVE " Przesuwa to okno." IDS_HINT_SYS_SIZE " Zmienia rozmiar tego okna." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/pt-BR.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -10,19 +10,16 @@ END POPUP "AÃ§Ã£o" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Imprimir", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Propriedades", IDC_PROP, GRAYED END POPUP "Visualizar" BEGIN - MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE - MENUITEM "Dispositivos por conexÃ£o", IDC_DEVBYCONN - MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED - MENUITEM "Recursos por conexÃ£o", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Dispositivos por tipo", IDC_DEVBYTYPE, CHECKED + MENUITEM "Dispositivos por conexÃ£o", IDC_STATIC, GRAYED + MENUITEM "Recursos por tipo", IDC_STATIC, GRAYED + MENUITEM "Recursos por conexÃ£o", IDC_STATIC, GRAYED END POPUP "Ajuda" BEGIN @@ -43,7 +40,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gerenciador de Dispositivos v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Gerenciador de Dispositivos v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Fechar", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -59,6 +56,7 @@ IDS_TOOLTIP_PROP "Propriedades" IDS_TOOLTIP_REFRESH "Atualizar" IDS_TOOLTIP_HELP "Ajuda" + IDS_TOOLTIP_EXIT "Sair" END /* Hints */ @@ -72,11 +70,6 @@ IDS_HINT_HELP " Exibe tela de ajuda." IDS_HINT_ABOUT " Sobre Gerenciador de Dispositivos ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Restaura esta janela ao tamanho normal." IDS_HINT_SYS_MOVE " Move esta janela." IDS_HINT_SYS_SIZE " Redimensiona esta janela." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -9,19 +9,16 @@ END POPUP "A&cÈiune" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Im&primare", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "P&roprietÄÈi", IDC_PROP, GRAYED END POPUP "&AfiÈare" BEGIN - MENUITEM "Dispozitive dupÄ &tip", IDC_DEVBYTYPE - MENUITEM "Dispozitive dupÄ &conexiune", IDC_DEVBYCONN - MENUITEM "Resurse dupÄ t&ip", IDC_RESBYTYPE, GRAYED - MENUITEM "Resurse dupÄ c&onexiune", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Dispozitive dupÄ &tip", IDC_DEVBYTYPE, CHECKED + MENUITEM "Dispozitive dupÄ &conexiune", IDC_STATIC, GRAYED + MENUITEM "Resurse dupÄ t&ip", IDC_STATIC, GRAYED + MENUITEM "Resurse dupÄ c&onexiune", IDC_STATIC, GRAYED END POPUP "Aj&utor" BEGIN @@ -42,7 +39,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Gestionar de Dispozitive v0.1\nDrept de autor (C) 2012\nde Ged Murphy (gedmurphy(a)reactos.org)\nTraducere de Petru Dimitriu", IDC_STATIC, 48, 7, 130, 35 + LTEXT "Gestionar de Dispozitive v0.1\nDrept de autor (C) 2006\nde Ged Murphy (gedmurphy(a)gmail.com)\nTraducere de Petru Dimitriu", IDC_STATIC, 48, 7, 130, 35 PUSHBUTTON "Ã&nchide", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 47, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -58,6 +55,7 @@ IDS_TOOLTIP_PROP "ProprietÄÈi" IDS_TOOLTIP_REFRESH "ÃmprospÄtare" IDS_TOOLTIP_HELP "Manual de utilizare" + IDS_TOOLTIP_EXIT "IeÈire" END /* Hints */ @@ -71,11 +69,6 @@ IDS_HINT_HELP " AfiÈeazÄ manualul de utilizare." IDS_HINT_ABOUT " Despre Gestionarul de dispozitive." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Aduce fereastra la mÄrime normalÄ." IDS_HINT_SYS_MOVE " MutÄ fereastra." IDS_HINT_SYS_SIZE " RedimensioneazÄ fereastra." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ru-RU.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -10,19 +10,16 @@ END POPUP "ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "ÐÐµÑÐ°ÑÑ", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", IDC_PROP, GRAYED END POPUP "ÐÐ¸Ð´" BEGIN - MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_DEVBYTYPE - MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_DEVBYCONN - MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_RESBYTYPE, GRAYED - MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_DEVBYTYPE, CHECKED + MENUITEM "Ð£ÑÑÑÐ¾Ð¹ÑÑÐ²Ð° Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_STATIC, GRAYED + MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ ÑÐ¸Ð¿Ñ", IDC_STATIC, GRAYED + MENUITEM "Ð ÐµÑÑÑÑÑ Ð¿Ð¾ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ", IDC_STATIC, GRAYED END POPUP "Ð¡Ð¿ÑÐ°Ð²ÐºÐ°" BEGIN @@ -43,7 +40,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² v0.1\nCopyright (C) 2012\nÐ¾Ñ Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ ÑÑÑÑÐ¾Ð¹ÑÑÐ² v0.1\nCopyright (C) 2006\nÐ¾Ñ Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "ÐÐ°ÐºÑÑÑÑ", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -59,6 +56,7 @@ IDS_TOOLTIP_PROP "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°" IDS_TOOLTIP_REFRESH "ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ" IDS_TOOLTIP_HELP "ÐÐ¾Ð¼Ð¾ÑÑ" + IDS_TOOLTIP_EXIT "ÐÑÑÐ¾Ð´" END /* Hints */ @@ -72,11 +70,6 @@ IDS_HINT_HELP " ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ Ð¾ÐºÐ½Ð¾ ÑÐ¿ÑÐ°Ð²ÐºÐ¸." IDS_HINT_ABOUT " Ð ReactOS Device Manager." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " ÐÐ¾ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð½Ð¾ÑÐ¼Ð°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð·Ð¼ÐµÑ ÑÑÐ¾Ð³Ð¾ Ð¾ÐºÐ½Ð°." IDS_HINT_SYS_MOVE " ÐÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÑÐ¾ Ð¾ÐºÐ½Ð¾." IDS_HINT_SYS_SIZE " ÐÐ·Ð¼ÐµÐ½Ð¸ÑÑ ÑÐ°Ð·Ð¼ÐµÑ ÑÑÐ¾Ð³Ð¾ Ð¾ÐºÐ½Ð°." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sk-SK.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -13,19 +13,16 @@ END POPUP "Akcia" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "TlaÄiÅ¥", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Vlastnosti", IDC_PROP, GRAYED END POPUP "ZobraziÅ¥" BEGIN - MENUITEM "Zariadenia podÄ¾a typu", IDC_DEVBYTYPE - MENUITEM "Zariadenia podÄ¾a pripojenia", IDC_DEVBYCONN - MENUITEM "Prostriedky podÄ¾a typu", IDC_RESBYTYPE, GRAYED - MENUITEM "Prostriedky podÄ¾a pripojenia", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Zariadenia podÄ¾a typu", IDC_DEVBYTYPE, CHECKED + MENUITEM "Zariadenia podÄ¾a pripojenia", IDC_STATIC, GRAYED + MENUITEM "Prostriedky podÄ¾a typu", IDC_STATIC, GRAYED + MENUITEM "Prostriedky podÄ¾a pripojenia", IDC_STATIC, GRAYED END POPUP "PomocnÃk" BEGIN @@ -46,7 +43,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "SprÃ¡vca zariadenÃ v0.1\nCopyright (C) 2012\nod Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "SprÃ¡vca zariadenÃ v0.1\nCopyright (C) 2006\nod Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "ZavrieÅ¥", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -62,6 +59,7 @@ IDS_TOOLTIP_PROP "Vlastnosti" IDS_TOOLTIP_REFRESH "ObnoviÅ¥" IDS_TOOLTIP_HELP "PomocnÃk" + IDS_TOOLTIP_EXIT "SkonÄiÅ¥" END /* Hints */ @@ -75,11 +73,6 @@ IDS_HINT_HELP " ZobrazÃ okno pomocnÃka." IDS_HINT_ABOUT " Äo je SprÃ¡vca zariadenÃ systÃ©mu ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " ObnovÃ okno na normÃ¡lnu veÄ¾kosÅ¥." IDS_HINT_SYS_MOVE " Premiestni okno." IDS_HINT_SYS_SIZE " ZmenÃ veÄ¾kosÅ¥ okna." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sq-AL.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -12,19 +12,16 @@ END POPUP "Veprim" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Printo", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Tipar", IDC_PROP, GRAYED END POPUP "VÃ«zhgo" BEGIN - MENUITEM "Pajisje nga tipi", IDC_DEVBYTYPE - MENUITEM "Pajisje nga lidhja", IDC_DEVBYCONN - MENUITEM "Burime nga tipi", IDC_RESBYTYPE, GRAYED - MENUITEM "Burime nga lidhja", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Pajisje nga tipi", IDC_DEVBYTYPE, CHECKED + MENUITEM "Pajisje nga lidhja", IDC_STATIC, GRAYED + MENUITEM "Burime nga tipi", IDC_STATIC, GRAYED + MENUITEM "Burime nga lidhja", IDC_STATIC, GRAYED END POPUP "NdihmÃ«" BEGIN @@ -45,7 +42,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Menaxhues pajisjesh v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Menaxhues pajisjesh v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Mbyll", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -61,6 +58,7 @@ IDS_TOOLTIP_PROP "Tipar" IDS_TOOLTIP_REFRESH "Rifresko" IDS_TOOLTIP_HELP "NdihmÃ«" + IDS_TOOLTIP_EXIT "Dil" END /* Hints */ @@ -74,11 +72,6 @@ IDS_HINT_HELP " Shfaq dritaren e ndihmÃ«s." IDS_HINT_ABOUT " Rreth menaxhusit tÃ« pajisjeve tÃ« ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " Kthe kete dritare ne mase normale." IDS_HINT_SYS_MOVE " Leviz kete dritare." IDS_HINT_SYS_SIZE " Ndryshon permasat e dritares." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/sv-SE.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -14,19 +14,16 @@ END POPUP "ÃtgÃ¤rd" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "Skriv ut", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "Egenskaper", IDC_PROP, GRAYED END POPUP "Visa" BEGIN - MENUITEM "Enheter efter typ", IDC_DEVBYTYPE - MENUITEM "Enheter efter koppling", IDC_DEVBYCONN - MENUITEM "Resurcer efter typ", IDC_RESBYTYPE, GRAYED - MENUITEM "Resurcer efter koppling", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "Enheter efter typ", IDC_DEVBYTYPE, CHECKED + MENUITEM "Enheter efter koppling", IDC_STATIC, GRAYED + MENUITEM "Resurcer efter typ", IDC_STATIC, GRAYED + MENUITEM "Resurcer efter koppling", IDC_STATIC, GRAYED END POPUP "HjÃ¤lp" BEGIN @@ -47,7 +44,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Enhetshanteraren v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "Enhetshanteraren v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "StÃ¤ng", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -63,6 +60,7 @@ IDS_TOOLTIP_PROP "Egenskaper" IDS_TOOLTIP_REFRESH "Uppdater" IDS_TOOLTIP_HELP "HjÃ¤lp" + IDS_TOOLTIP_EXIT "Avsluta" END /* Hints */ @@ -76,11 +74,6 @@ IDS_HINT_HELP " Visa hjÃ¤lpfÃ¶nstret." IDS_HINT_ABOUT " Om ReactOS Enhetshanterare." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " ÃterstÃ¤ll detta fÃ¶nstret till normal storlek." IDS_HINT_SYS_MOVE " Flytta detta fÃ¶nstret." IDS_HINT_SYS_SIZE " Ãndra storleken pÃ¥ detta fÃ¶nstret." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/th-TH.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -17,19 +17,16 @@ END POPUP "à¹à¸£à¸´à¹à¸¡à¸à¸³" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "à¸à¸´à¸¡à¸à¹", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´", IDC_PROP, GRAYED END POPUP "à¸¡à¸¸à¸¡à¸¡à¸à¸" BEGIN - MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_DEVBYTYPE - MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_DEVBYCONN - MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_RESBYTYPE, GRAYED - MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_DEVBYTYPE, CHECKED + MENUITEM "à¸à¸¸à¸à¸à¸£à¸à¹à¹à¸à¹à¸à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_STATIC, GRAYED + MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸£à¸°à¹à¸ à¸", IDC_STATIC, GRAYED + MENUITEM "à¹à¸«à¸¥à¹à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸à¸²à¸¡à¸à¸²à¸£à¹à¸à¸·à¹à¸à¸¡à¸à¹à¸", IDC_STATIC, GRAYED END POPUP "à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" BEGIN @@ -50,7 +47,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "Device Manager v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "Device Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "Close", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -66,6 +63,7 @@ IDS_TOOLTIP_PROP "à¸à¸¸à¸à¸ªà¸¡à¸à¸±à¸à¸´" IDS_TOOLTIP_REFRESH "à¸à¸·à¹à¸à¸à¸¹" IDS_TOOLTIP_HELP "à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" + IDS_TOOLTIP_EXIT "à¸à¸à¸à¸à¸²à¸à¹à¸à¸£à¹à¸à¸£à¸¡" END /* Hints */ @@ -79,11 +77,6 @@ IDS_HINT_HELP " à¹à¸ªà¸à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¹à¸§à¸¢à¹à¸«à¸¥à¸·à¸" IDS_HINT_ABOUT " à¹à¸à¸µà¹à¸¢à¸§à¸à¸±à¸à¸à¸²à¸£à¸à¸±à¸à¸à¸²à¸£à¸à¸¸à¸à¸à¸£à¸à¹à¸à¸à¸ ReactOS" - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " à¸à¸·à¸à¸ªà¸ à¸²à¸à¸à¸à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹à¸ªà¸¹à¹à¸à¸à¸²à¸à¸à¸à¸à¸´" IDS_HINT_SYS_MOVE " à¸¢à¹à¸²à¸¢à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹" IDS_HINT_SYS_SIZE " à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¸à¸²à¸à¸«à¸à¹à¸²à¸à¹à¸²à¸à¸à¸µà¹" Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/tr-TR.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -10,17 +10,17 @@ END POPUP "&Eylem" BEGIN - MENUITEM "&DonanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara", IDC_REFRESH + MENUITEM "&DonanÄ±m DeÄiÅiklikleri Ä°Ã§in Tara" IDC_REFRESH MENUITEM "&YazdÄ±r", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "&HusÃ»siyetler", IDC_PROP, GRAYED END POPUP "&GÃ¶rÃ¼nÃ¼m" BEGIN - MENUITEM "&TÃ¼re GÃ¶re AygÄ±tlar", IDC_DEVBYTYPE - MENUITEM "&BaÄlantÄ±ya GÃ¶re AygÄ±tlar", IDC_DEVBYCONN - MENUITEM "T&Ã¼re GÃ¶re Kaynaklar", IDC_RESBYTYPE, GRAYED - MENUITEM "B&aÄlantÄ±ya GÃ¶re Kaynaklar", IDC_RESBYCONN, GRAYED + MENUITEM "&TÃ¼re GÃ¶re AygÄ±tlar", IDC_DEVBYTYPE, CHECKED + MENUITEM "&BaÄlantÄ±ya GÃ¶re AygÄ±tlar", IDC_STATIC, GRAYED + MENUITEM "T&Ã¼re GÃ¶re Kaynaklar", IDC_STATIC, GRAYED + MENUITEM "B&aÄlantÄ±ya GÃ¶re Kaynaklar", IDC_STATIC, GRAYED MENUITEM SEPARATOR MENUITEM "&Gizli AygÄ±tlarÄ± GÃ¶ster", IDC_SHOWHIDDEN END @@ -43,7 +43,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "AygÄ±t YÃ¶neticisi - SÃ¼rÃ¼m: 0.2\nTelif HakkÄ±: 2012\nGed Murphy (gedmurphy(a)reactos.org) ile.", IDC_STATIC, 48, 7, 130, 30 + LTEXT "AygÄ±t YÃ¶neticisi - SÃ¼rÃ¼m: 0.2\nTelif HakkÄ±: 2012\nGed Murphy (gedmurphy(a)gmail.com) ile.", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "Tamam", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/uk-UA.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -16,19 +16,16 @@ END POPUP "ÐÑÑ" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "ÐÑÑÐº", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", IDC_PROP, GRAYED END POPUP "ÐÐ¸Ð³Ð»ÑÐ´" BEGIN - MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_DEVBYTYPE - MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_DEVBYCONN - MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_RESBYTYPE, GRAYED - MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_DEVBYTYPE, CHECKED + MENUITEM "ÐÑÐ¸ÑÑÑÐ¾Ñ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_STATIC, GRAYED + MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° ÑÐ¸Ð¿Ð¾Ð¼", IDC_STATIC, GRAYED + MENUITEM "Ð ÐµÑÑÑÑÐ¸ Ð·Ð° Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½ÑÐ¼", IDC_STATIC, GRAYED END POPUP "ÐÐ¾Ð²ÑÐ´ÐºÐ°" BEGIN @@ -49,7 +46,7 @@ FONT 8,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ² v0.1\nCopyright (C) 2012\nby Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 26 + LTEXT "ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ² v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 26 PUSHBUTTON "ÐÐ°ÐºÑÐ¸ÑÐ¸", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -65,6 +62,7 @@ IDS_TOOLTIP_PROP "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ" IDS_TOOLTIP_REFRESH "ÐÐ½Ð¾Ð²Ð¸ÑÐ¸" IDS_TOOLTIP_HELP "ÐÐ¾Ð²ÑÐ´ÐºÐ°" + IDS_TOOLTIP_EXIT "ÐÐ¸ÑÑÐ´" END /* Hints */ @@ -78,11 +76,6 @@ IDS_HINT_HELP " ÐÐ¾ÐºÐ°Ð·Ð°ÑÐ¸ Ð²ÑÐºÐ½Ð¾ Ð´Ð¾Ð²ÑÐ´ÐºÐ¸." IDS_HINT_ABOUT " ÐÑÐ¾ ÐÐ¸ÑÐ¿ÐµÑÑÐµÑ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ² ReactOS." - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " ÐÑÐ´Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð²Ð¸ÑÑÐ´Ð½Ð¸Ð¹ ÑÐ¾Ð·Ð¼ÑÑ Ð²ÑÐºÐ½Ð°." IDS_HINT_SYS_MOVE " ÐÐ¼ÑÐ½Ð¸ÑÐ¸ ÑÐ¾Ð·ÑÐ°ÑÑÐ²Ð°Ð½Ð½Ñ Ð²ÑÐºÐ½Ð°." IDS_HINT_SYS_SIZE " ÐÐ¼ÑÐ½Ð¸ÑÐ¸ ÑÐ¾Ð·Ð¼ÑÑ Ð²ÑÐºÐ½Ð°." Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/lang/zh-CN.rc [iso-8859-1] Mon Jun 1 09:25:46 2015 @@ -12,19 +12,16 @@ END POPUP "å¨ä½" BEGIN - MENUITEM "Scan for hardware changes", IDC_REFRESH MENUITEM "æå°", IDC_PRINT, GRAYED MENUITEM SEPARATOR MENUITEM "å±æ§", IDC_PROP, GRAYED END POPUP "æ¥ç" BEGIN - MENUITEM "è®¾å¤ï¼æç±»å", IDC_DEVBYTYPE - MENUITEM "è®¾å¤ï¼æè¿æ¥", IDC_DEVBYCONN - MENUITEM "èµæºï¼æç±»å", IDC_RESBYTYPE, GRAYED - MENUITEM "èµæºï¼æè¿æ¥", IDC_RESBYCONN, GRAYED - MENUITEM SEPARATOR - MENUITEM "Show hidden devices", IDC_SHOWHIDDEN + MENUITEM "è®¾å¤ï¼æç±»å", IDC_DEVBYTYPE, CHECKED + MENUITEM "è®¾å¤ï¼æè¿æ¥", IDC_STATIC, GRAYED + MENUITEM "èµæºï¼æç±»å", IDC_STATIC, GRAYED + MENUITEM "èµæºï¼æè¿æ¥", IDC_STATIC, GRAYED END POPUP "å¸®å©" BEGIN @@ -45,7 +42,7 @@ FONT 9,"MS Shell Dlg",0,0 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME BEGIN - LTEXT "è®¾å¤ç®¡çå¨ v0.2\nçæææ (C) 2012\nä½è Ged Murphy (gedmurphy(a)reactos.org)", IDC_STATIC, 48, 7, 130, 30 + LTEXT "è®¾å¤ç®¡çå¨ v0.1\çæææ (C) 2006\nä½è Ged Murphy (gedmurphy(a)gmail.com)", IDC_STATIC, 48, 7, 130, 30 PUSHBUTTON "å³é", IDOK, 75, 162, 44, 15 ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30 EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE @@ -61,6 +58,7 @@ IDS_TOOLTIP_PROP "å±æ§" IDS_TOOLTIP_REFRESH "å·æ°" IDS_TOOLTIP_HELP "å¸®å©" + IDS_TOOLTIP_EXIT "éåº" END /* Hints */ @@ -74,11 +72,6 @@ IDS_HINT_HELP " æ¾ç¤ºå¸®å©çªå£ã" IDS_HINT_ABOUT " å³äº ReactOS è®¾å¤ç®¡çå¨ã" - IDS_HINT_DEV_BY_TYPE "Displays devices by hardware type" - IDS_HINT_DEV_BY_CONN "Displays devices by connection" - IDS_HINT_RES_BY_TYPE "Diaplays resources by type" - IDS_HINT_RES_BY_CONN "Displays resources by connection type" - IDS_HINT_SYS_RESTORE " å°çªå£æ¢å¤å°é»è®¤å¤§å°ã" IDS_HINT_SYS_MOVE " ç§»å¨è¿ä¸ªçªå£ã" IDS_HINT_SYS_SIZE " æ´æ¹è¿ä¸ªçªå£çå¤§å°ã" Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/resource.h (removed) @@ -1,68 +0,0 @@ -#define IDC_STATIC -1 - -#define IDI_MAIN_ICON 50 -#define IDB_ROOT_IMAGE 51 - -/* windows */ -#define IDC_TREEVIEW 1000 -#define IDC_TOOLBAR 1001 -#define IDC_STATUSBAR 1002 - -/* commands */ -#define IDC_PROP 2000 -#define IDC_REFRESH 2001 -#define IDC_PRINT 2002 -#define IDC_EXIT 2003 -#define IDC_ABOUT 4031 - -/* menus */ -#define IDR_MAINMENU 102 -#define IDR_POPUP 103 -#define IDC_DEVBYTYPE 104 -#define IDC_DEVBYCONN 105 -#define IDC_RESBYTYPE 106 -#define IDC_RESBYCONN 107 -#define IDC_SHOWHIDDEN 108 - -/* tooltips */ -#define IDS_TOOLTIP_PROP 6000 -#define IDS_TOOLTIP_REFRESH 6001 -#define IDS_TOOLTIP_HELP 6002 - -/* button bitmaps */ -#define IDB_PROP 10000 -#define IDB_REFRESH 10001 - -/* toolbar buttons */ -#define TBICON_PROP 0 -#define TBICON_REFRESH 1 -#define TBICON_HELP 2 - -/* about box info */ -#define IDD_ABOUTBOX 200 -#define IDC_LICENSE_EDIT 201 -#define IDS_APPNAME 202 -#define IDS_LICENSE 203 - - -/* menu hints */ -#define IDS_HINT_BLANK 20000 -#define IDS_HINT_REFRESH 20002 -#define IDS_HINT_PROP 20003 -#define IDS_HINT_HELP 20004 -#define IDS_HINT_ABOUT 20005 -#define IDS_HINT_EXIT 20006 - -#define IDS_HINT_DEV_BY_TYPE 20020 -#define IDS_HINT_DEV_BY_CONN 20021 -#define IDS_HINT_RES_BY_TYPE 20022 -#define IDS_HINT_RES_BY_CONN 20023 - -/* system menu hints */ -#define IDS_HINT_SYS_RESTORE 21001 -#define IDS_HINT_SYS_MOVE 21002 -#define IDS_HINT_SYS_SIZE 21003 -#define IDS_HINT_SYS_MINIMIZE 21004 -#define IDS_HINT_SYS_MAXIMIZE 21005 -#define IDS_HINT_SYS_CLOSE 21006 -

1 0

[pschweitzer] 67984: [NTFS] So faar our driver is read-only
by pschweitzer＠svn.reactos.org 31 May '15

31 May '15

Author: pschweitzer Date: Sun May 31 21:31:14 2015 New Revision: 67984 URL: http://svn.reactos.org/svn/reactos?rev=67984&view=rev Log: [NTFS] So faar our driver is read-only Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c Modified: trunk/reactos/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/v… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Sun May 31 21:31:14 2015 @@ -165,7 +165,7 @@ return STATUS_BUFFER_OVERFLOW; FsAttributeInfo->FileSystemAttributes = - FILE_CASE_PRESERVED_NAMES | FILE_UNICODE_ON_DISK; + FILE_CASE_PRESERVED_NAMES | FILE_UNICODE_ON_DISK | FILE_READ_ONLY_VOLUME; FsAttributeInfo->MaximumComponentNameLength = 255; FsAttributeInfo->FileSystemNameLength = 8;

1 0

[pschweitzer] 67983: [NTFS] Directly implement NtfsOpenFileById() for special files from the MFT where we cannot moonwalk there path. It concerns any file with ID < 0x10. This function can only cop...
by pschweitzer＠svn.reactos.org 31 May '15

31 May '15

Author: pschweitzer Date: Sun May 31 21:28:52 2015 New Revision: 67983 URL: http://svn.reactos.org/svn/reactos?rev=67983&view=rev Log: [NTFS] Directly implement NtfsOpenFileById() for special files from the MFT where we cannot moonwalk there path. It concerns any file with ID < 0x10. This function can only cope with file which ID is < 0xc. Windows Internals reports that 0xc - 0xf entries are unused. It would be interesting to double check returrned status in case of error, and also what Windows returns when attempting weird opening of suchs entries (overwrite, create for unused, etc). Modified: trunk/reactos/drivers/filesystems/ntfs/create.c trunk/reactos/drivers/filesystems/ntfs/ntfs.h Modified: trunk/reactos/drivers/filesystems/ntfs/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/c… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/create.c [iso-8859-1] Sun May 31 21:28:52 2015 @@ -31,6 +31,21 @@ #define NDEBUG #include <debug.h> +static PCWSTR MftIdToName[] = { + L"$MFT", + L"$MFTMirr", + L"$LogFile", + L"$Volume", + L"AttrDef", + L".", + L"$Bitmap", + L"$Boot", + L"$BadClus", + L"$Quota", + L"$UpCase", + L"$Extended", +}; + /* FUNCTIONS ****************************************************************/ static @@ -153,6 +168,72 @@ return STATUS_INSUFFICIENT_RESOURCES; } RtlCopyMemory(OutPath->Buffer, FullPath + WritePosition, OutPath->MaximumLength); + + return Status; +} + +static +NTSTATUS +NtfsOpenFileById(PDEVICE_EXTENSION DeviceExt, + PFILE_OBJECT FileObject, + ULONGLONG MftId, + PNTFS_FCB * FoundFCB) +{ + NTSTATUS Status; + PNTFS_FCB FCB; + PFILE_RECORD_HEADER MftRecord; + + DPRINT1("NtfsOpenFileById(%p, %p, %I64x, %p)\n", DeviceExt, FileObject, MftId, FoundFCB); + + ASSERT(MftId < 0x10); + if (MftId > 0xb) /* No entries are used yet beyond this */ + { + return STATUS_OBJECT_NAME_NOT_FOUND; + } + + MftRecord = ExAllocatePoolWithTag(NonPagedPool, + DeviceExt->NtfsInfo.BytesPerFileRecord, + TAG_NTFS); + if (MftRecord == NULL) + { + return STATUS_INSUFFICIENT_RESOURCES; + } + + Status = ReadFileRecord(DeviceExt, MftId, MftRecord); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + + if (!(MftRecord->Flags & FRH_IN_USE)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return STATUS_OBJECT_PATH_NOT_FOUND; + } + + FCB = NtfsGrabFCBFromTable(DeviceExt, MftIdToName[MftId]); + if (FCB == NULL) + { + UNICODE_STRING Name; + + RtlInitUnicodeString(&Name, MftIdToName[MftId]); + Status = NtfsMakeFCBFromDirEntry(DeviceExt, NULL, &Name, MftRecord, MftId, &FCB); + if (!NT_SUCCESS(Status)) + { + ExFreePoolWithTag(MftRecord, TAG_NTFS); + return Status; + } + } + + ASSERT(FCB != NULL); + + ExFreePoolWithTag(MftRecord, TAG_NTFS); + + Status = NtfsAttachFCBToFileObject(DeviceExt, + FCB, + FileObject); + *FoundFCB = FCB; return Status; } @@ -249,7 +330,7 @@ PFILE_OBJECT FileObject; ULONG RequestedDisposition; ULONG RequestedOptions; - PNTFS_FCB Fcb; + PNTFS_FCB Fcb = NULL; // PWSTR FileName; NTSTATUS Status; UNICODE_STRING FullPath; @@ -287,13 +368,15 @@ return STATUS_INVALID_PARAMETER; MFTId = (*(PULONGLONG)FileObject->FileName.Buffer) & NTFS_MFT_MASK; - if (MFTId < 0xf) - { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; - } - - Status = NtfsMoonWalkID(DeviceExt, MFTId, &FullPath); + if (MFTId < 0x10) + { + Status = NtfsOpenFileById(DeviceExt, FileObject, MFTId, &Fcb); + } + else + { + Status = NtfsMoonWalkID(DeviceExt, MFTId, &FullPath); + } + if (!NT_SUCCESS(Status)) { return Status; @@ -324,14 +407,17 @@ return STATUS_SUCCESS; } - Status = NtfsOpenFile(DeviceExt, - FileObject, - ((RequestedOptions & FILE_OPEN_BY_FILE_ID) ? FullPath.Buffer : FileObject->FileName.Buffer), - &Fcb); - - if (RequestedOptions & FILE_OPEN_BY_FILE_ID) - { - ExFreePoolWithTag(FullPath.Buffer, TAG_NTFS); + if (Fcb == NULL) + { + Status = NtfsOpenFile(DeviceExt, + FileObject, + ((RequestedOptions & FILE_OPEN_BY_FILE_ID) ? FullPath.Buffer : FileObject->FileName.Buffer), + &Fcb); + + if (RequestedOptions & FILE_OPEN_BY_FILE_ID) + { + ExFreePoolWithTag(FullPath.Buffer, TAG_NTFS); + } } if (NT_SUCCESS(Status)) Modified: trunk/reactos/drivers/filesystems/ntfs/ntfs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/n… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/ntfs.h [iso-8859-1] Sun May 31 21:28:52 2015 @@ -643,6 +643,14 @@ ULONG NameLength, PVOID * Data); +NTSTATUS +NtfsMakeFCBFromDirEntry(PNTFS_VCB Vcb, + PNTFS_FCB DirectoryFCB, + PUNICODE_STRING Name, + PFILE_RECORD_HEADER Record, + ULONGLONG MFTIndex, + PNTFS_FCB * fileFCB); + /* finfo.c */

1 0

[hbelusca] 67982: [MODULES]: Add the [boot|live|hybrid]cd-extras directories to the svn-ignore list. Suggested by David Quintana.
by hbelusca＠svn.reactos.org 31 May '15

31 May '15

Author: hbelusca Date: Sun May 31 16:11:27 2015 New Revision: 67982 URL: http://svn.reactos.org/svn/reactos?rev=67982&view=rev Log: [MODULES]: Add the [boot|live|hybrid]cd-extras directories to the svn-ignore list. Suggested by David Quintana. Modified: trunk/reactos/modules/ (props changed) Propchange: trunk/reactos/modules/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Sun May 31 16:11:27 2015 @@ -9,3 +9,6 @@ rosapps rostests wallpaper +bootcd_extras +livecd_extras +hybridcd_extras

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