Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 69541: [NTOS] Fix (last?) instance of treating hyperspace as global pages
by sginsberg＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: sginsberg Date: Thu Oct 15 16:10:50 2015 New Revision: 69541 URL: http://svn.reactos.org/svn/reactos?rev=69541&view=rev Log: [NTOS] Fix (last?) instance of treating hyperspace as global pages Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Oct 15 16:10:50 2015 @@ -1204,7 +1204,7 @@ PAGE_SIZE - PdeOffset * sizeof(MMPTE)); /* Now write the PTE/PDE entry for hyperspace itself */ - TempPte = ValidKernelPte; + TempPte = ValidKernelPteLocal; TempPte.u.Hard.PageFrameNumber = HyperIndex; PdeOffset = MiGetPdeOffset(HYPER_SPACE); SystemTable[PdeOffset] = TempPte;

1 0

[sginsberg] 69540: Somehow missed this in previous commit
by sginsberg＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: sginsberg Date: Thu Oct 15 12:58:28 2015 New Revision: 69540 URL: http://svn.reactos.org/svn/reactos?rev=69540&view=rev Log: Somehow missed this in previous commit Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mmdbg.c [iso-8859-1] Thu Oct 15 12:58:28 2015 @@ -21,22 +21,18 @@ #define KdpDprintf(...) #endif +BOOLEAN +NTAPI +MmIsSessionAddress( + IN PVOID Address +); + /* GLOBALS ********************************************************************/ PVOID MiDebugMapping = MI_DEBUG_MAPPING; PMMPTE MmDebugPte = NULL; /* FUNCTIONS ******************************************************************/ - -BOOLEAN -NTAPI -MmIsSessionAddress(IN PVOID Address) -{ - // - // No session space support yet - // - return FALSE; -} PVOID NTAPI @@ -47,78 +43,59 @@ MMPTE TempPte; PVOID MappingBaseAddress; - // - // Check if we are called too early - // + /* Check if we are called too early */ if (MmDebugPte == NULL) { - // - // The structures we require aren't initialized yet, fail - // + /* The structures we require aren't initialized yet, fail */ KdpDprintf("MiDbgTranslatePhysicalAddress called too early! " - "Address: 0x%I64x\n", PhysicalAddress); + "Address: 0x%I64x\n", + PhysicalAddress); return NULL; } - // - // FIXME: No support for cache flags yet - // + /* FIXME: No support for cache flags yet */ if ((Flags & (MMDBG_COPY_CACHED | MMDBG_COPY_UNCACHED | MMDBG_COPY_WRITE_COMBINED)) != 0) { - // - // Fail - // - KdpDprintf("MiDbgTranslatePhysicalAddress: Cache Flags not yet supported. " - "Flags: 0x%lx\n", Flags & (MMDBG_COPY_CACHED | - MMDBG_COPY_UNCACHED | - MMDBG_COPY_WRITE_COMBINED)); + /* Fail */ + KdpDprintf("MiDbgTranslatePhysicalAddress: Cache flags not yet supported. " + "Flags: 0x%lx\n", + Flags & (MMDBG_COPY_CACHED | + MMDBG_COPY_UNCACHED | + MMDBG_COPY_WRITE_COMBINED)); return NULL; } - // - // Save the base address of our mapping page - // + /* Save the base address of our mapping page */ MappingBaseAddress = MiPteToAddress(MmDebugPte); - // - // Get the template - // + /* Get the template */ TempPte = ValidKernelPte; - // - // Convert physical address to PFN - // + /* Convert physical address to PFN */ Pfn = (PFN_NUMBER)(PhysicalAddress >> PAGE_SHIFT); /* Check if this could be an I/O mapping */ if (!MiGetPfnEntry(Pfn)) { - // - // FIXME: We don't support this yet - // + /* FIXME: We don't support this yet */ KdpDprintf("MiDbgTranslatePhysicalAddress: I/O Space not yet supported. " - "PFN: 0x%I64x\n", (ULONG64)Pfn); + "PFN: 0x%I64x\n", + (ULONG64)Pfn); return NULL; } else { - // - // Set the PFN in the PTE - // + /* Set the PFN in the PTE */ TempPte.u.Hard.PageFrameNumber = Pfn; } - // - // Map the PTE and invalidate its TLB entry - // + /* Map the PTE and invalidate its TLB entry */ *MmDebugPte = TempPte; KeInvalidateTlbEntry(MappingBaseAddress); - // - // Calculate and return the virtual offset into our mapping page - // + /* Calculate and return the virtual offset into our mapping page */ return (PVOID)((ULONG_PTR)MappingBaseAddress + BYTE_OFFSET(PhysicalAddress)); } @@ -127,19 +104,22 @@ NTAPI MiDbgUnTranslatePhysicalAddress(VOID) { - PVOID MappingBaseAddress = MiPteToAddress(MmDebugPte); - - // - // The address must still be valid at this point - // + PVOID MappingBaseAddress; + + /* The address must still be valid at this point */ + MappingBaseAddress = MiPteToAddress(MmDebugPte); ASSERT(MmIsAddressValid(MappingBaseAddress)); - // - // Clear the mapping PTE and invalidate its TLB entry - // + /* Clear the mapping PTE and invalidate its TLB entry */ MmDebugPte->u.Long = 0; KeInvalidateTlbEntry(MappingBaseAddress); } + + +// +// We handle 8-byte requests at most +// +C_ASSERT(MMDBG_COPY_MAX_SIZE == 8); NTSTATUS NTAPI @@ -148,102 +128,80 @@ IN ULONG Size, IN ULONG Flags) { - NTSTATUS Status; PVOID TargetAddress; ULONG64 PhysicalAddress; PMMPTE PointerPte; - - // - // No local kernel debugging support yet, so don't worry about locking - // + PVOID CopyDestination, CopySource; + + /* No local kernel debugging support yet, so don't worry about locking */ ASSERT(Flags & MMDBG_COPY_UNSAFE); - // - // We only handle 1, 2, 4 and 8 byte requests - // + /* We only handle 1, 2, 4 and 8 byte requests */ if ((Size != 1) && (Size != 2) && (Size != 4) && - (Size != MMDBG_COPY_MAX_SIZE)) - { - // - // Invalid size, fail - // - KdpDprintf("MmDbgCopyMemory: Received Illegal Size 0x%lx\n", Size); + (Size != 8)) + { + /* Invalid size, fail */ + KdpDprintf("MmDbgCopyMemory: Received Illegal Size 0x%lx\n", + Size); return STATUS_INVALID_PARAMETER_3; } - // - // The copy must be aligned - // + /* The copy must be aligned */ if ((Address & (Size - 1)) != 0) { - // - // Fail - // + /* Not allowing unaligned access */ KdpDprintf("MmDbgCopyMemory: Received Unaligned Address 0x%I64x Size %lx\n", - Address, Size); + Address, + Size); return STATUS_INVALID_PARAMETER_3; } - // - // Check if this is physical or virtual copy - // + /* Check for physical or virtual copy */ if (Flags & MMDBG_COPY_PHYSICAL) { - // - // Physical: translate and map it to our mapping space - // - TargetAddress = MiDbgTranslatePhysicalAddress(Address, Flags); - - // - // Check if translation failed - // + /* Physical: translate and map it to our mapping space */ + TargetAddress = MiDbgTranslatePhysicalAddress(Address, + Flags); + + /* Check if translation failed */ if (!TargetAddress) { - // - // Fail - // - KdpDprintf("MmDbgCopyMemory: Failed to Translate Physical Address " - "%I64x\n", Address); + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failed to Translate Physical Address %I64x\n", + Address); return STATUS_UNSUCCESSFUL; } - // - // The address we received must be valid! - // + /* The address we received must be valid! */ ASSERT(MmIsAddressValid(TargetAddress)); } else { - // - // Virtual; truncate it to avoid casts later down - // + /* Virtual; truncate it to avoid casts later down */ TargetAddress = (PVOID)(ULONG_PTR)Address; - // - // Check if the address is invalid - // + /* Make sure address is valid */ if (!MmIsAddressValid(TargetAddress)) { - // - // Fail - // - KdpDprintf("MmDbgCopyMemory: Failing %s for invalid " - "Virtual Address 0x%p\n", + /* Fail */ + KdpDprintf("MmDbgCopyMemory: Failing %s for invalid Virtual Address 0x%p\n", Flags & MMDBG_COPY_WRITE ? "write" : "read", TargetAddress); return STATUS_UNSUCCESSFUL; } - // - // No session space support yet - // - ASSERT(MmIsSessionAddress(TargetAddress) == FALSE); + /* Not handling session space correctly yet */ + if (MmIsSessionAddress(TargetAddress)) + { + /* FIXME */ + } /* If we are going to write to the address, then check if its writable */ PointerPte = MiAddressToPte(TargetAddress); - if ((Flags & MMDBG_COPY_WRITE) && !MI_IS_PAGE_WRITEABLE(PointerPte)) + if ((Flags & MMDBG_COPY_WRITE) && + (!MI_IS_PAGE_WRITEABLE(PointerPte))) { /* Not writable, we need to do a physical copy */ Flags |= MMDBG_COPY_PHYSICAL; @@ -253,73 +211,73 @@ PhysicalAddress += BYTE_OFFSET(Address); /* Translate the physical address */ - TargetAddress = MiDbgTranslatePhysicalAddress(PhysicalAddress, Flags); + TargetAddress = MiDbgTranslatePhysicalAddress(PhysicalAddress, + Flags); /* Check if translation failed */ if (!TargetAddress) { /* Fail */ - KdpDprintf("MmDbgCopyMemory: Failed to translate for write " - "%I64x (%I64x)\n", PhysicalAddress, Address); + KdpDprintf("MmDbgCopyMemory: Failed to translate for write %I64x (%I64x)\n", + PhysicalAddress, + Address); return STATUS_UNSUCCESSFUL; } } } - // - // Use SEH to try to catch anything else somewhat cleanly - // - _SEH2_TRY - { - // - // Check if this is read or write - // - if (Flags & MMDBG_COPY_WRITE) - { - // - // Do the write - // - RtlCopyMemory(TargetAddress, - Buffer, - Size); - } - else - { - // - // Do the read - // - RtlCopyMemory(Buffer, - TargetAddress, - Size); - } - - // - // Copy succeeded - // - Status = STATUS_SUCCESS; - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - // - // Get the exception code - // - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - - // - // Get rid of the mapping if this was a physical copy - // + /* Check what kind of operation this is */ + if (Flags & MMDBG_COPY_WRITE) + { + /* Write */ + CopyDestination = TargetAddress; + CopySource = Buffer; + } + else + { + /* Read */ + CopyDestination = Buffer; + CopySource = TargetAddress; + } + + /* Do the copy */ + switch (Size) + { + case 1: + + /* 1 byte */ + *(PUCHAR)CopyDestination = *(PUCHAR)CopySource; + break; + + case 2: + + /* 2 bytes */ + *(PUSHORT)CopyDestination = *(PUSHORT)CopySource; + break; + + case 4: + + /* 4 bytes */ + *(PULONG)CopyDestination = *(PULONG)CopySource; + break; + + case 8: + + /* 8 bytes */ + *(PULONGLONG)CopyDestination = *(PULONGLONG)CopySource; + break; + + /* Size is sanitized above */ + DEFAULT_UNREACHABLE; + } + + /* Get rid of the mapping if this was a physical copy */ if (Flags & MMDBG_COPY_PHYSICAL) { - // - // Unmap and flush it - // + /* Unmap and flush it */ MiDbgUnTranslatePhysicalAddress(); } - // - // Return status to caller - // - return Status; + /* And we are done */ + return STATUS_SUCCESS; }

1 0

[sginsberg] 69539: [NTOS] Isolate KD a bit by replacing Rtl* memory routines with internal versions. Lets one put breakpoints inside kernel memcpy/memset without making KD very, very sad. Fix MmDbg...
by sginsberg＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: sginsberg Date: Thu Oct 15 12:56:19 2015 New Revision: 69539 URL: http://svn.reactos.org/svn/reactos?rev=69539&view=rev Log: [NTOS] Isolate KD a bit by replacing Rtl* memory routines with internal versions. Lets one put breakpoints inside kernel memcpy/memset without making KD very, very sad. Fix MmDbgCopyMemory to also not use RtlCopyMemory -- there is no need for it since it only performs 1-to-8 byte copies anyway. Minor fixes in the print/prompt routines. Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kdprint.c trunk/reactos/ntoskrnl/kd64/kdtrap.c trunk/reactos/ntoskrnl/mm/ARM3/session.c Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Thu Oct 15 12:56:19 2015 @@ -349,6 +349,24 @@ IN ULONG ChunkSize, IN ULONG Flags, OUT PULONG ActualSize OPTIONAL +); + +// +// Internal memory handling routines for KD isolation +// +VOID +NTAPI +KdpMoveMemory( + IN PVOID Destination, + IN PVOID Source, + IN SIZE_T Length +); + +VOID +NTAPI +KdpZeroMemory( + IN PVOID Destination, + IN SIZE_T Length ); // Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Thu Oct 15 12:56:19 2015 @@ -14,6 +14,32 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpMoveMemory(IN PVOID Destination, + IN PVOID Source, + IN SIZE_T Length) +{ + PCHAR DestinationBytes, SourceBytes; + + /* Copy the buffers 1 byte at a time */ + DestinationBytes = Destination; + SourceBytes = Source; + while (Length--) *DestinationBytes++ = *SourceBytes++; +} + +VOID +NTAPI +KdpZeroMemory(IN PVOID Destination, + IN SIZE_T Length) +{ + PCHAR DestinationBytes; + + /* Zero the buffer 1 byte at a time */ + DestinationBytes = Destination; + while (Length--) *DestinationBytes++ = 0; +} NTSTATUS NTAPI @@ -368,7 +394,7 @@ WaitStateChange->ProgramCounter = (ULONG64)(LONG_PTR)KeGetContextPc(Context); /* Zero out the entire Control Report */ - RtlZeroMemory(&WaitStateChange->AnyControlReport, + KdpZeroMemory(&WaitStateChange->AnyControlReport, sizeof(DBGKD_ANY_CONTROL_REPORT)); /* Now copy the instruction stream and set the count */ @@ -402,7 +428,9 @@ KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) { /* Copy the version block */ - RtlCopyMemory(Version, &KdVersionBlock, sizeof(DBGKD_GET_VERSION64)); + KdpMoveMemory(Version, + &KdVersionBlock, + sizeof(DBGKD_GET_VERSION64)); } VOID @@ -711,7 +739,9 @@ } /* Copy it over to the debugger */ - RtlCopyMemory(Data->Buffer, TargetContext, sizeof(CONTEXT)); + KdpMoveMemory(Data->Buffer, + TargetContext, + sizeof(CONTEXT)); Data->Length = sizeof(CONTEXT); /* Let the debugger set the context now */ @@ -765,7 +795,9 @@ } /* Copy the new context to it */ - RtlCopyMemory(TargetContext, Data->Buffer, sizeof(CONTEXT)); + KdpMoveMemory(TargetContext, + Data->Buffer, + sizeof(CONTEXT)); /* Finish up */ State->ReturnStatus = STATUS_SUCCESS; @@ -819,7 +851,7 @@ } /* Copy what is requested */ - RtlCopyMemory(Data->Buffer, + KdpMoveMemory(Data->Buffer, (PVOID)((ULONG_PTR)TargetContext + ContextEx->Offset), ContextEx->ByteCount); @@ -883,7 +915,7 @@ } /* Copy what is requested */ - RtlCopyMemory((PVOID)((ULONG_PTR)TargetContext + ContextEx->Offset), + KdpMoveMemory((PVOID)((ULONG_PTR)TargetContext + ContextEx->Offset), Data->Buffer, ContextEx->ByteCount); @@ -1639,7 +1671,7 @@ KdpSetContextState(&WaitStateChange, Context); /* Clear the command string structure */ - RtlZeroMemory(&WaitStateChange.u.CommandString, + KdpZeroMemory(&WaitStateChange.u.CommandString, sizeof(DBGKD_COMMAND_STRING)); /* Normalize name string to max */ @@ -1709,15 +1741,22 @@ /* Build the architecture common parts of the message */ KdpSetCommonState(DbgKdExceptionStateChange, Context, &WaitStateChange); - /* Copy the Exception Record and set First Chance flag */ #if !defined(_WIN64) + + /* Convert it and copy it over */ ExceptionRecord32To64((PEXCEPTION_RECORD32)ExceptionRecord, &WaitStateChange.u.Exception.ExceptionRecord); + #else - RtlCopyMemory(&WaitStateChange.u.Exception.ExceptionRecord, + + /* Just copy it directly, no need to convert */ + KdpMoveMemory(&WaitStateChange.u.Exception.ExceptionRecord, ExceptionRecord, sizeof(EXCEPTION_RECORD)); + #endif + + /* Set the First Chance flag */ WaitStateChange.u.Exception.FirstChance = !SecondChanceException; /* Now finish creating the structure */ Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Thu Oct 15 12:56:19 2015 @@ -21,12 +21,15 @@ { STRING Data, Header; DBGKD_DEBUG_IO DebugIo; - USHORT Length = Output->Length; + USHORT Length; /* Copy the string */ - RtlMoveMemory(KdpMessageBuffer, Output->Buffer, Length); + KdpMoveMemory(KdpMessageBuffer, + Output->Buffer, + Output->Length); /* Make sure we don't exceed the KD Packet size */ + Length = Output->Length; if ((sizeof(DBGKD_DEBUG_IO) + Length) > PACKET_MAX_SIZE) { /* Normalize length */ @@ -59,15 +62,16 @@ { STRING Data, Header; DBGKD_DEBUG_IO DebugIo; - ULONG Length = PromptString->Length; + ULONG Length; KDSTATUS Status; /* Copy the string to the message buffer */ - RtlCopyMemory(KdpMessageBuffer, + KdpMoveMemory(KdpMessageBuffer, PromptString->Buffer, PromptString->Length); /* Make sure we don't exceed the KD Packet size */ + Length = PromptString->Length; if ((sizeof(DBGKD_DEBUG_IO) + Length) > PACKET_MAX_SIZE) { /* Normalize length */ @@ -84,7 +88,7 @@ Header.Buffer = (PCHAR)&DebugIo; /* Build the data */ - Data.Length = PromptString->Length; + Data.Length = Length; Data.Buffer = KdpMessageBuffer; /* Send the packet */ @@ -111,10 +115,13 @@ } while (Status != KdPacketReceived); /* Don't copy back a larger response than there is room for */ - Length = min(Length, ResponseString->MaximumLength); + Length = min(Length, + ResponseString->MaximumLength); /* Copy back the string and return the length */ - RtlCopyMemory(ResponseString->Buffer, KdpMessageBuffer, Length); + KdpMoveMemory(ResponseString->Buffer, + KdpMessageBuffer, + Length); ResponseString->Length = (USHORT)Length; /* Success; we don't need to resend */ @@ -141,7 +148,7 @@ /* Save the CPU Control State and save the context */ KiSaveProcessorControlState(&Prcb->ProcessorState); - RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + KdpMoveMemory(&Prcb->ProcessorState.ContextFrame, ContextRecord, sizeof(CONTEXT)); @@ -151,7 +158,7 @@ &Prcb->ProcessorState.ContextFrame); /* Restore the processor state */ - RtlCopyMemory(ContextRecord, + KdpMoveMemory(ContextRecord, &Prcb->ProcessorState.ContextFrame, sizeof(CONTEXT)); KiRestoreProcessorControlState(&Prcb->ProcessorState); @@ -181,7 +188,7 @@ /* Save the CPU Control State and save the context */ KiSaveProcessorControlState(&Prcb->ProcessorState); - RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + KdpMoveMemory(&Prcb->ProcessorState.ContextFrame, ContextRecord, sizeof(CONTEXT)); @@ -192,7 +199,7 @@ &Prcb->ProcessorState.ContextFrame); /* Restore the processor state */ - RtlCopyMemory(ContextRecord, + KdpMoveMemory(ContextRecord, &Prcb->ProcessorState.ContextFrame, sizeof(CONTEXT)); KiRestoreProcessorControlState(&Prcb->ProcessorState); @@ -216,38 +223,48 @@ PVOID CapturedPrompt, CapturedResponse; /* Normalize the lengths */ - PromptLength = min(PromptLength, 512); - MaximumResponseLength = min(MaximumResponseLength, 512); + PromptLength = min(PromptLength, + 512); + MaximumResponseLength = min(MaximumResponseLength, + 512); /* Check if we need to verify the string */ if (PreviousMode != KernelMode) { - /* Capture user-mode buffers */ + /* Handle user-mode buffers safely */ _SEH2_TRY { - ProbeForRead(PromptString, PromptLength, 1); - CapturedPrompt = alloca(512); - RtlMoveMemory(CapturedPrompt, PromptString, PromptLength); + /* Probe the prompt */ + ProbeForRead(PromptString, + PromptLength, + 1); + + /* Capture prompt */ + CapturedPrompt = _alloca(PromptLength); + KdpMoveMemory(CapturedPrompt, + PromptString, + PromptLength); PromptString = CapturedPrompt; - ProbeForWrite(ResponseString, MaximumResponseLength, 1); - CapturedResponse = alloca(512); + /* Probe and make room for response */ + ProbeForWrite(ResponseString, + MaximumResponseLength, + 1); + CapturedResponse = _alloca(MaximumResponseLength); + ResponseString = CapturedResponse; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* Bad string pointer, bail out */ _SEH2_YIELD(return 0); } _SEH2_END; - } - else - { - CapturedResponse = ResponseString; } /* Setup the prompt and response buffers */ PromptBuffer.Buffer = PromptString; PromptBuffer.Length = PromptLength; - ResponseBuffer.Buffer = CapturedResponse; + ResponseBuffer.Buffer = ResponseString; ResponseBuffer.Length = 0; ResponseBuffer.MaximumLength = MaximumResponseLength; @@ -274,10 +291,14 @@ { _SEH2_TRY { - RtlMoveMemory(ResponseString, ResponseBuffer.Buffer, ResponseBuffer.Length); + /* Safely copy back response to user mode */ + KdpMoveMemory(ResponseString, + ResponseBuffer.Buffer, + ResponseBuffer.Length); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* String became invalid after we exited, fail */ _SEH2_YIELD(return 0); } _SEH2_END; @@ -326,13 +347,21 @@ /* Capture user-mode buffers */ _SEH2_TRY { - ProbeForRead(String, Length, 1); - CapturedString = alloca(512); - RtlMoveMemory(CapturedString, String, Length); + /* Probe the string */ + ProbeForRead(String, + Length, + 1); + + /* Capture it */ + CapturedString = alloca(Length); + KdpMoveMemory(CapturedString, + String, + Length); String = CapturedString; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + /* Bad pointer, fail the print */ _SEH2_YIELD(return STATUS_ACCESS_VIOLATION); } _SEH2_END; Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Thu Oct 15 12:56:19 2015 @@ -58,13 +58,14 @@ { BOOLEAN Enable, Handled; PKPRCB Prcb; - NTSTATUS ExceptionCode = ExceptionRecord->ExceptionCode; + NTSTATUS ExceptionCode; /* * Determine whether to pass the exception to the debugger. * First, check if this is a "debug exception", meaning breakpoint * (including debug service), single step and assertion failure exceptions. */ + ExceptionCode = ExceptionRecord->ExceptionCode; if ((ExceptionCode == STATUS_BREAKPOINT) || (ExceptionCode == STATUS_SINGLE_STEP) || (ExceptionCode == STATUS_ASSERTION_FAILURE)) @@ -92,8 +93,8 @@ else if (SecondChanceException == FALSE) { /* - * This isn't a debug exception and the stop-on-exception flag isn't - * set, so don't bother + * This isn't a debug exception and the stop-on-exception flag isn't set, + * so don't bother handling it */ return FALSE; } @@ -107,7 +108,7 @@ */ Prcb = KeGetCurrentPrcb(); KiSaveProcessorControlState(&Prcb->ProcessorState); - RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + KdpMoveMemory(&Prcb->ProcessorState.ContextFrame, ContextRecord, sizeof(CONTEXT)); @@ -118,7 +119,7 @@ SecondChanceException); /* Now restore the processor state, manually again. */ - RtlCopyMemory(ContextRecord, + KdpMoveMemory(ContextRecord, &Prcb->ProcessorState.ContextFrame, sizeof(CONTEXT)); KiRestoreProcessorControlState(&Prcb->ProcessorState); @@ -138,7 +139,7 @@ IN KPROCESSOR_MODE PreviousMode, IN BOOLEAN SecondChanceException) { - BOOLEAN Unload = FALSE; + BOOLEAN Unload; ULONG_PTR ProgramCounter; BOOLEAN Handled; NTSTATUS ReturnStatus; @@ -156,6 +157,7 @@ ProgramCounter = KeGetContextPc(ContextRecord); /* Check what kind of operation was requested from us */ + Unload = FALSE; switch (ExceptionRecord->ExceptionInformation[0]) { /* DbgPrint */ @@ -164,27 +166,24 @@ /* Call the worker routine */ ReturnStatus = KdpPrint((ULONG)KdpGetParameterThree(ContextRecord), (ULONG)KdpGetParameterFour(ContextRecord), - (LPSTR)ExceptionRecord-> - ExceptionInformation[1], - (USHORT)ExceptionRecord-> - ExceptionInformation[2], + (LPSTR)ExceptionRecord->ExceptionInformation[1], + (USHORT)ExceptionRecord->ExceptionInformation[2], PreviousMode, TrapFrame, ExceptionFrame, &Handled); /* Update the return value for the caller */ - KeSetContextReturnRegister(ContextRecord, ReturnStatus); + KeSetContextReturnRegister(ContextRecord, + ReturnStatus); break; /* DbgPrompt */ case BREAKPOINT_PROMPT: /* Call the worker routine */ - ReturnLength = KdpPrompt((LPSTR)ExceptionRecord-> - ExceptionInformation[1], - (USHORT)ExceptionRecord-> - ExceptionInformation[2], + ReturnLength = KdpPrompt((LPSTR)ExceptionRecord->ExceptionInformation[1], + (USHORT)ExceptionRecord->ExceptionInformation[2], (LPSTR)KdpGetParameterThree(ContextRecord), (USHORT)KdpGetParameterFour(ContextRecord), PreviousMode, @@ -276,9 +275,10 @@ IN KPROCESSOR_MODE PreviousMode, IN BOOLEAN SecondChanceException) { - ULONG_PTR ExceptionCommand = ExceptionRecord->ExceptionInformation[0]; + ULONG_PTR ExceptionCommand; /* Check if this was a breakpoint due to DbgPrint or Load/UnloadSymbols */ + ExceptionCommand = ExceptionRecord->ExceptionInformation[0]; if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && (ExceptionRecord->NumberParameters > 0) && ((ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) || Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Thu Oct 15 12:56:19 2015 @@ -42,6 +42,14 @@ /* Initialize the list heads */ InitializeListHead(&MiSessionWsList); InitializeListHead(&MmWorkingSetExpansionHead); +} + +BOOLEAN +NTAPI +MmIsSessionAddress(IN PVOID Address) +{ + /* Check if it is in range */ + return MI_IS_SESSION_ADDRESS(Address) ? TRUE : FALSE; } LCID

1 0

[gedmurphy] 69538: [DEVMGR] Fix building with RosBE/g++
by gedmurphy＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: gedmurphy Date: Thu Oct 15 10:39:06 2015 New Revision: 69538 URL: http://svn.reactos.org/svn/reactos?rev=69538&view=rev Log: [DEVMGR] Fix building with RosBE/g++ Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt trunk/reactos/dll/win32/devmgr_new/api.cpp trunk/reactos/dll/win32/devmgr_new/devmgr.spec Modified: trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/CMakeLists.txt [iso-8859-1] Thu Oct 15 10:39:06 2015 @@ -2,12 +2,11 @@ spec2def(devmgr.dll devmgr.spec ADD_IMPORTLIB) -set_cpp(WITH_RTTI WITH_RUNTIME) +set_cpp(WITH_RTTI WITH_RUNTIME WITH_EXCEPTIONS) if(NOT MSVC) # HACK: this should be enabled globally! add_compile_flags_language("-std=c++11" "CXX") - add_compile_flags("-fexceptions") endif() include_directories( Modified: trunk/reactos/dll/win32/devmgr_new/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/api.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/api.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/api.cpp [iso-8859-1] Thu Oct 15 10:39:06 2015 @@ -17,6 +17,7 @@ */ #include "precomp.h" +#include <devmgr/devmgr.h> #include "devmgmt/MainWindow.h" HINSTANCE hDllInstance = NULL; Modified: trunk/reactos/dll/win32/devmgr_new/devmgr.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgr.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgr.spec [iso-8859-1] Thu Oct 15 10:39:06 2015 @@ -21,7 +21,7 @@ 23 stdcall DeviceProblenWizard_RunDLLA(ptr ptr str long) DeviceProblemWizard_RunDLLA 24 stdcall DeviceProblenWizard_RunDLLW(ptr ptr wstr long) DeviceProblemWizard_RunDLLW -@ stub -private DllCanUnloadNow -@ stub -private DllGetClassObject -@ stub -private DllRegisterServer -@ stub -private DllUnregisterServer +@ stdcall -private DllCanUnloadNow() +@ stdcall -private DllGetClassObject(ptr ptr ptr) +@ stdcall -private DllRegisterServer() +@ stdcall -private DllUnregisterServer()

1 0

[tfaber] 69537: [WIN32K:NTUSER] - THREADINFO::hEventQueueClient is a user handle. Treat it as such. CORE-10207
by tfaber＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: tfaber Date: Thu Oct 15 09:50:12 2015 New Revision: 69537 URL: http://svn.reactos.org/svn/reactos?rev=69537&view=rev Log: [WIN32K:NTUSER] - THREADINFO::hEventQueueClient is a user handle. Treat it as such. CORE-10207 Modified: trunk/reactos/win32ss/user/ntuser/main.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Oct 15 09:50:12 2015 @@ -508,12 +508,12 @@ goto error; } Status = ObReferenceObjectByHandle(ptiCurrent->hEventQueueClient, 0, - *ExEventObjectType, KernelMode, + *ExEventObjectType, UserMode, (PVOID*)&ptiCurrent->pEventQueueServer, NULL); if (!NT_SUCCESS(Status)) { ERR_CH(UserThread, "Failed referencing the event object, Status 0x%08x.\n", Status); - ZwClose(ptiCurrent->hEventQueueClient); + ObCloseHandle(ptiCurrent->hEventQueueClient, UserMode); ptiCurrent->hEventQueueClient = NULL; goto error; } @@ -818,7 +818,7 @@ if (ptiCurrent->hEventQueueClient != NULL) { - ZwClose(ptiCurrent->hEventQueueClient); + ObCloseHandle(ptiCurrent->hEventQueueClient, UserMode); ObDereferenceObject(ptiCurrent->pEventQueueServer); } ptiCurrent->hEventQueueClient = NULL;

1 0

[tfaber] 69536: [WIN32K:NTUSER] - Don't perform thread initialization twice in csrss's UserInitialize thread CORE-10339 #resolve
by tfaber＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: tfaber Date: Thu Oct 15 09:44:20 2015 New Revision: 69536 URL: http://svn.reactos.org/svn/reactos?rev=69536&view=rev Log: [WIN32K:NTUSER] - Don't perform thread initialization twice in csrss's UserInitialize thread CORE-10339 #resolve Modified: trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/ntuser.c Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Thu Oct 15 09:44:20 2015 @@ -379,11 +379,7 @@ /* Check that we were not called with an already existing Win32 thread info */ ptiCurrent = PsGetThreadWin32Thread(Thread); - if (ptiCurrent) - { - ERR_CH(UserThread, "PsGetThreadWin32Thread returned non-NULL thread info!!\n"); - // return STATUS_SUCCESS; - } + NT_ASSERT(ptiCurrent == NULL); /* Allocate a new Win32 thread info */ ptiCurrent = ExAllocatePoolWithTag(NonPagedPool, Modified: trunk/reactos/win32ss/user/ntuser/ntuser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/ntuser… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/ntuser.c [iso-8859-1] Thu Oct 15 09:44:20 2015 @@ -113,7 +113,9 @@ HBITMAP hPattern55AABitmap = NULL; NTSTATUS Status; -// Create Event for Diconnect Desktop. + NT_ASSERT(PsGetCurrentThreadWin32Thread() != NULL); + +// Create Event for Disconnect Desktop. Status = UserCreateWinstaDirectory(); if (!NT_SUCCESS(Status)) return Status; @@ -128,14 +130,7 @@ // Update Shared Device Caps. // Initialize User Screen. // } -// Create ThreadInfo for this Thread! -// { - - /* Initialize the current thread */ - Status = InitThreadCallback(PsGetCurrentThread()); - if (!NT_SUCCESS(Status)) return Status; - -// } + // Set Global SERVERINFO Error flags. // Load Resources.

1 0

[tfaber] 69535: [NPFS] - Don't leave the critical region before releasing ERESOURCE
by tfaber＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: tfaber Date: Thu Oct 15 08:03:40 2015 New Revision: 69535 URL: http://svn.reactos.org/svn/reactos?rev=69535&view=rev Log: [NPFS] - Don't leave the critical region before releasing ERESOURCE Modified: trunk/reactos/drivers/filesystems/npfs/statesup.c Modified: trunk/reactos/drivers/filesystems/npfs/statesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs/s… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs/statesup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs/statesup.c [iso-8859-1] Thu Oct 15 08:03:40 2015 @@ -27,8 +27,8 @@ RemoveEntryList(&Irp->Tail.Overlay.ListEntry); + NpReleaseVcb(); FsRtlExitFileSystem(); - NpReleaseVcb(); Irp->IoStatus.Status = STATUS_CANCELLED; IoCompleteRequest(Irp, IO_NAMED_PIPE_INCREMENT);

1 0

[tfaber] 69534: [NTOS:APPHELP] - Avoid excessive indentation - Minor changes to conform better to kernel style
by tfaber＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: tfaber Date: Thu Oct 15 07:44:25 2015 New Revision: 69534 URL: http://svn.reactos.org/svn/reactos?rev=69534&view=rev Log: [NTOS:APPHELP] - Avoid excessive indentation - Minor changes to conform better to kernel style Modified: trunk/reactos/ntoskrnl/ps/apphelp.c Modified: trunk/reactos/ntoskrnl/ps/apphelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/apphelp.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ps/apphelp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/apphelp.c [iso-8859-1] Thu Oct 15 07:44:25 2015 @@ -182,17 +182,25 @@ FILE_STANDARD_INFORMATION FileStandard; NTSTATUS Status; - Status = ZwQueryInformationFile(ImageHandle, &IoStatusBlock, - &FileBasic, sizeof(FileBasic), FileBasicInformation); + Status = ZwQueryInformationFile(ImageHandle, + &IoStatusBlock, + &FileBasic, + sizeof(FileBasic), + FileBasicInformation); + if (!NT_SUCCESS(Status)) + { + return Status; + } + + Status = ZwQueryInformationFile(ImageHandle, + &IoStatusBlock, + &FileStandard, + sizeof(FileStandard), + FileStandardInformation); if (NT_SUCCESS(Status)) { - Status = ZwQueryInformationFile(ImageHandle, &IoStatusBlock, - &FileStandard, sizeof(FileStandard), FileStandardInformation); - if (NT_SUCCESS(Status)) - { - Entry->Persistent.DateTime = FileBasic.LastWriteTime; - Entry->Persistent.FileSize = FileStandard.EndOfFile; - } + Entry->Persistent.DateTime = FileBasic.LastWriteTime; + Entry->Persistent.FileSize = FileStandard.EndOfFile; } return Status; } @@ -204,14 +212,21 @@ _In_ PVOID FirstStruct, _In_ PVOID SecondStruct) { - LONG lResult = RtlCompareUnicodeString( - &((PSHIM_CACHE_ENTRY)FirstStruct)->Persistent.ImageName, - &((PSHIM_CACHE_ENTRY)SecondStruct)->Persistent.ImageName, TRUE); - - if (lResult < 0) + PSHIM_CACHE_ENTRY FirstEntry = FirstStruct; + PSHIM_CACHE_ENTRY SecondEntry = SecondStruct; + LONG Result; + + Result = RtlCompareUnicodeString(&FirstEntry->Persistent.ImageName, + &SecondEntry->Persistent.ImageName, + TRUE); + if (Result < 0) + { return GenericLessThan; - else if (lResult == 0) + } + else if (Result == 0) + { return GenericEqual; + } return GenericGreaterThan; } @@ -239,47 +254,53 @@ _In_ ULONG DataLength) { PSHIM_PERSISTENT_CACHE_HEADER Header = (PSHIM_PERSISTENT_CACHE_HEADER)Data; + ULONG Cur; + ULONG NumEntries; + UNICODE_STRING String; + SHIM_CACHE_ENTRY Entry = EMPTY_SHIM_ENTRY; + PSHIM_CACHE_ENTRY Result; + PSHIM_PERSISTENT_CACHE_ENTRY Persistent; if (DataLength < CACHE_HEADER_SIZE_NT_52) { DPRINT1("SHIMS: ApphelpCacheParse not enough data for a minimal header (0x%x)\n", DataLength); return STATUS_INVALID_PARAMETER; } - if (Header->Magic == SHIM_CACHE_MAGIC) - { - ULONG Cur; - ULONG NumEntries = Header->NumEntries; - DPRINT1("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries); - for (Cur = 0; Cur < NumEntries; ++Cur) - { - UNICODE_STRING String; - SHIM_CACHE_ENTRY Entry = EMPTY_SHIM_ENTRY; - PSHIM_CACHE_ENTRY Result; - PSHIM_PERSISTENT_CACHE_ENTRY pPersistent = - (PSHIM_PERSISTENT_CACHE_ENTRY)(Data + SHIM_CACHE_HEADER_SIZE + - (Cur * SHIM_PERSISTENT_CACHE_ENTRY_SIZE)); - /* The entry in the Persitent storage is not really a UNICODE_STRING, - so we have to convert the offset into a real pointer before using it. */ - String.Length = pPersistent->ImageName.Length; - String.MaximumLength = pPersistent->ImageName.MaximumLength; - String.Buffer = (PWCHAR)((ULONG_PTR)pPersistent->ImageName.Buffer + Data); - - /* Now we copy all data to a local buffer, that can be safely duplicated by RtlInsert */ - Entry.Persistent = *pPersistent; - ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, &String); - Result = RtlInsertElementGenericTableAvl(&ApphelpShimCache, &Entry, sizeof(Entry), NULL); - if (!Result) - { - DPRINT1("SHIMS: ApphelpCacheParse insert failed\n"); - ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); - return STATUS_INVALID_PARAMETER; - } - InsertTailList(&ApphelpShimCacheAge, &Result->List); - } - return STATUS_SUCCESS; - } - DPRINT1("SHIMS: ApphelpCacheParse found invalid magic (0x%x)\n", Header->Magic); - return STATUS_INVALID_PARAMETER; + + if (Header->Magic != SHIM_CACHE_MAGIC) + { + DPRINT1("SHIMS: ApphelpCacheParse found invalid magic (0x%x)\n", Header->Magic); + return STATUS_INVALID_PARAMETER; + } + + NumEntries = Header->NumEntries; + DPRINT1("SHIMS: ApphelpCacheParse walking %d entries\n", NumEntries); + for (Cur = 0; Cur < NumEntries; ++Cur) + { + Persistent = (PSHIM_PERSISTENT_CACHE_ENTRY)(Data + SHIM_CACHE_HEADER_SIZE + + (Cur * SHIM_PERSISTENT_CACHE_ENTRY_SIZE)); + /* The entry in the Persistent storage is not really a UNICODE_STRING, + so we have to convert the offset into a real pointer before using it. */ + String.Length = Persistent->ImageName.Length; + String.MaximumLength = Persistent->ImageName.MaximumLength; + String.Buffer = (PWCHAR)((ULONG_PTR)Persistent->ImageName.Buffer + Data); + + /* Now we copy all data to a local buffer, that can be safely duplicated by RtlInsert */ + Entry.Persistent = *Persistent; + ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, &String); + Result = RtlInsertElementGenericTableAvl(&ApphelpShimCache, + &Entry, + sizeof(Entry), + NULL); + if (!Result) + { + DPRINT1("SHIMS: ApphelpCacheParse insert failed\n"); + ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); + return STATUS_INVALID_PARAMETER; + } + InsertTailList(&ApphelpShimCacheAge, &Result->List); + } + return STATUS_SUCCESS; } BOOLEAN @@ -292,33 +313,37 @@ ULONG KeyInfoSize, ResultSize; Status = ZwOpenKey(&KeyHandle, KEY_QUERY_VALUE, &AppCompatKeyAttributes); - if (!NT_SUCCESS(Status)) { DPRINT1("SHIMS: ApphelpCacheRead could not even open Session Manager\\AppCompatCache (0x%x)\n", Status); return FALSE; } - Status = ZwQueryValueKey(KeyHandle, &AppCompatCacheValue, - KeyValuePartialInformation, KeyValueInformation, - sizeof(KeyValueObject), &ResultSize); - + Status = ZwQueryValueKey(KeyHandle, + &AppCompatCacheValue, + KeyValuePartialInformation, + KeyValueInformation, + sizeof(KeyValueObject), + &ResultSize); if (Status == STATUS_BUFFER_OVERFLOW) { KeyInfoSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + KeyValueInformation->DataLength; KeyValueInformation = ApphelpAlloc(KeyInfoSize); if (KeyValueInformation != NULL) { - Status = ZwQueryValueKey(KeyHandle, &AppCompatCacheValue, - KeyValuePartialInformation, KeyValueInformation, - KeyInfoSize, &ResultSize); + Status = ZwQueryValueKey(KeyHandle, + &AppCompatCacheValue, + KeyValuePartialInformation, + KeyValueInformation, + KeyInfoSize, + &ResultSize); } } if (NT_SUCCESS(Status) && KeyValueInformation->Type == REG_BINARY) { Status = ApphelpCacheParse(KeyValueInformation->Data, - KeyValueInformation->DataLength); + KeyValueInformation->DataLength); } else { @@ -326,7 +351,9 @@ } if (KeyValueInformation != &KeyValueObject && KeyValueInformation != NULL) + { ApphelpFree(KeyValueInformation); + } ZwClose(KeyHandle); return NT_SUCCESS(Status); @@ -389,7 +416,12 @@ Status = ZwOpenKey(&KeyHandle, KEY_SET_VALUE, &AppCompatKeyAttributes); if (NT_SUCCESS(Status)) { - Status = ZwSetValueKey(KeyHandle, &AppCompatCacheValue, 0, REG_BINARY, Buffer, Length); + Status = ZwSetValueKey(KeyHandle, + &AppCompatCacheValue, + 0, + REG_BINARY, + Buffer, + Length); ZwClose(KeyHandle); } else @@ -418,10 +450,10 @@ { ExInitializeResourceLite(&ApphelpCacheLock); RtlInitializeGenericTableAvl(&ApphelpShimCache, - ApphelpShimCacheCompareRoutine, - ApphelpShimCacheAllocateRoutine, - ApphelpShimCacheFreeRoutine, - NULL); + ApphelpShimCacheCompareRoutine, + ApphelpShimCacheAllocateRoutine, + ApphelpShimCacheFreeRoutine, + NULL); InitializeListHead(&ApphelpShimCacheAge); ApphelpCacheEnabled = ApphelpCacheRead(); } @@ -452,12 +484,16 @@ UNICODE_STRING LocalImageName; _SEH2_TRY { - ProbeForRead(ServiceData, sizeof(APPHELP_CACHE_SERVICE_LOOKUP), sizeof(ULONG)); + ProbeForRead(ServiceData, + sizeof(APPHELP_CACHE_SERVICE_LOOKUP), + sizeof(ULONG)); LocalImageName = ServiceData->ImageName; *ImageHandle = ServiceData->ImageHandle; if (LocalImageName.Length && LocalImageName.Buffer) { - ProbeForRead(LocalImageName.Buffer, LocalImageName.Length * sizeof(WCHAR), 1); + ProbeForRead(LocalImageName.Buffer, + LocalImageName.Length * sizeof(WCHAR), + 1); ApphelpDuplicateUnicodeString(ImageName, &LocalImageName); Status = STATUS_SUCCESS; } @@ -484,7 +520,9 @@ PWSTR Buffer = Entry->Persistent.ImageName.Buffer; RemoveEntryList(&Entry->List); if (RtlDeleteElementGenericTableAvl(&ApphelpShimCache, Entry)) + { ApphelpFree(Buffer); + } return STATUS_SUCCESS; } return STATUS_NOT_FOUND; @@ -496,45 +534,52 @@ _In_ HANDLE ImageHandle) { NTSTATUS Status = STATUS_NOT_FOUND; - - if (ApphelpCacheTryAcquireLock()) - { - SHIM_CACHE_ENTRY Lookup = EMPTY_SHIM_ENTRY; - PSHIM_CACHE_ENTRY Entry; - Lookup.Persistent.ImageName = *ImageName; - Entry = RtlLookupElementGenericTableAvl(&ApphelpShimCache, &Lookup); - if (Entry) - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: found %wZ\n", ImageName); - if (ImageHandle == INVALID_HANDLE_VALUE) - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: ok\n"); - /* just return if we know it, do not query file info */ - Status = STATUS_SUCCESS; - } - else if (NT_SUCCESS(ApphelpCacheQueryInfo(ImageHandle, &Lookup)) && - Lookup.Persistent.DateTime.QuadPart == Entry->Persistent.DateTime.QuadPart && - Lookup.Persistent.FileSize.QuadPart == Entry->Persistent.FileSize.QuadPart) - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: found & validated\n"); - Status = STATUS_SUCCESS; - /* move it to the front to keep it alive */ - RemoveEntryList(&Entry->List); - InsertHeadList(&ApphelpShimCacheAge, &Entry->List); - } - else - { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: file info mismatch\n"); - /* Could not read file info, or it did not match, drop it from the cache */ - ApphelpCacheRemoveEntryNolock(Entry); - } + SHIM_CACHE_ENTRY Lookup = EMPTY_SHIM_ENTRY; + PSHIM_CACHE_ENTRY Entry; + + if (!ApphelpCacheTryAcquireLock()) + { + return Status; + } + + Lookup.Persistent.ImageName = *ImageName; + Entry = RtlLookupElementGenericTableAvl(&ApphelpShimCache, &Lookup); + if (Entry == NULL) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: could not find %wZ\n", ImageName); + goto Cleanup; + } + + DPRINT1("SHIMS: ApphelpCacheLookupEntry: found %wZ\n", ImageName); + if (ImageHandle == INVALID_HANDLE_VALUE) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: ok\n"); + /* just return if we know it, do not query file info */ + Status = STATUS_SUCCESS; + } + else + { + Status = ApphelpCacheQueryInfo(ImageHandle, &Lookup); + if (NT_SUCCESS(Status) && + Lookup.Persistent.DateTime.QuadPart == Entry->Persistent.DateTime.QuadPart && + Lookup.Persistent.FileSize.QuadPart == Entry->Persistent.FileSize.QuadPart) + { + DPRINT1("SHIMS: ApphelpCacheLookupEntry: found & validated\n"); + Status = STATUS_SUCCESS; + /* move it to the front to keep it alive */ + RemoveEntryList(&Entry->List); + InsertHeadList(&ApphelpShimCacheAge, &Entry->List); } else { - DPRINT1("SHIMS: ApphelpCacheLookupEntry: could not find %wZ\n", ImageName); - } - ApphelpCacheReleaseLock(); - } + DPRINT1("SHIMS: ApphelpCacheLookupEntry: file info mismatch\n"); + /* Could not read file info, or it did not match, drop it from the cache */ + ApphelpCacheRemoveEntryNolock(Entry); + } + } + +Cleanup: + ApphelpCacheReleaseLock(); return Status; } @@ -584,49 +629,57 @@ if (ImageHandle != INVALID_HANDLE_VALUE) { Status = ApphelpCacheQueryInfo(ImageHandle, &Entry); - } - - if (NT_SUCCESS(Status)) - { - /* Use ImageName for the lookup, don't actually duplicate it */ - Entry.Persistent.ImageName = *ImageName; - Lookup = RtlLookupElementGenericTableFullAvl(&ApphelpShimCache, &Entry, - &NodeOrParent, &SearchResult); - if (Lookup) - { - DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Entry already exists, reusing it\n"); - /* Unlink the found item, so we can put it back at the front, - and copy the earlier obtained file info*/ - RemoveEntryList(&Lookup->List); - Lookup->Persistent.DateTime = Entry.Persistent.DateTime; - Lookup->Persistent.FileSize = Entry.Persistent.FileSize; - } - else - { - DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Inserting new Entry\n"); - /* Insert a new entry, with its own copy of the ImageName */ - ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, ImageName); - Lookup = RtlInsertElementGenericTableFullAvl(&ApphelpShimCache, - &Entry, sizeof(Entry), 0, NodeOrParent, SearchResult); - if (!Lookup) - { - ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); - Status = STATUS_NO_MEMORY; - } - } - if (Lookup) - { - /* Either we re-used an existing item, or we inserted a new one, keep it alive */ - InsertHeadList(&ApphelpShimCacheAge, &Lookup->List); - if (RtlNumberGenericTableElementsAvl(&ApphelpShimCache) > MAX_SHIM_ENTRIES) - { - PSHIM_CACHE_ENTRY Remove; - DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Cache growing too big, dropping oldest item\n"); - Remove = CONTAINING_RECORD(ApphelpShimCacheAge.Blink, SHIM_CACHE_ENTRY, List); - Status = ApphelpCacheRemoveEntryNolock(Remove); - } - } - } + if (!NT_SUCCESS(Status)) + { + goto Cleanup; + } + } + + /* Use ImageName for the lookup, don't actually duplicate it */ + Entry.Persistent.ImageName = *ImageName; + Lookup = RtlLookupElementGenericTableFullAvl(&ApphelpShimCache, + &Entry, + &NodeOrParent, &SearchResult); + if (Lookup) + { + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Entry already exists, reusing it\n"); + /* Unlink the found item, so we can put it back at the front, + and copy the earlier obtained file info*/ + RemoveEntryList(&Lookup->List); + Lookup->Persistent.DateTime = Entry.Persistent.DateTime; + Lookup->Persistent.FileSize = Entry.Persistent.FileSize; + } + else + { + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Inserting new Entry\n"); + /* Insert a new entry, with its own copy of the ImageName */ + ApphelpDuplicateUnicodeString(&Entry.Persistent.ImageName, ImageName); + Lookup = RtlInsertElementGenericTableFullAvl(&ApphelpShimCache, + &Entry, + sizeof(Entry), + 0, + NodeOrParent, + SearchResult); + if (!Lookup) + { + ApphelpFreeUnicodeString(&Entry.Persistent.ImageName); + Status = STATUS_NO_MEMORY; + } + } + if (Lookup) + { + /* Either we re-used an existing item, or we inserted a new one, keep it alive */ + InsertHeadList(&ApphelpShimCacheAge, &Lookup->List); + if (RtlNumberGenericTableElementsAvl(&ApphelpShimCache) > MAX_SHIM_ENTRIES) + { + PSHIM_CACHE_ENTRY Remove; + DPRINT1("SHIMS: ApphelpCacheUpdateEntry: Cache growing too big, dropping oldest item\n"); + Remove = CONTAINING_RECORD(ApphelpShimCacheAge.Blink, SHIM_CACHE_ENTRY, List); + Status = ApphelpCacheRemoveEntryNolock(Remove); + } + } + +Cleanup: ApphelpCacheReleaseLock(); return Status; } @@ -650,18 +703,17 @@ ApphelpCacheDump(VOID) { PLIST_ENTRY ListEntry; + PSHIM_CACHE_ENTRY Entry; DPRINT1("SHIMS: NtApphelpCacheControl( Dumping entries, newset to oldest )\n"); ApphelpCacheAcquireLock(); ListEntry = ApphelpShimCacheAge.Flink; while (ListEntry != &ApphelpShimCacheAge) { - PSHIM_CACHE_ENTRY Entry = CONTAINING_RECORD(ListEntry, SHIM_CACHE_ENTRY, List); - DPRINT1("Entry: %S\n", Entry->Persistent.ImageName.Buffer); - DPRINT1("DateTime High: 0x%x, Low: 0x%x\n", - Entry->Persistent.DateTime.HighPart, Entry->Persistent.DateTime.LowPart); - DPRINT1("FileSize High: 0x%x, Low: 0x%x\n", - Entry->Persistent.FileSize.HighPart, Entry->Persistent.FileSize.LowPart); + Entry = CONTAINING_RECORD(ListEntry, SHIM_CACHE_ENTRY, List); + DPRINT1("Entry: %wZ\n", &Entry->Persistent.ImageName); + DPRINT1("DateTime: 0x%I64x\n", Entry->Persistent.DateTime.QuadPart); + DPRINT1("FileSize: 0x%I64x\n", Entry->Persistent.FileSize.QuadPart); DPRINT1("Flags: 0x%x\n", Entry->CompatFlags); ListEntry = ListEntry->Flink; }

1 0

[tfaber] 69533: [PARPORT] - Add missing OBJ_KERNEL_HANDLE CORE-10207
by tfaber＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: tfaber Date: Thu Oct 15 07:16:39 2015 New Revision: 69533 URL: http://svn.reactos.org/svn/reactos?rev=69533&view=rev Log: [PARPORT] - Add missing OBJ_KERNEL_HANDLE CORE-10207 Modified: trunk/reactos/drivers/parallel/parport/fdo.c Modified: trunk/reactos/drivers/parallel/parport/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/parallel/parport/f… ============================================================================== --- trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/parallel/parport/fdo.c [iso-8859-1] Thu Oct 15 07:16:39 2015 @@ -292,7 +292,7 @@ L"\\Registry\\Machine\\HARDWARE\\DeviceMap\\PARALLEL PORTS"); InitializeObjectAttributes(&ObjectAttributes, &KeyName, - OBJ_CASE_INSENSITIVE, + OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL);

1 0

[sginsberg] 69532: [NTOS] Fix mapping of working set list page -- it should be local. Get rid of MI_MAKE_LOCAL_PAGE and use ValidKernelPdeLocal/ValidKernelPteLocal consistently. This is what they e...
by sginsberg＠svn.reactos.org 15 Oct '15

15 Oct '15

Author: sginsberg Date: Thu Oct 15 01:49:26 2015 New Revision: 69532 URL: http://svn.reactos.org/svn/reactos?rev=69532&view=rev Log: [NTOS] Fix mapping of working set list page -- it should be local. Get rid of MI_MAKE_LOCAL_PAGE and use ValidKernelPdeLocal/ValidKernelPteLocal consistently. This is what they exist for! We should now hopefully not be creating any global pages when we don't want them. Next step; fix flushing. Bonus: Use the right lock in MiSessionLeader Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h trunk/reactos/ntoskrnl/include/internal/arm/mm.h trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/session.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] Thu Oct 15 01:49:26 2015 @@ -85,7 +85,6 @@ #define PFN_FROM_PXE(v) ((v)->u.Hard.PageFrameNumber) /* Macros for portable PTE modification */ -#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) #define MI_MAKE_CLEAN_PAGE(x) ((x)->u.Hard.Dirty = 0) #define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) Modified: trunk/reactos/ntoskrnl/include/internal/arm/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/mm.h [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -74,7 +74,6 @@ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) /* Macros for portable PTE modification */ -#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.NonGlobal = 1) #define MI_MAKE_DIRTY_PAGE(x) #define MI_MAKE_CLEAN_PAGE(x) #define MI_MAKE_ACCESSED_PAGE(x) Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -89,7 +89,6 @@ #define PFN_FROM_PTE(v) ((v)->u.Hard.PageFrameNumber) /* Macros for portable PTE modification */ -#define MI_MAKE_LOCAL_PAGE(x) ((x)->u.Hard.Global = 0) #define MI_MAKE_DIRTY_PAGE(x) ((x)->u.Hard.Dirty = 1) #define MI_MAKE_CLEAN_PAGE(x) ((x)->u.Hard.Dirty = 0) #define MI_MAKE_ACCESSED_PAGE(x) ((x)->u.Hard.Accessed = 1) Modified: trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/hypermap.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/hypermap.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -44,9 +44,8 @@ // // Build the PTE // - TempPte = ValidKernelPte; + TempPte = ValidKernelPteLocal; TempPte.u.Hard.PageFrameNumber = Page; - MI_MAKE_LOCAL_PAGE(&TempPte); // Hyperspace is local! // // Pick the first hyperspace PTE Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -492,8 +492,8 @@ MI_SET_USAGE(MI_USAGE_PAGE_TABLE); MI_SET_PROCESS2("Kernel"); PageFrameIndex = MiRemoveAnyPage(0); + TempPde = ValidKernelPdeLocal; TempPde.u.Hard.PageFrameNumber = PageFrameIndex; - TempPde.u.Hard.Global = FALSE; // Hyperspace is local! MI_WRITE_VALID_PTE(StartPde, TempPde); /* Flush the TLB */ @@ -542,6 +542,7 @@ MI_SET_USAGE(MI_USAGE_PAGE_TABLE); MI_SET_PROCESS2("Kernel WS List"); PageFrameIndex = MiRemoveAnyPage(0); + TempPte = ValidKernelPteLocal; TempPte.u.Hard.PageFrameNumber = PageFrameIndex; /* Map the working set list */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -1163,10 +1163,8 @@ HyperTable = MiPteToAddress(PointerPte); /* Now write the PTE/PDE entry for the working set list index itself */ - TempPte = ValidKernelPte; + TempPte = ValidKernelPteLocal; TempPte.u.Hard.PageFrameNumber = WsListIndex; - /* Hyperspace is local */ - MI_MAKE_LOCAL_PAGE(&TempPte); PdeOffset = MiAddressToPteOffset(MmWorkingSetList); HyperTable[PdeOffset] = TempPte; Modified: trunk/reactos/ntoskrnl/mm/ARM3/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/session.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/session.c [iso-8859-1] Thu Oct 15 01:49:26 2015 @@ -162,9 +162,9 @@ KIRQL OldIrql; /* Set the flag while under the expansion lock */ - OldIrql = KeAcquireQueuedSpinLock(LockQueueExpansionLock); + OldIrql = MiAcquireExpansionLock(); Process->Vm.Flags.SessionLeader = TRUE; - KeReleaseQueuedSpinLock(LockQueueExpansionLock, OldIrql); + MiReleaseExpansionLock(OldIrql); } ULONG @@ -517,7 +517,7 @@ } /* Write a valid PDE for it */ - TempPde.u.Long = ValidKernelPdeLocal.u.Long; + TempPde = ValidKernelPdeLocal; TempPde.u.Hard.PageFrameNumber = PageFrameIndex; MI_WRITE_VALID_PDE(PointerPde, TempPde); @@ -548,7 +548,7 @@ } /* Write a valid PTE for it */ - TempPte.u.Long = ValidKernelPteLocal.u.Long; + TempPte = ValidKernelPteLocal; MI_MAKE_DIRTY_PAGE(&TempPte); TempPte.u.Hard.PageFrameNumber = PageFrameIndex; @@ -667,7 +667,7 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Loop the global PTEs */ - TempPte.u.Long = ValidKernelPte.u.Long; + TempPte = ValidKernelPte; for (i = 0; i < MiSessionDataPages; i++) { /* Get a zeroed colored zero page */ @@ -707,7 +707,7 @@ } /* Fill the PTE out */ - TempPde.u.Long = ValidKernelPdeLocal.u.Long; + TempPde = ValidKernelPdeLocal; TempPde.u.Hard.PageFrameNumber = SessionPageDirIndex; /* Setup, allocate, fill out the MmSessionSpace PTE */ @@ -720,7 +720,7 @@ ASSERT(MI_PFN_ELEMENT(SessionPageDirIndex)->u1.WsIndex == 0); /* Loop all the local PTEs for it */ - TempPte.u.Long = ValidKernelPteLocal.u.Long; + TempPte = ValidKernelPteLocal; PointerPte = MiAddressToPte(MmSessionSpace); for (i = 0; i < MiSessionDataPages; i++) {

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