Ros-diffs October 2015

ros-diffs@reactos.org

18 participants
347 discussions

[gedmurphy] 69547: [DEVMGMT] - Delete the old devmgmt and replace it with the new one. - The new one is a temp container for devmgr.dll and simply calls DeviceManager_ExecuteW. Eventually mmc.exe w...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 15 18:04:33 2015 New Revision: 69547 URL: http://svn.reactos.org/svn/reactos?rev=69547&view=rev Log: [DEVMGMT] - Delete the old devmgmt and replace it with the new one. - The new one is a temp container for devmgr.dll and simply calls DeviceManager_ExecuteW. Eventually mmc.exe will replace this module Added: trunk/reactos/base/applications/mscutils/devmgmt/ - copied from r69546, trunk/reactos/base/applications/mscutils/devmgmt_new/ Removed: trunk/reactos/base/applications/mscutils/devmgmt_new/ Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] Thu Oct 15 18:04:33 2015 @@ -1,4 +1,4 @@ -add_subdirectory(devmgmt_new) +add_subdirectory(devmgmt) add_subdirectory(eventvwr) add_subdirectory(servman)

8 years, 11 months

[gedmurphy] 69546: [DEVMGMT] - A few fixes and turn it on in the build to check the build machines are happy

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 15 17:28:08 2015 New Revision: 69546 URL: http://svn.reactos.org/svn/reactos?rev=69546&view=rev Log: [DEVMGMT] - A few fixes and turn it on in the build to check the build machines are happy Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc Modified: trunk/reactos/base/applications/mscutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/CMakeLists.txt [iso-8859-1] Thu Oct 15 17:28:08 2015 @@ -1,4 +1,4 @@ -add_subdirectory(devmgmt) +add_subdirectory(devmgmt_new) add_subdirectory(eventvwr) add_subdirectory(servman) Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/CMakeLists.txt [iso-8859-1] Thu Oct 15 17:28:08 2015 @@ -3,8 +3,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/dll) -list(APPEND SOURCE - devmgmt.cpp) +list(APPEND SOURCE devmgmt.cpp) add_executable(devmgmt ${SOURCE} devmgmt.rc) set_module_type(devmgmt win32gui UNICODE) Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp [iso-8859-1] Thu Oct 15 17:28:08 2015 @@ -1,7 +1,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <cfgmgr32.h> -#include <devmgr\devmgr.h> +#include <devmgr/devmgr.h> int WINAPI wWinMain(HINSTANCE hThisInstance, Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/devmgmt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== Binary files - no diff available.

8 years, 11 months

[gedmurphy] 69545: [DEVMGR] - Kill off the old devmgr and replace it with the new one - The new one now contains the (rewritten) device manager code, is now a C++ library and makes use of the recen...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 15 17:21:37 2015 New Revision: 69545 URL: http://svn.reactos.org/svn/reactos?rev=69545&view=rev Log: [DEVMGR] - Kill off the old devmgr and replace it with the new one - The new one now contains the (rewritten) device manager code, is now a C++ library and makes use of the recently improved ATL Added: trunk/reactos/dll/win32/devmgr/ - copied from r69544, trunk/reactos/dll/win32/devmgr_new/ Removed: trunk/reactos/dll/win32/devmgr_new/ Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Oct 15 17:21:37 2015 @@ -34,7 +34,7 @@ add_subdirectory(cryptui) add_subdirectory(dbghelp) add_subdirectory(dciman32) -add_subdirectory(devmgr_new) +add_subdirectory(devmgr) add_subdirectory(dhcpcsvc) add_subdirectory(dnsapi) add_subdirectory(dwmapi)

8 years, 11 months

[gedmurphy] 69544: [DEVMGR] More unix pleasers

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 15 17:08:22 2015 New Revision: 69544 URL: http://svn.reactos.org/svn/reactos?rev=69544&view=rev Log: [DEVMGR] More unix pleasers Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h Modified: trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/devmg… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/devmgmt/devmgmt.h [iso-8859-1] Thu Oct 15 17:08:22 2015 @@ -2,7 +2,7 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> #pragma once -#include "..\resource.h" +#include "../resource.h" extern HINSTANCE g_hThisInstance; extern HINSTANCE g_hParentInstance;

8 years, 11 months

[gedmurphy] 69543: [DEVMGR] Unixification

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 15 16:57:35 2015 New Revision: 69543 URL: http://svn.reactos.org/svn/reactos?rev=69543&view=rev Log: [DEVMGR] Unixification Modified: trunk/reactos/dll/win32/devmgr_new/precomp.h Modified: trunk/reactos/dll/win32/devmgr_new/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr_new/preco… ============================================================================== --- trunk/reactos/dll/win32/devmgr_new/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr_new/precomp.h [iso-8859-1] Thu Oct 15 16:57:35 2015 @@ -53,7 +53,7 @@ #include <shlwapi.h> #include <strsafe.h> #include <process.h> -#include <WindowsX.h> +#include <windowsx.h> #include <strsafe.h> #include <regstr.h> #include <newdevp.h> @@ -61,7 +61,7 @@ #include <setupapi.h> #include <commctrl.h> #include <cfgmgr32.h> -#include <Uxtheme.h> +#include <uxtheme.h> #include <devguid.h> #include <atlbase.h>

8 years, 11 months

[gedmurphy] 69542: Checking against the build machine

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Thu Oct 15 16:52:05 2015 New Revision: 69542 URL: http://svn.reactos.org/svn/reactos?rev=69542&view=rev Log: Checking against the build machine Modified: trunk/reactos/dll/win32/CMakeLists.txt Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Thu Oct 15 16:52:05 2015 @@ -34,7 +34,7 @@ add_subdirectory(cryptui) add_subdirectory(dbghelp) add_subdirectory(dciman32) -add_subdirectory(devmgr) +add_subdirectory(devmgr_new) add_subdirectory(dhcpcsvc) add_subdirectory(dnsapi) add_subdirectory(dwmapi)

8 years, 11 months

[sginsberg] 69541: [NTOS] Fix (last?) instance of treating hyperspace as global pages

by sginsberg＠svn.reactos.org

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;

8 years, 11 months

[sginsberg] 69540: Somehow missed this in previous commit

by sginsberg＠svn.reactos.org

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; }

8 years, 11 months

[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

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

8 years, 11 months

[gedmurphy] 69538: [DEVMGR] Fix building with RosBE/g++

by gedmurphy＠svn.reactos.org

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()

8 years, 11 months

← Newer
1
...
20
21
22
23
24
25
26
...
35
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2015