Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 61089: [NTOSKRNL] Try to fix the failed assertions in testbot
by tkreuzer＠svn.reactos.org 24 Nov '13

24 Nov '13

Author: tkreuzer Date: Sun Nov 24 15:54:03 2013 New Revision: 61089 URL: http://svn.reactos.org/svn/reactos?rev=61089&view=rev Log: [NTOSKRNL] Try to fix the failed assertions in testbot Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Nov 24 15:54:03 2013 @@ -1125,6 +1125,10 @@ return Status; } } + + /* Probe the page, since it's PDE might not be synced */ + (void)*((volatile char*)BaseAddress + FileOffset - BaseOffset); + /* * Retrieve the page from the cache segment that we actually want. */

1 0

[tkreuzer] 61088: [NTOSKRNL] Make use of MiQueryPageTableReferences
by tkreuzer＠svn.reactos.org 24 Nov '13

24 Nov '13

Author: tkreuzer Date: Sun Nov 24 12:51:45 2013 New Revision: 61088 URL: http://svn.reactos.org/svn/reactos?rev=61088&view=rev Log: [NTOSKRNL] Make use of MiQueryPageTableReferences Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=61… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Nov 24 12:51:45 2013 @@ -851,7 +851,7 @@ if ((SwapEntry || Page) && ((PVOID)Address < MmSystemRangeStart)) { ASSERT(AddressSpace != MmGetKernelAddressSpace()); - if (MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) + if (MiQueryPageTableReferences((PVOID)Address) == 0) { /* No PTE relies on this PDE. Release it */ KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); @@ -1185,13 +1185,13 @@ Address =(PVOID)((ULONG_PTR)Address + (PAGE_SIZE * PTE_COUNT))) { /* At this point all references should be dead */ - if (MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] != 0) + if (MiQueryPageTableReferences(Address) != 0) { DPRINT1("Process %p, Address %p, UsedPageTableEntries %lu\n", Process, Address, - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]); - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0); + MiQueryPageTableReferences(Address)); + ASSERT(MiQueryPageTableReferences(Address) == 0); } pointerPde = MiAddressToPde(Address); /* Unlike in ARM3, we don't necesarrily free the PDE page as soon as reference reaches 0,

1 0

[tfaber] 61087: [NTOS:MM] - Add missing \n to DPRINT in MmGetPhysicalAddress
by tfaber＠svn.reactos.org 24 Nov '13

24 Nov '13

Author: tfaber Date: Sun Nov 24 09:26:24 2013 New Revision: 61087 URL: http://svn.reactos.org/svn/reactos?rev=61087&view=rev Log: [NTOS:MM] - Add missing \n to DPRINT in MmGetPhysicalAddress Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Nov 24 09:26:24 2013 @@ -4871,7 +4871,7 @@ } } - DPRINT1("MM:MmGetPhysicalAddressFailed base address was %p", Address); + DPRINT1("MM:MmGetPhysicalAddressFailed base address was %p\n", Address); PhysicalAddress.QuadPart = 0; return PhysicalAddress; }

1 0

[tkreuzer] 61086: [NTOSKRNL] - Use MI_IS_MAPPED_PTE instead of unportable bit fiddling - Use MiDecrementPageTableReferences instead of manually messing with MmWorkingSetList, which is not portable ...
by tkreuzer＠svn.reactos.org 23 Nov '13

23 Nov '13

Author: tkreuzer Date: Sat Nov 23 22:34:20 2013 New Revision: 61086 URL: http://svn.reactos.org/svn/reactos?rev=61086&view=rev Log: [NTOSKRNL] - Use MI_IS_MAPPED_PTE instead of unportable bit fiddling - Use MiDecrementPageTableReferences instead of manually messing with MmWorkingSetList, which is not portable - Make MmGetPhysicalAddress portable Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sat Nov 23 22:34:20 2013 @@ -290,6 +290,15 @@ ASSERT(MiProtoPteToPte(NewPte) == PointerPte); } +FORCEINLINE +BOOLEAN +MI_IS_MAPPED_PTE(PMMPTE PointerPte) +{ + /// FIXME + __debugbreak(); + return (PointerPte->u.Long & 0xFFFFFC01 != 0); +} + VOID FORCEINLINE MmInitGlobalKernelPageDirectory(VOID) Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Nov 23 22:34:20 2013 @@ -950,6 +950,14 @@ NewPte->u.Subsect.SubsectionAddressHigh = (Offset & 0xFFFFF80) >> 7; } +FORCEINLINE +BOOLEAN +MI_IS_MAPPED_PTE(PMMPTE PointerPte) +{ + /// \todo Make this reasonable code, this is UGLY! + return ((PointerPte->u.Long & 0xFFFFFC01) != 0); +} + #endif // Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Nov 23 22:34:20 2013 @@ -503,7 +503,6 @@ KIRQL OldIrql; BOOLEAN AddressGap = FALSE; PSUBSECTION Subsection; - PUSHORT UsedPageTableEntries; /* Get out if this is a fake VAD, RosMm will free the marea pages */ if ((Vad) && (Vad->u.VadFlags.Spare == 1)) return; @@ -560,7 +559,6 @@ /* Now we should have a valid PDE, mapped in, and still have some VA */ ASSERT(PointerPde->u.Hard.Valid == 1); ASSERT(Va <= EndingAddress); - UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Va)]; /* Check if this is a section VAD with gaps in it */ if ((AddressGap) && (LastPrototypePte)) @@ -590,11 +588,10 @@ TempPte = *PointerPte; if (TempPte.u.Long) { - *UsedPageTableEntries -= 1; - ASSERT((*UsedPageTableEntries) < PTE_COUNT); + MiDecrementPageTableReferences((PVOID)Va); /* Check if the PTE is actually mapped in */ - if (TempPte.u.Long & 0xFFFFFC01) + if (MI_IS_MAPPED_PTE(&TempPte)) { /* Are we dealing with section VAD? */ if ((LastPrototypePte) && (PrototypePte > LastPrototypePte)) @@ -652,7 +649,8 @@ /* The PDE should still be valid at this point */ ASSERT(PointerPde->u.Hard.Valid == 1); - if (*UsedPageTableEntries == 0) + /* Check remaining PTE count (go back 1 page due to above loop) */ + if (MiQueryPageTableReferences((PVOID)(Va - PAGE_SIZE)) == 0) { if (PointerPde->u.Long != 0) { @@ -4078,7 +4076,7 @@ Status = STATUS_CONFLICTING_ADDRESSES; goto FailPath; } - + if ((AllocationType & MEM_RESET) == MEM_RESET) { /// @todo HACK: pretend success @@ -4253,6 +4251,7 @@ // TempPte.u.Long = 0; TempPte.u.Soft.Protection = ProtectionMask; + NT_ASSERT(TempPte.u.Long != 0); // // Get the PTE, PDE and the last PTE for this address range @@ -4832,4 +4831,50 @@ return Status; } + +PHYSICAL_ADDRESS +NTAPI +MmGetPhysicalAddress(PVOID Address) +{ + PHYSICAL_ADDRESS PhysicalAddress; + MMPDE TempPde; + MMPTE TempPte; + + /* Check if the PXE/PPE/PDE is valid */ + if ( +#if (_MI_PAGING_LEVELS == 4) + (MiAddressToPxe(Address)->u.Hard.Valid) && +#endif +#if (_MI_PAGING_LEVELS >= 3) + (MiAddressToPpe(Address)->u.Hard.Valid) && +#endif + (MiAddressToPde(Address)->u.Hard.Valid)) + { + /* Check for large pages */ + TempPde = *MiAddressToPde(Address); + if (TempPde.u.Hard.LargePage) + { + /* Physical address is base page + large page offset */ + PhysicalAddress.QuadPart = TempPde.u.Hard.PageFrameNumber << PAGE_SHIFT; + PhysicalAddress.QuadPart += ((ULONG_PTR)Address & (PAGE_SIZE * PTE_PER_PAGE - 1)); + return PhysicalAddress; + } + + /* Check if the PTE is valid */ + TempPte = *MiAddressToPte(Address); + if (TempPte.u.Hard.Valid) + { + /* Physical address is base page + page offset */ + PhysicalAddress.QuadPart = TempPte.u.Hard.PageFrameNumber << PAGE_SHIFT; + PhysicalAddress.QuadPart += ((ULONG_PTR)Address & (PAGE_SIZE - 1)); + return PhysicalAddress; + } + } + + DPRINT1("MM:MmGetPhysicalAddressFailed base address was %p", Address); + PhysicalAddress.QuadPart = 0; + return PhysicalAddress; +} + + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Sat Nov 23 22:34:20 2013 @@ -348,27 +348,6 @@ return Pte.u.Hard.Valid ? Pte.u.Hard.PageFrameNumber : 0; } -PHYSICAL_ADDRESS -NTAPI -MmGetPhysicalAddress(PVOID Address) -{ - PHYSICAL_ADDRESS p; - MMPTE Pte; - - Pte.u.Long = MiGetPteValueForProcess(NULL, Address); - if (Pte.u.Hard.Valid) - { - p.QuadPart = Pte.u.Hard.PageFrameNumber * PAGE_SIZE; - p.u.LowPart |= (ULONG_PTR)Address & (PAGE_SIZE - 1); - } - else - { - p.QuadPart = 0; - } - - return p; -} - BOOLEAN NTAPI MmIsPagePresent(PEPROCESS Process, PVOID Address) Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sat Nov 23 22:34:20 2013 @@ -1004,32 +1004,6 @@ MmUnmapPageTable(Pt); } -/* - * @implemented - */ -PHYSICAL_ADDRESS NTAPI -MmGetPhysicalAddress(PVOID vaddr) -/* - * FUNCTION: Returns the physical address corresponding to a virtual address - */ -{ - PHYSICAL_ADDRESS p; - ULONG Pte; - - DPRINT("MmGetPhysicalAddress(vaddr %p)\n", vaddr); - Pte = MmGetPageEntryForProcess(NULL, vaddr); - if (Pte != 0 && (Pte & PA_PRESENT)) - { - p.QuadPart = PAGE_MASK(Pte); - p.u.LowPart |= (ULONG_PTR)vaddr & (PAGE_SIZE - 1); - } - else - { - p.QuadPart = 0; - } - return p; -} - VOID INIT_FUNCTION NTAPI

1 0

[ekohl] 61085: [FORMATTING] Fix indentation. No code changes!
by ekohl＠svn.reactos.org 23 Nov '13

23 Nov '13

Author: ekohl Date: Sat Nov 23 22:08:48 2013 New Revision: 61085 URL: http://svn.reactos.org/svn/reactos?rev=61085&view=rev Log: [FORMATTING] Fix indentation. No code changes! Modified: trunk/reactos/drivers/bus/pci/fdo.c trunk/reactos/drivers/bus/pci/pci.c trunk/reactos/drivers/bus/pci/pci.h trunk/reactos/drivers/bus/pci/pdo.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/bus/pci/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/fdo.c?rev=… Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… Modified: trunk/reactos/drivers/bus/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.h?rev=… Modified: trunk/reactos/drivers/bus/pci/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pdo.c?rev=…

1 0

[ekohl] 61084: [FORMATTING] Fix indentation. No code changes!
by ekohl＠svn.reactos.org 23 Nov '13

23 Nov '13

Author: ekohl Date: Sat Nov 23 18:36:05 2013 New Revision: 61084 URL: http://svn.reactos.org/svn/reactos?rev=61084&view=rev Log: [FORMATTING] Fix indentation. No code changes! Modified: trunk/reactos/drivers/bus/pcmcia/fdo.c trunk/reactos/drivers/bus/pcmcia/pcmcia.c trunk/reactos/drivers/bus/pcmcia/pcmcia.h trunk/reactos/drivers/bus/pcmcia/pdo.c Modified: trunk/reactos/drivers/bus/pcmcia/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/fdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcmcia/fdo.c [iso-8859-1] Sat Nov 23 18:36:05 2013 @@ -16,12 +16,12 @@ PcmciaFdoPlugPlay(PPCMCIA_FDO_EXTENSION FdoExt, PIRP Irp) { - UNREFERENCED_PARAMETER(FdoExt); + UNREFERENCED_PARAMETER(FdoExt); - UNIMPLEMENTED; + UNIMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; + return STATUS_NOT_SUPPORTED; } Modified: trunk/reactos/drivers/bus/pcmcia/pcmcia.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.c [iso-8859-1] Sat Nov 23 18:36:05 2013 @@ -20,16 +20,16 @@ PcmciaCreateClose(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - UNREFERENCED_PARAMETER(DeviceObject); - - Irp->IoStatus.Status = STATUS_SUCCESS; - Irp->IoStatus.Information = 0; - - DPRINT("PCMCIA: Create/Close\n"); - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return STATUS_SUCCESS; + UNREFERENCED_PARAMETER(DeviceObject); + + Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Information = 0; + + DPRINT("PCMCIA: Create/Close\n"); + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return STATUS_SUCCESS; } DRIVER_DISPATCH PcmciaDeviceControl; @@ -39,27 +39,27 @@ PcmciaDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - NTSTATUS Status; - - UNREFERENCED_PARAMETER(DeviceObject); - - DPRINT("PCMCIA: DeviceIoControl\n"); - - Irp->IoStatus.Information = 0; - - switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) - { - default: - DPRINT1("PCMCIA: Unknown ioctl code: %x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); - Status = STATUS_NOT_SUPPORTED; - } - - Irp->IoStatus.Status = Status; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + + UNREFERENCED_PARAMETER(DeviceObject); + + DPRINT("PCMCIA: DeviceIoControl\n"); + + Irp->IoStatus.Information = 0; + + switch (IrpSp->Parameters.DeviceIoControl.IoControlCode) + { + default: + DPRINT1("PCMCIA: Unknown ioctl code: %x\n", IrpSp->Parameters.DeviceIoControl.IoControlCode); + Status = STATUS_NOT_SUPPORTED; + } + + Irp->IoStatus.Status = Status; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } DRIVER_UNLOAD PcmciaUnload; @@ -68,8 +68,8 @@ NTAPI PcmciaUnload(PDRIVER_OBJECT DriverObject) { - UNREFERENCED_PARAMETER(DriverObject); - DPRINT("PCMCIA: Unload\n"); + UNREFERENCED_PARAMETER(DriverObject); + DPRINT("PCMCIA: Unload\n"); } DRIVER_DISPATCH PcmciaPlugPlay; @@ -79,19 +79,19 @@ PcmciaPlugPlay(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; - - DPRINT("PCMCIA: PnP\n"); - if (Common->IsFDO) - { - return PcmciaFdoPlugPlay((PPCMCIA_FDO_EXTENSION)Common, - Irp); - } - else - { - return PcmciaPdoPlugPlay((PPCMCIA_PDO_EXTENSION)Common, - Irp); - } + PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; + + DPRINT("PCMCIA: PnP\n"); + if (Common->IsFDO) + { + return PcmciaFdoPlugPlay((PPCMCIA_FDO_EXTENSION)Common, + Irp); + } + else + { + return PcmciaPdoPlugPlay((PPCMCIA_PDO_EXTENSION)Common, + Irp); + } } DRIVER_DISPATCH PcmciaPower; @@ -101,78 +101,80 @@ PcmciaPower(PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - NTSTATUS Status; - - switch (IrpSp->MinorFunction) - { - case IRP_MN_QUERY_POWER: - /* I don't see any reason that we should care */ - DPRINT("PCMCIA: IRP_MN_QUERY_POWER\n"); - Status = STATUS_SUCCESS; - break; - - case IRP_MN_POWER_SEQUENCE: - DPRINT("PCMCIA: IRP_MN_POWER_SEQUENCE\n"); - RtlCopyMemory(IrpSp->Parameters.PowerSequence.PowerSequence, - &Common->PowerSequence, - sizeof(POWER_SEQUENCE)); - Status = STATUS_SUCCESS; - break; - - case IRP_MN_WAIT_WAKE: - /* Not really sure about this */ - DPRINT("PCMCIA: IRP_MN_WAIT_WAKE\n"); - Status = STATUS_NOT_SUPPORTED; - break; - - case IRP_MN_SET_POWER: - DPRINT("PCMCIA: IRP_MN_SET_POWER\n"); - if (IrpSp->Parameters.Power.Type == SystemPowerState) - { - Common->SystemPowerState = IrpSp->Parameters.Power.State.SystemState; - - Status = STATUS_SUCCESS; - } - else - { - Common->DevicePowerState = IrpSp->Parameters.Power.State.DeviceState; - - /* Update the POWER_SEQUENCE struct */ - if (Common->DevicePowerState <= PowerDeviceD1) - Common->PowerSequence.SequenceD1++; - - if (Common->DevicePowerState <= PowerDeviceD2) - Common->PowerSequence.SequenceD2++; - - if (Common->DevicePowerState <= PowerDeviceD3) - Common->PowerSequence.SequenceD3++; - - /* Start the underlying device if we are handling this for a PDO */ - if (!Common->IsFDO) - Status = PcmciaPdoSetPowerState((PPCMCIA_PDO_EXTENSION)Common); - else - Status = STATUS_SUCCESS; - } - - /* Report that we changed state to the Power Manager */ - PoSetPowerState(DeviceObject, IrpSp->Parameters.Power.Type, IrpSp->Parameters.Power.State); - break; - - default: - DPRINT1("PCMCIA: Invalid MN code in MJ_POWER handler %x\n", IrpSp->MinorFunction); - ASSERT(FALSE); - Status = STATUS_INVALID_DEVICE_REQUEST; - break; - } - - Irp->IoStatus.Status = Status; - Irp->IoStatus.Information = 0; - - IoCompleteRequest(Irp, IO_NO_INCREMENT); - - return Status; + PPCMCIA_COMMON_EXTENSION Common = DeviceObject->DeviceExtension; + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + NTSTATUS Status; + + switch (IrpSp->MinorFunction) + { + case IRP_MN_QUERY_POWER: + /* I don't see any reason that we should care */ + DPRINT("PCMCIA: IRP_MN_QUERY_POWER\n"); + Status = STATUS_SUCCESS; + break; + + case IRP_MN_POWER_SEQUENCE: + DPRINT("PCMCIA: IRP_MN_POWER_SEQUENCE\n"); + RtlCopyMemory(IrpSp->Parameters.PowerSequence.PowerSequence, + &Common->PowerSequence, + sizeof(POWER_SEQUENCE)); + Status = STATUS_SUCCESS; + break; + + case IRP_MN_WAIT_WAKE: + /* Not really sure about this */ + DPRINT("PCMCIA: IRP_MN_WAIT_WAKE\n"); + Status = STATUS_NOT_SUPPORTED; + break; + + case IRP_MN_SET_POWER: + DPRINT("PCMCIA: IRP_MN_SET_POWER\n"); + if (IrpSp->Parameters.Power.Type == SystemPowerState) + { + Common->SystemPowerState = IrpSp->Parameters.Power.State.SystemState; + + Status = STATUS_SUCCESS; + } + else + { + Common->DevicePowerState = IrpSp->Parameters.Power.State.DeviceState; + + /* Update the POWER_SEQUENCE struct */ + if (Common->DevicePowerState <= PowerDeviceD1) + Common->PowerSequence.SequenceD1++; + + if (Common->DevicePowerState <= PowerDeviceD2) + Common->PowerSequence.SequenceD2++; + + if (Common->DevicePowerState <= PowerDeviceD3) + Common->PowerSequence.SequenceD3++; + + /* Start the underlying device if we are handling this for a PDO */ + if (!Common->IsFDO) + Status = PcmciaPdoSetPowerState((PPCMCIA_PDO_EXTENSION)Common); + else + Status = STATUS_SUCCESS; + } + + /* Report that we changed state to the Power Manager */ + PoSetPowerState(DeviceObject, + IrpSp->Parameters.Power.Type, + IrpSp->Parameters.Power.State); + break; + + default: + DPRINT1("PCMCIA: Invalid MN code in MJ_POWER handler %x\n", IrpSp->MinorFunction); + ASSERT(FALSE); + Status = STATUS_INVALID_DEVICE_REQUEST; + break; + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; } DRIVER_ADD_DEVICE PcmciaAddDevice; @@ -182,38 +184,39 @@ PcmciaAddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT PhysicalDeviceObject) { - PPCMCIA_FDO_EXTENSION FdoExt; - PDEVICE_OBJECT Fdo; - NTSTATUS Status; - - DPRINT("PCMCIA: AddDevice\n"); - - Status = IoCreateDevice(DriverObject, - sizeof(*FdoExt), - NULL, - FILE_DEVICE_BUS_EXTENDER, - FILE_DEVICE_SECURE_OPEN, - FALSE, - &Fdo); - if (!NT_SUCCESS(Status)) return Status; - - FdoExt = Fdo->DeviceExtension; - - RtlZeroMemory(FdoExt, sizeof(*FdoExt)); - - InitializeListHead(&FdoExt->ChildDeviceList); - KeInitializeSpinLock(&FdoExt->Lock); - - FdoExt->Common.Self = Fdo; - FdoExt->Common.IsFDO = TRUE; - FdoExt->Common.State = dsStopped; - - FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, - PhysicalDeviceObject); - - Fdo->Flags &= ~DO_DEVICE_INITIALIZING; - - return STATUS_SUCCESS; + PPCMCIA_FDO_EXTENSION FdoExt; + PDEVICE_OBJECT Fdo; + NTSTATUS Status; + + DPRINT("PCMCIA: AddDevice\n"); + + Status = IoCreateDevice(DriverObject, + sizeof(*FdoExt), + NULL, + FILE_DEVICE_BUS_EXTENDER, + FILE_DEVICE_SECURE_OPEN, + FALSE, + &Fdo); + if (!NT_SUCCESS(Status)) + return Status; + + FdoExt = Fdo->DeviceExtension; + + RtlZeroMemory(FdoExt, sizeof(*FdoExt)); + + InitializeListHead(&FdoExt->ChildDeviceList); + KeInitializeSpinLock(&FdoExt->Lock); + + FdoExt->Common.Self = Fdo; + FdoExt->Common.IsFDO = TRUE; + FdoExt->Common.State = dsStopped; + + FdoExt->Ldo = IoAttachDeviceToDeviceStack(Fdo, + PhysicalDeviceObject); + + Fdo->Flags &= ~DO_DEVICE_INITIALIZING; + + return STATUS_SUCCESS; } NTSTATUS @@ -221,41 +224,41 @@ DriverEntry(PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { - RTL_QUERY_REGISTRY_TABLE QueryTable[2]; - NTSTATUS Status; - - UNREFERENCED_PARAMETER(RegistryPath); - - DPRINT1("PCMCIA: DriverEntry\n"); - - DriverObject->MajorFunction[IRP_MJ_CREATE] = PcmciaCreateClose; - DriverObject->MajorFunction[IRP_MJ_CLOSE] = PcmciaCreateClose; - DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PcmciaDeviceControl; - DriverObject->MajorFunction[IRP_MJ_PNP] = PcmciaPlugPlay; - DriverObject->MajorFunction[IRP_MJ_POWER] = PcmciaPower; - - DriverObject->DriverExtension->AddDevice = PcmciaAddDevice; - DriverObject->DriverUnload = PcmciaUnload; - - RtlZeroMemory(QueryTable, sizeof(RTL_QUERY_REGISTRY_TABLE) * 2); - - QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; - QueryTable[0].Name = L"IoctlInterface"; - QueryTable[0].EntryContext = &IoctlEnabled; - - Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, - L"Pcmcia\\Parameters", - QueryTable, - NULL, - NULL); - if (!NT_SUCCESS(Status)) - { - /* Key not present so assume disabled */ - IoctlEnabled = FALSE; - } - - DPRINT("PCMCIA: Ioctl interface %s\n", - (IoctlEnabled ? "enabled" : "disabled")); - - return STATUS_SUCCESS; -} + RTL_QUERY_REGISTRY_TABLE QueryTable[2]; + NTSTATUS Status; + + UNREFERENCED_PARAMETER(RegistryPath); + + DPRINT1("PCMCIA: DriverEntry\n"); + + DriverObject->MajorFunction[IRP_MJ_CREATE] = PcmciaCreateClose; + DriverObject->MajorFunction[IRP_MJ_CLOSE] = PcmciaCreateClose; + DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL] = PcmciaDeviceControl; + DriverObject->MajorFunction[IRP_MJ_PNP] = PcmciaPlugPlay; + DriverObject->MajorFunction[IRP_MJ_POWER] = PcmciaPower; + + DriverObject->DriverExtension->AddDevice = PcmciaAddDevice; + DriverObject->DriverUnload = PcmciaUnload; + + RtlZeroMemory(QueryTable, sizeof(RTL_QUERY_REGISTRY_TABLE) * 2); + + QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_REQUIRED; + QueryTable[0].Name = L"IoctlInterface"; + QueryTable[0].EntryContext = &IoctlEnabled; + + Status = RtlQueryRegistryValues(RTL_REGISTRY_SERVICES, + L"Pcmcia\\Parameters", + QueryTable, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Key not present so assume disabled */ + IoctlEnabled = FALSE; + } + + DPRINT("PCMCIA: Ioctl interface %s\n", + (IoctlEnabled ? "enabled" : "disabled")); + + return STATUS_SUCCESS; +} Modified: trunk/reactos/drivers/bus/pcmcia/pcmcia.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pcmcia.… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pcmcia.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcmcia/pcmcia.h [iso-8859-1] Sat Nov 23 18:36:05 2013 @@ -4,32 +4,36 @@ #include <stdio.h> #include <ntddk.h> -typedef enum { - dsStopped, - dsStarted, - dsPaused, - dsRemoved, - dsSurpriseRemoved +typedef enum +{ + dsStopped, + dsStarted, + dsPaused, + dsRemoved, + dsSurpriseRemoved } PCMCIA_DEVICE_STATE; -typedef struct _PCMCIA_COMMON_EXTENSION { - PDEVICE_OBJECT Self; - BOOLEAN IsFDO; - POWER_SEQUENCE PowerSequence; - PCMCIA_DEVICE_STATE State; - DEVICE_POWER_STATE DevicePowerState; - SYSTEM_POWER_STATE SystemPowerState; +typedef struct _PCMCIA_COMMON_EXTENSION +{ + PDEVICE_OBJECT Self; + BOOLEAN IsFDO; + POWER_SEQUENCE PowerSequence; + PCMCIA_DEVICE_STATE State; + DEVICE_POWER_STATE DevicePowerState; + SYSTEM_POWER_STATE SystemPowerState; } PCMCIA_COMMON_EXTENSION, *PPCMCIA_COMMON_EXTENSION; -typedef struct _PCMCIA_PDO_EXTENSION { - PCMCIA_COMMON_EXTENSION Common; +typedef struct _PCMCIA_PDO_EXTENSION +{ + PCMCIA_COMMON_EXTENSION Common; } PCMCIA_PDO_EXTENSION, *PPCMCIA_PDO_EXTENSION; -typedef struct _PCMCIA_FDO_EXTENSION { - PCMCIA_COMMON_EXTENSION Common; - PDEVICE_OBJECT Ldo; - LIST_ENTRY ChildDeviceList; - KSPIN_LOCK Lock; +typedef struct _PCMCIA_FDO_EXTENSION +{ + PCMCIA_COMMON_EXTENSION Common; + PDEVICE_OBJECT Ldo; + LIST_ENTRY ChildDeviceList; + KSPIN_LOCK Lock; } PCMCIA_FDO_EXTENSION, *PPCMCIA_FDO_EXTENSION; /* pdo.c */ Modified: trunk/reactos/drivers/bus/pcmcia/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcmcia/pdo.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcmcia/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcmcia/pdo.c [iso-8859-1] Sat Nov 23 18:36:05 2013 @@ -16,23 +16,23 @@ PcmciaPdoPlugPlay(PPCMCIA_PDO_EXTENSION PdoExt, PIRP Irp) { - UNREFERENCED_PARAMETER(PdoExt); + UNREFERENCED_PARAMETER(PdoExt); - UNIMPLEMENTED; + UNIMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_NOT_SUPPORTED; + return STATUS_NOT_SUPPORTED; } NTSTATUS NTAPI PcmciaPdoSetPowerState(PPCMCIA_PDO_EXTENSION PdoExt) { - UNREFERENCED_PARAMETER(PdoExt); + UNREFERENCED_PARAMETER(PdoExt); - UNIMPLEMENTED; + UNIMPLEMENTED; - return STATUS_SUCCESS; + return STATUS_SUCCESS; }

1 0

[tkreuzer] 61083: Revert a change from the previous version. MI_WRITE_VALID_PTE only works on invalid PTEs. Thanks to Thomas for noticing.
by tkreuzer＠svn.reactos.org 23 Nov '13

23 Nov '13

Author: tkreuzer Date: Sat Nov 23 01:42:33 2013 New Revision: 61083 URL: http://svn.reactos.org/svn/reactos?rev=61083&view=rev Log: Revert a change from the previous version. MI_WRITE_VALID_PTE only works on invalid PTEs. Thanks to Thomas for noticing. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Nov 23 01:42:33 2013 @@ -1917,7 +1917,7 @@ ASSERT(PointerPte->u.Hard.Valid == 1); ASSERT(TempPte.u.Hard.Valid == 1); ASSERT(PointerPte->u.Hard.PageFrameNumber == TempPte.u.Hard.PageFrameNumber); - MI_WRITE_VALID_PTE(PointerPte, TempPte); + *PointerPte = TempPte; // // Flush the TLB

1 0

[aandrejevic] 61082: [FAST486] The 486 doesn't have AC, VIF, VIP or ID. Fix and simplify POPF. [NTVDM] Fix the count in the XMS copy function (INT 15h, AH = 87h).
by aandrejevic＠svn.reactos.org 23 Nov '13

23 Nov '13

Author: aandrejevic Date: Sat Nov 23 01:34:03 2013 New Revision: 61082 URL: http://svn.reactos.org/svn/reactos?rev=61082&view=rev Log: [FAST486] The 486 doesn't have AC, VIF, VIP or ID. Fix and simplify POPF. [NTVDM] Fix the count in the XMS copy function (INT 15h, AH = 87h). Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h branches/ntvdm/lib/fast486/fast486.c branches/ntvdm/lib/fast486/opcodes.c branches/ntvdm/subsystems/ntvdm/bios.c Modified: branches/ntvdm/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/include/reactos/libs/fast… ============================================================================== --- branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ branches/ntvdm/include/reactos/libs/fast486/fast486.h [iso-8859-1] Sat Nov 23 01:34:03 2013 @@ -341,12 +341,8 @@ ULONG Reserved2 : 1; ULONG Rf : 1; ULONG Vm : 1; - ULONG Ac : 1; - ULONG Vif : 1; - ULONG Vip : 1; - ULONG Id : 1; - - // ULONG Reserved : 10; + + // ULONG Reserved : 14; }; } FAST486_FLAGS_REG, *PFAST486_FLAGS_REG; Modified: branches/ntvdm/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/fast486.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/fast486.c [iso-8859-1] Sat Nov 23 01:34:03 2013 @@ -330,7 +330,7 @@ State->SegmentRegs[FAST486_REG_GS].Base, State->SegmentRegs[FAST486_REG_GS].Limit, State->SegmentRegs[FAST486_REG_GS].Dpl); - DPRINT1("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", + DPRINT1("\nFlags: %08X (%s %s %s %s %s %s %s %s %s %s %s %s) Iopl: %u\n", State->Flags.Long, State->Flags.Cf ? "CF" : "cf", State->Flags.Pf ? "PF" : "pf", @@ -344,9 +344,6 @@ State->Flags.Nt ? "NT" : "nt", State->Flags.Rf ? "RF" : "rf", State->Flags.Vm ? "VM" : "vm", - State->Flags.Ac ? "AC" : "ac", - State->Flags.Vif ? "VIF" : "vif", - State->Flags.Vip ? "VIP" : "vip", State->Flags.Iopl); DPRINT1("\nControl Registers:\n" "CR0 = %08X\tCR2 = %08X\tCR3 = %08X\n", Modified: branches/ntvdm/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/fast486/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/fast486/opcodes.c [iso-8859-1] Sat Nov 23 01:34:03 2013 @@ -4163,121 +4163,37 @@ { BOOLEAN Size = State->SegmentRegs[FAST486_REG_CS].Size; INT Cpl = Fast486GetCurrentPrivLevel(State); - ULONG NewFlags; + FAST486_FLAGS_REG NewFlags; NO_LOCK_PREFIX(); TOGGLE_OPSIZE(Size); /* Pop the new flags */ - if (!Fast486StackPop(State, &NewFlags)) - { - /* Exception occurred */ - return FALSE; - } - - if (!State->Flags.Vm) - { - /* Check the current privilege level */ - if (Cpl == 0) - { - /* Supervisor */ - - /* Set the flags */ - if (Size) - { - /* Memorize the old state of RF */ - BOOLEAN OldRf = State->Flags.Rf; - - State->Flags.Long = NewFlags; - - /* Restore VM and RF */ - State->Flags.Vm = FALSE; - State->Flags.Rf = OldRf; - - /* Clear VIF and VIP */ - State->Flags.Vif = State->Flags.Vip = FALSE; - } - else State->Flags.LowWord = LOWORD(NewFlags); - - /* Restore the reserved bits */ - State->Flags.AlwaysSet = TRUE; - State->Flags.Reserved0 = FALSE; - State->Flags.Reserved1 = FALSE; - } - else - { - /* User */ - - /* Memorize the old state of IF and IOPL */ - BOOLEAN OldIf = State->Flags.If; - UINT OldIopl = State->Flags.Iopl; - - /* Set the flags */ - if (Size) - { - /* Memorize the old state of RF */ - BOOLEAN OldRf = State->Flags.Rf; - - State->Flags.Long = NewFlags; - - /* Restore VM and RF */ - State->Flags.Vm = FALSE; - State->Flags.Rf = OldRf; - - /* Clear VIF and VIP */ - State->Flags.Vif = State->Flags.Vip = FALSE; - } - else State->Flags.LowWord = LOWORD(NewFlags); - - /* Restore the reserved bits and IOPL */ - State->Flags.AlwaysSet = TRUE; - State->Flags.Reserved0 = FALSE; - State->Flags.Reserved1 = FALSE; - State->Flags.Iopl = OldIopl; - - /* Check if the user doesn't have the privilege to change IF */ - if (Cpl > State->Flags.Iopl) - { - /* Restore IF */ - State->Flags.If = OldIf; - } - } - } - else - { - /* Check the IOPL */ - if (State->Flags.Iopl == 3) - { - if (Size) - { - /* Memorize the old state of RF, VIF and VIP */ - BOOLEAN OldRf = State->Flags.Rf; - BOOLEAN OldVif = State->Flags.Vif; - BOOLEAN OldVip = State->Flags.Vip; - - State->Flags.Long = NewFlags; - - /* Restore VM, RF, VIF and VIP */ - State->Flags.Vm = TRUE; - State->Flags.Rf = OldRf; - State->Flags.Vif = OldVif; - State->Flags.Vip = OldVip; - } - else State->Flags.LowWord = LOWORD(NewFlags); - - /* Restore the reserved bits and IOPL */ - State->Flags.AlwaysSet = TRUE; - State->Flags.Reserved0 = FALSE; - State->Flags.Reserved1 = FALSE; - State->Flags.Iopl = 3; - } - else - { - /* Call the VM86 monitor */ - Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, 0); - } - - } + if (!Fast486StackPop(State, &NewFlags.Long)) + { + /* Exception occurred */ + return FALSE; + } + + if (State->Flags.Vm && (State->Flags.Iopl != 3)) + { + /* Call the VM86 monitor */ + Fast486ExceptionWithErrorCode(State, FAST486_EXCEPTION_GP, 0); + return TRUE; + } + + State->Flags.Cf = NewFlags.Cf; + State->Flags.Pf = NewFlags.Pf; + State->Flags.Af = NewFlags.Af; + State->Flags.Zf = NewFlags.Zf; + State->Flags.Sf = NewFlags.Sf; + State->Flags.Tf = NewFlags.Tf; + State->Flags.Df = NewFlags.Df; + State->Flags.Of = NewFlags.Of; + State->Flags.Nt = NewFlags.Nt; + + if (Cpl == 0) State->Flags.Iopl = NewFlags.Iopl; + if (Cpl <= State->Flags.Iopl) State->Flags.If = NewFlags.If; return TRUE; } Modified: branches/ntvdm/subsystems/ntvdm/bios.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/subsystems/ntvdm/bios.c?r… ============================================================================== --- branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] (original) +++ branches/ntvdm/subsystems/ntvdm/bios.c [iso-8859-1] Sat Nov 23 01:34:03 2013 @@ -1226,7 +1226,7 @@ /* Copy Extended Memory */ case 0x87: { - WORD Count = getCX() * 2 - 1; + DWORD Count = (DWORD)getCX() * 2; PFAST486_GDT_ENTRY Gdt = (PFAST486_GDT_ENTRY)SEG_OFF_TO_PTR(getES(), getSI()); DWORD SourceBase = Gdt[2].Base + (Gdt[2].BaseMid << 16) + (Gdt[2].BaseHigh << 24); DWORD SourceLimit = Gdt[2].Limit + (Gdt[2].LimitHigh << 16);

1 0

[tkreuzer] 61081: [NTOSKRNL] - Add hacks to MmMapViewInSessionSpace and MmUnmapViewInSessionSpace to check for legacy (non ARM3) sections (image sections) and (un)map them in system space instead. ...
by tkreuzer＠svn.reactos.org 23 Nov '13

23 Nov '13

Author: tkreuzer Date: Sat Nov 23 00:43:06 2013 New Revision: 61081 URL: http://svn.reactos.org/svn/reactos?rev=61081&view=rev Log: [NTOSKRNL] - Add hacks to MmMapViewInSessionSpace and MmUnmapViewInSessionSpace to check for legacy (non ARM3) sections (image sections) and (un)map them in system space instead. - Fix MmCommitSessionMappedView (it wasn't resetting the PointerPte to the start, when processing the PTE range a second time) - Remove an ASSERT that didn't allow unmapping session space mappings, since that works (see CORE-6729) - Change a write to a PTE to using MI_WRITE_VALID_PTE Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sat Nov 23 00:43:06 2013 @@ -1917,7 +1917,7 @@ ASSERT(PointerPte->u.Hard.Valid == 1); ASSERT(TempPte.u.Hard.Valid == 1); ASSERT(PointerPte->u.Hard.PageFrameNumber == TempPte.u.Hard.PageFrameNumber); - *PointerPte = TempPte; + MI_WRITE_VALID_PTE(PointerPte, TempPte); // // Flush the TLB @@ -2256,9 +2256,6 @@ ULONG Size; PCONTROL_AREA ControlArea; PAGED_CODE(); - - /* Only global mappings supported for now */ - ASSERT(Session == &MmSession); /* Remove this mapping */ KeAcquireGuardedMutex(Session->SystemSpaceViewLockPointer); @@ -2783,6 +2780,12 @@ { PAGED_CODE(); + // HACK + if (MiIsRosSectionObject(Section)) + { + return MmMapViewInSystemSpace(Section, MappedBase, ViewSize); + } + /* Process must be in a session */ if (PsGetCurrentProcess()->ProcessInSession == FALSE) { @@ -2806,6 +2809,12 @@ MmUnmapViewInSessionSpace(IN PVOID MappedBase) { PAGED_CODE(); + + // HACK + if (!MI_IS_SESSION_ADDRESS(MappedBase)) + { + return MmUnmapViewInSystemSpace(MappedBase); + } /* Process must be in a session */ if (PsGetCurrentProcess()->ProcessInSession == FALSE) @@ -2990,6 +2999,7 @@ ASSERT(TempPte.u.Long != 0); /* Loop all prototype PTEs to be committed */ + PointerPte = ProtoPte; while (PointerPte < LastProtoPte) { /* Make sure the PTE is already invalid */

1 0

[hbelusca] 61080: [REGEDIT] - Fix few French resources. - Support F2 key for renaming keys/values. Patch by Edijs Kolesnikovics CORE-7615 #resolve #comment Committed in revision 61080. Thanks!
by hbelusca＠svn.reactos.org 22 Nov '13

22 Nov '13

Author: hbelusca Date: Fri Nov 22 22:59:19 2013 New Revision: 61080 URL: http://svn.reactos.org/svn/reactos?rev=61080&view=rev Log: [REGEDIT] - Fix few French resources. - Support F2 key for renaming keys/values. Patch by Edijs Kolesnikovics CORE-7615 #resolve #comment Committed in revision 61080. Thanks! Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc trunk/reactos/base/applications/regedit/lang/cs-CZ.rc trunk/reactos/base/applications/regedit/lang/de-DE.rc trunk/reactos/base/applications/regedit/lang/el-GR.rc trunk/reactos/base/applications/regedit/lang/en-US.rc trunk/reactos/base/applications/regedit/lang/es-ES.rc trunk/reactos/base/applications/regedit/lang/fr-FR.rc trunk/reactos/base/applications/regedit/lang/he-IL.rc trunk/reactos/base/applications/regedit/lang/hu-HU.rc trunk/reactos/base/applications/regedit/lang/id-ID.rc trunk/reactos/base/applications/regedit/lang/it-IT.rc trunk/reactos/base/applications/regedit/lang/ja-JP.rc trunk/reactos/base/applications/regedit/lang/ko-KR.rc trunk/reactos/base/applications/regedit/lang/nl-NL.rc trunk/reactos/base/applications/regedit/lang/no-NO.rc trunk/reactos/base/applications/regedit/lang/pl-PL.rc trunk/reactos/base/applications/regedit/lang/pt-BR.rc trunk/reactos/base/applications/regedit/lang/pt-PT.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ru-RU.rc trunk/reactos/base/applications/regedit/lang/sk-SK.rc trunk/reactos/base/applications/regedit/lang/sl-SI.rc trunk/reactos/base/applications/regedit/lang/sv-SE.rc trunk/reactos/base/applications/regedit/lang/th-TH.rc trunk/reactos/base/applications/regedit/lang/tr-TR.rc trunk/reactos/base/applications/regedit/lang/uk-UA.rc trunk/reactos/base/applications/regedit/lang/zh-CN.rc trunk/reactos/base/applications/regedit/lang/zh-TW.rc Modified: trunk/reactos/base/applications/regedit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/bg-BG.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -29,9 +29,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/cs-CZ.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/de-DE.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/el-GR.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/en-US.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/es-ES.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -27,9 +27,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/fr-FR.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -27,9 +27,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* @@ -82,8 +83,8 @@ MENUITEM SEPARATOR MENUITEM "&Permissions...", ID_EDIT_PERMISSIONS MENUITEM SEPARATOR - MENUITEM "&Supprimer\tDel", ID_EDIT_DELETE - MENUITEM "Ren&ommer", ID_EDIT_RENAME + MENUITEM "&Supprimer\tSuppr", ID_EDIT_DELETE + MENUITEM "Ren&ommer\tF2", ID_EDIT_RENAME MENUITEM SEPARATOR MENUITEM "&Copier le nom de la clÃ©", ID_EDIT_COPYKEYNAME MENUITEM SEPARATOR @@ -118,8 +119,8 @@ MENUITEM "&Modifier", ID_EDIT_MODIFY MENUITEM "Modifier les donnÃ©es binaires", ID_EDIT_MODIFY_BIN MENUITEM SEPARATOR - MENUITEM "Supprimer\tDel", ID_EDIT_DELETE - MENUITEM "&Renommer", ID_EDIT_RENAME + MENUITEM "Supprimer\tSuppr", ID_EDIT_DELETE + MENUITEM "&Renommer\tF2", ID_EDIT_RENAME END POPUP "" BEGIN @@ -149,8 +150,8 @@ END MENUITEM "Cherche", ID_EDIT_FIND MENUITEM SEPARATOR - MENUITEM "Supprimer", ID_TREE_DELETE - MENUITEM "&Renommer", ID_TREE_RENAME + MENUITEM "Supprimer\tSuppr", ID_TREE_DELETE + MENUITEM "&Renommer\tF2", ID_TREE_RENAME MENUITEM SEPARATOR MENUITEM "&Exporter", ID_TREE_EXPORT MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED Modified: trunk/reactos/base/applications/regedit/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/he-IL.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -25,9 +25,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/hu-HU.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -25,9 +25,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/id-ID.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/it-IT.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -27,9 +27,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ja-JP.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ko-KR.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -9,9 +9,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/nl-NL.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/no-NO.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pl-PL.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -31,9 +31,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-BR.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -25,9 +25,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/pt-PT.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -25,9 +25,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ro-RO.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -27,9 +27,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/ru-RU.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sk-SK.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -9,9 +9,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sl-SI.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/sv-SE.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/th-TH.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/tr-TR.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/uk-UA.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -25,9 +25,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-CN.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -24,9 +24,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /* Modified: trunk/reactos/base/applications/regedit/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/lang/zh-TW.rc [iso-8859-1] Fri Nov 22 22:59:19 2013 @@ -26,9 +26,10 @@ BEGIN VK_DELETE, ID_EDIT_DELETE, VIRTKEY, NOINVERT "^F", ID_EDIT_FIND + VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT + VK_F2, ID_EDIT_RENAME, VIRTKEY, NOINVERT VK_F3, ID_EDIT_FINDNEXT, VIRTKEY, NOINVERT VK_F5, ID_VIEW_REFRESH, VIRTKEY, NOINVERT - VK_F1, ID_HELP_HELPTOPICS, VIRTKEY, NOINVERT END /*

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