Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 68841: [NTOS:KD] - Fix the condition check when setting twice (or more) the same breakpoint. - Implement support for deferred breakpoints. For more information, see: http://www.osronline...
by hbelusca＠svn.reactos.org 28 Aug '15

28 Aug '15

Author: hbelusca Date: Fri Aug 28 03:03:26 2015 New Revision: 68841 URL: http://svn.reactos.org/svn/reactos?rev=68841&view=rev Log: [NTOS:KD] - Fix the condition check when setting twice (or more) the same breakpoint. - Implement support for deferred breakpoints. For more information, see: http://www.osronline.com/article.cfm?article=541 (which also exposes an interesting problem about them). Modified: trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/kd64/kdbreak.c trunk/reactos/ntoskrnl/kd64/kdinit.c trunk/reactos/ntoskrnl/ke/amd64/cpu.c trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -67,7 +67,7 @@ IN PROSSYM_INFO RosSymInfo, IN ULONG_PTR RelativeAddress, #ifdef __ROS_DWARF__ - IN PROSSYM_LINEINFO RosSymLineInfo + IN PROSSYM_LINEINFO RosSymLineInfo #else OUT PULONG LineNumber OPTIONAL, OUT PCH FileName OPTIONAL, 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] Fri Aug 28 03:03:26 2015 @@ -7,11 +7,6 @@ */ // -// Maximum supported number of breakpoints -// -#define KD_BREAKPOINT_MAX 32 - -// // Default size of the DbgPrint log buffer // #if DBG @@ -21,15 +16,29 @@ #endif // +// Maximum supported number of breakpoints +// +#define KD_BREAKPOINT_MAX 32 + +// +// Highest limit starting which we consider that breakpoint addresses +// are either in system space, or in user space but inside shared DLLs. +// +// I'm wondering whether this can be computed using MmHighestUserAddress +// or whether there is already some #define somewhere else... +// See http://www.drdobbs.com/windows/faster-dll-load-load/184416918 +// and http://www.drdobbs.com/rebasing-win32-dlls/184416272 +// for a tentative explanation. +// +#define KD_HIGHEST_USER_BREAKPOINT_ADDRESS (PVOID)0x60000000 // MmHighestUserAddress + +// // Breakpoint Status Flags // -typedef enum _KDP_BREAKPOINT_FLAGS -{ - KdpBreakpointActive = 1, - KdpBreakpointPending = 2, - KdpBreakpointSuspended = 4, - KdpBreakpointExpired = 8 -} KDP_BREAKPOINT_FLAGS; +#define KD_BREAKPOINT_ACTIVE 0x01 +#define KD_BREAKPOINT_PENDING 0x02 +#define KD_BREAKPOINT_SUSPENDED 0x04 +#define KD_BREAKPOINT_EXPIRED 0x08 // // Structure for Breakpoints @@ -37,7 +46,7 @@ typedef struct _BREAKPOINT_ENTRY { ULONG Flags; - PKPROCESS Process; + ULONG_PTR DirectoryTableBase; PVOID Address; KD_BREAKPOINT_TYPE Content; } BREAKPOINT_ENTRY, *PBREAKPOINT_ENTRY; @@ -280,6 +289,12 @@ NTAPI KdpAddBreakpoint( IN PVOID Address +); + +VOID +NTAPI +KdSetOwedBreakpoints( + VOID ); BOOLEAN Modified: trunk/reactos/ntoskrnl/kd64/kdbreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdbreak.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdbreak.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -23,18 +23,18 @@ ULONG i; NTSTATUS Status; - /* Loop current breakpoints */ + /* Check whether we are not setting a breakpoint twice */ for (i = 0; i < KD_BREAKPOINT_MAX; i++) { /* Check if the breakpoint is valid */ - if ((KdpBreakpointTable[i].Flags & KdpBreakpointActive) && + if ((KdpBreakpointTable[i].Flags & KD_BREAKPOINT_ACTIVE) && (KdpBreakpointTable[i].Address == Address)) { - /* Check if it's pending */ - if ((KdpBreakpointTable[i].Flags & KdpBreakpointPending)) - { - /* It's not pending anymore now */ - KdpBreakpointTable[i].Flags &= ~KdpBreakpointPending; + /* Were we not able to remove it earlier? */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_EXPIRED) + { + /* Just re-use it! */ + KdpBreakpointTable[i].Flags &= ~KD_BREAKPOINT_EXPIRED; return i + 1; } else @@ -46,33 +46,246 @@ } /* Find a free entry */ - for (i = 0; i < KD_BREAKPOINT_MAX; i++) if (!(KdpBreakpointTable[i].Flags)) break; + for (i = 0; i < KD_BREAKPOINT_MAX; i++) + { + if (KdpBreakpointTable[i].Flags == 0) + break; + } /* Fail if no free entry was found */ if (i == KD_BREAKPOINT_MAX) return 0; - /* Save the old instruction */ + /* Save the breakpoint */ + KdpBreakpointTable[i].Address = Address; + + /* If we are setting the breakpoint in user space, save the active process context */ + if (Address < KD_HIGHEST_USER_BREAKPOINT_ADDRESS) + KdpBreakpointTable[i].DirectoryTableBase = KeGetCurrentThread()->ApcState.Process->DirectoryTableBase[0]; + + /* Try to save the old instruction */ Status = KdpCopyMemoryChunks((ULONG_PTR)Address, &Content, KD_BREAKPOINT_SIZE, 0, MMDBG_COPY_UNSAFE, NULL); - + if (NT_SUCCESS(Status)) + { + /* Memory accessible, set the breakpoint */ + KdpBreakpointTable[i].Content = Content; + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_ACTIVE; + + /* Write the breakpoint */ + Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Unable to write breakpoint to address 0x%p\n", Address); + } + } + else + { + /* Memory is inaccessible now, setting breakpoint is deferred */ + KdpDprintf("Failed to set breakpoint at address 0x%p, adding deferred breakpoint.\n", Address); + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_ACTIVE | KD_BREAKPOINT_PENDING; + KdpOweBreakpoint = TRUE; + } + + /* Return the breakpoint handle */ + return i + 1; +} + +VOID +NTAPI +KdSetOwedBreakpoints(VOID) +{ + BOOLEAN Enable; + KD_BREAKPOINT_TYPE Content; + ULONG i; + NTSTATUS Status; + + /* If we don't owe any breakpoints, just return */ + if (!KdpOweBreakpoint) return; + + /* Enter the debugger */ + Enable = KdEnterDebugger(NULL, NULL); + + /* + * Suppose we succeed in setting all the breakpoints. + * If we fail to do so, the flag will be set again. + */ + KdpOweBreakpoint = FALSE; + + /* Loop through current breakpoints and try to set or delete the pending ones */ + for (i = 0; i < KD_BREAKPOINT_MAX; i++) + { + if (KdpBreakpointTable[i].Flags & (KD_BREAKPOINT_PENDING | KD_BREAKPOINT_EXPIRED)) + { + /* + * Set the breakpoint only if it is in kernel space, or if it is + * in user space and the active process context matches. + */ + if (KdpBreakpointTable[i].Address < KD_HIGHEST_USER_BREAKPOINT_ADDRESS && + KdpBreakpointTable[i].DirectoryTableBase != KeGetCurrentThread()->ApcState.Process->DirectoryTableBase[0]) + { + KdpOweBreakpoint = TRUE; + continue; + } + + /* Try to save the old instruction */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[i].Address, + &Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* Memory is still inaccessible, breakpoint setting will be deferred again */ + // KdpDprintf("Failed to set deferred breakpoint at address 0x%p\n", + // KdpBreakpointTable[i].Address); + KdpOweBreakpoint = TRUE; + continue; + } + + /* Check if we need to write the breakpoint */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_PENDING) + { + /* Memory accessible, set the breakpoint */ + KdpBreakpointTable[i].Content = Content; + + /* Write the breakpoint */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[i].Address, + &KdpBreakpointInstruction, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Unable to write deferred breakpoint to address 0x%p\n", + KdpBreakpointTable[i].Address); + KdpOweBreakpoint = TRUE; + } + else + { + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_ACTIVE; + } + + continue; + } + + /* Check if we need to restore the original instruction */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_EXPIRED) + { + /* Write it back */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[i].Address, + &KdpBreakpointTable[i].Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); + if (!NT_SUCCESS(Status)) + { + /* This should never happen */ + KdpDprintf("Failed to delete deferred breakpoint at address 0x%p\n", + KdpBreakpointTable[i].Address); + KdpOweBreakpoint = TRUE; + } + else + { + /* Check if the breakpoint is suspended */ + if (KdpBreakpointTable[i].Flags & KD_BREAKPOINT_SUSPENDED) + { + KdpBreakpointTable[i].Flags = KD_BREAKPOINT_SUSPENDED | KD_BREAKPOINT_ACTIVE; + } + else + { + /* Invalidate it */ + KdpBreakpointTable[i].Flags = 0; + } + } + + continue; + } + } + } + + /* Exit the debugger */ + KdExitDebugger(Enable); +} + +BOOLEAN +NTAPI +KdpLowWriteContent(IN ULONG BpIndex) +{ + NTSTATUS Status; + + /* Make sure that the breakpoint is actually active */ + if (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_PENDING) + { + /* So we have a valid breakpoint, but it hasn't been used yet... */ + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_PENDING; + return TRUE; + } + + /* Is the original instruction a breakpoint anyway? */ + if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) + { + /* Then leave it that way... */ + return TRUE; + } + + /* We have an active breakpoint with an instruction to bring back. Do it. */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex].Address, + &KdpBreakpointTable[BpIndex].Content, + KD_BREAKPOINT_SIZE, + 0, + MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, + NULL); if (!NT_SUCCESS(Status)) { - /* TODO: Set it as a owed breakpoint */ - KdpDprintf("Failed to set breakpoint at address 0x%p\n", Address); - return 0; - } - - /* Write the entry */ - KdpBreakpointTable[i].Address = Address; - KdpBreakpointTable[i].Content = Content; - KdpBreakpointTable[i].Flags = KdpBreakpointActive; - - /* Write the breakpoint */ - Status = KdpCopyMemoryChunks((ULONG_PTR)Address, + /* Memory is inaccessible now, restoring original instruction is deferred */ + KdpDprintf("Failed to delete breakpoint at address 0x%p\n", + KdpBreakpointTable[BpIndex].Address); + KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_EXPIRED; + KdpOweBreakpoint = TRUE; + return FALSE; + } + + /* Everything went fine, return */ + return TRUE; +} + +BOOLEAN +NTAPI +KdpLowRestoreBreakpoint(IN ULONG BpIndex) +{ + NTSTATUS Status; + + /* Were we not able to remove it earlier? */ + if (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_EXPIRED) + { + /* Just re-use it! */ + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_EXPIRED; + return TRUE; + } + + /* Are we merely writing a breakpoint on top of another breakpoint? */ + if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) + { + /* Nothing to do */ + return TRUE; + } + + /* Ok, we actually have to overwrite the instruction now */ + Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex].Address, &KdpBreakpointInstruction, KD_BREAKPOINT_SIZE, 0, @@ -80,94 +293,15 @@ NULL); if (!NT_SUCCESS(Status)) { - /* This should never happen */ - KdpDprintf("Unable to write breakpoint to address 0x%p\n", Address); - } - - /* Return the breakpoint handle */ - return i + 1; -} - -BOOLEAN -NTAPI -KdpLowWriteContent(IN ULONG BpIndex) -{ - NTSTATUS Status; - - /* Make sure that the breakpoint is actually active */ - if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointPending) - { - /* So we have a valid breakpoint, but it hasn't been used yet... */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; - return TRUE; - } - - /* Is the original instruction a breakpoint anyway? */ - if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) - { - /* Then leave it that way... */ - return TRUE; - } - - /* We have an active breakpoint with an instruction to bring back. Do it. */ - Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. - Address, - &KdpBreakpointTable[BpIndex].Content, - KD_BREAKPOINT_SIZE, - 0, - MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, - NULL); - if (!NT_SUCCESS(Status)) - { - /* TODO: Set it as a owed breakpoint */ - KdpDprintf("Failed to delete breakpoint at address 0x%p\n", - KdpBreakpointTable[BpIndex].Address); - return FALSE; - } - - /* Everything went fine, return */ - return TRUE; -} - -BOOLEAN -NTAPI -KdpLowRestoreBreakpoint(IN ULONG BpIndex) -{ - NTSTATUS Status; - - /* Were we not able to remove it earlier? */ - if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired) - { - /* Well then, we'll just re-use it and return success! */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointExpired; - return TRUE; - } - - /* Are we merely writing a breakpoint on top of another breakpoint? */ - if (KdpBreakpointTable[BpIndex].Content == KdpBreakpointInstruction) - { - /* Nothing to do then... */ - return TRUE; - } - - /* Ok, we actually have to overwrite the instruction now */ - Status = KdpCopyMemoryChunks((ULONG_PTR)KdpBreakpointTable[BpIndex]. - Address, - &KdpBreakpointInstruction, - KD_BREAKPOINT_SIZE, - 0, - MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE, - NULL); - if (!NT_SUCCESS(Status)) - { - /* FIXME: Set it as a owed breakpoint */ KdpDprintf("Failed to restore breakpoint at address 0x%p\n", KdpBreakpointTable[BpIndex].Address); + KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_PENDING; + KdpOweBreakpoint = TRUE; return FALSE; } /* Clear any possible previous pending flag and return success */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointPending; + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_PENDING; return TRUE; } @@ -178,16 +312,16 @@ ULONG BpIndex = BpEntry - 1; /* Check for invalid breakpoint entry */ - if (!(BpEntry) || (BpEntry > KD_BREAKPOINT_MAX)) return FALSE; + if (!BpEntry || (BpEntry > KD_BREAKPOINT_MAX)) return FALSE; /* If the specified breakpoint table entry is not valid, then return FALSE. */ if (!KdpBreakpointTable[BpIndex].Flags) return FALSE; /* Check if the breakpoint is suspended */ - if (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended) - { - /* Check if breakpoint is not ...? */ - if (!(KdpBreakpointTable[BpIndex].Flags & KdpBreakpointExpired)) + if (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_SUSPENDED) + { + /* Check if breakpoint is not being deleted */ + if (!(KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_EXPIRED)) { /* Invalidate it and return success */ KdpBreakpointTable[BpIndex].Flags = 0; @@ -215,7 +349,7 @@ for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++) { /* Make sure that the breakpoint is active and matches the range. */ - if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && + if ((KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_ACTIVE) && ((KdpBreakpointTable[BpIndex].Address >= Base) && (KdpBreakpointTable[BpIndex].Address <= Limit))) { @@ -241,11 +375,11 @@ for (BpIndex = 0; BpIndex < KD_BREAKPOINT_MAX; BpIndex++) { /* Check if they are valid, suspended breakpoints */ - if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && - (KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended)) + if ((KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_ACTIVE) && + (KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_SUSPENDED)) { /* Unsuspend them */ - KdpBreakpointTable[BpIndex].Flags &= ~KdpBreakpointSuspended; + KdpBreakpointTable[BpIndex].Flags &= ~KD_BREAKPOINT_SUSPENDED; KdpLowRestoreBreakpoint(BpIndex); } } @@ -258,11 +392,11 @@ ULONG BpIndex = BpEntry - 1; /* Check if this is a valid, unsuspended breakpoint */ - if ((KdpBreakpointTable[BpIndex].Flags & KdpBreakpointActive) && - !(KdpBreakpointTable[BpIndex].Flags & KdpBreakpointSuspended)) + if ((KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_ACTIVE) && + !(KdpBreakpointTable[BpIndex].Flags & KD_BREAKPOINT_SUSPENDED)) { /* Suspend it */ - KdpBreakpointTable[BpIndex].Flags |= KdpBreakpointSuspended; + KdpBreakpointTable[BpIndex].Flags |= KD_BREAKPOINT_SUSPENDED; KdpLowWriteContent(BpIndex); } } Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -281,7 +281,7 @@ KdDebuggerDataBlock.KernBase = (ULONG_PTR)KdVersionBlock.KernBase; /* Initialize the debugger if requested */ - if ((EnableKd) && (NT_SUCCESS(KdDebuggerInitialize0(LoaderBlock)))) + if (EnableKd && (NT_SUCCESS(KdDebuggerInitialize0(LoaderBlock)))) { /* Now set our real KD routine */ KiDebugRoutine = KdpTrap; @@ -289,9 +289,18 @@ /* Check if we've already initialized our structures */ if (!KdpDebuggerStructuresInitialized) { - /* Set the Debug Switch Routine and Retries*/ + /* Set the Debug Switch Routine and Retries */ KdpContext.KdpDefaultRetries = 20; KiDebugSwitchRoutine = KdpSwitchProcessor; + + /* Initialize breakpoints owed flag and table */ + KdpOweBreakpoint = FALSE; + for (i = 0; i < KD_BREAKPOINT_MAX; i++) + { + KdpBreakpointTable[i].Flags = 0; + KdpBreakpointTable[i].DirectoryTableBase = 0; + KdpBreakpointTable[i].Address = NULL; + } /* Initialize the Time Slip DPC */ KeInitializeDpc(&KdpTimeSlipDpc, KdpTimeSlipDpcRoutine, NULL); Modified: trunk/reactos/ntoskrnl/ke/amd64/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/cpu.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/cpu.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -136,7 +136,7 @@ { PKPRCB Prcb = KeGetCurrentPrcb(); ULONG Vendor; - ULONG FeatureBits = KF_WORKING_PTE;; + ULONG FeatureBits = KF_WORKING_PTE; CPU_INFO CpuInfo; /* Get the Vendor ID */ Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… ============================================================================== --- trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -15,6 +15,7 @@ EXTERN FrLdrDbgPrint:DWORD EXTERN KeBugCheckWithTf:PROC EXTERN MmAccessFault:PROC +EXTERN KdSetOwedBreakpoints:PROC EXTERN KiSystemFatalException:PROC EXTERN KiNpxNotAvailableFaultHandler:PROC EXTERN KiGeneralProtectionFaultHandler:PROC @@ -508,8 +509,16 @@ /* Check for success */ test eax, eax - jge PageFaultReturn - + jl PageFaultError + + /* + * We succeeded. Check whether the kernel debugger has + * owed breakpoints to be inserted, then return. + */ + call KdSetOwedBreakpoints + jmp PageFaultReturn + +PageFaultError: /* Disable interrupts again for the debugger */ cli @@ -527,7 +536,6 @@ je SpecialCode InPageException: - /* Dispatch in-page exception */ mov r11d, eax // Param3 = Status mov eax, STATUS_IN_PAGE_ERROR // ExceptionCode Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Aug 28 03:03:26 2015 @@ -1275,7 +1275,15 @@ (PVOID)Cr2, KiUserTrap(TrapFrame), TrapFrame); - if (NT_SUCCESS(Status)) KiEoiHelper(TrapFrame); + if (NT_SUCCESS(Status)) + { + /* + * We succeeded. Check whether the kernel debugger has + * owed breakpoints to be inserted, then return. + */ + KdSetOwedBreakpoints(); + KiEoiHelper(TrapFrame); + } /* Check for syscall fault */ #if 0

1 0

[akhaldi] 68840: [CMAKE] Introduce a way to use auto generation using bison and flex. Dedicated to Eric Kohl. CORE-10055
by akhaldi＠svn.reactos.org 27 Aug '15

27 Aug '15

Author: akhaldi Date: Thu Aug 27 23:00:49 2015 New Revision: 68840 URL: http://svn.reactos.org/svn/reactos?rev=68840&view=rev Log: [CMAKE] Introduce a way to use auto generation using bison and flex. Dedicated to Eric Kohl. CORE-10055 Added: trunk/reactos/cmake/bison-flex.cmake (with props) Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=68840&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Aug 27 23:00:49 2015 @@ -74,6 +74,9 @@ if(NOT MSVC_IDE) unset(CMAKE_IMPORT_LIBRARY_SUFFIX) endif() + +# Bison and Flex support +# include(cmake/bison-flex.cmake) if(NOT CMAKE_CROSSCOMPILING) Added: trunk/reactos/cmake/bison-flex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/bison-flex.cmake?rev… ============================================================================== --- trunk/reactos/cmake/bison-flex.cmake (added) +++ trunk/reactos/cmake/bison-flex.cmake [iso-8859-1] Thu Aug 27 23:00:49 2015 @@ -0,0 +1,27 @@ + +# Simply use : +# add_bison_files(foo.y) +# and +# add_flex_files(foo.l) +# then add ${CMAKE_CURRENT_BINARY_DIR}/foo.tab.c +# and ${CMAKE_CURRENT_BINARY_DIR}/foo.yy.c to the source list + +function(add_bison_files) + foreach(_file ${ARGN}) + get_filename_component(_name ${_file} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.c ${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.h + COMMAND bison -p ${_name}_ -o ${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.c --defines=${CMAKE_CURRENT_BINARY_DIR}/${_name}.tab.h ${CMAKE_CURRENT_SOURCE_DIR}/${_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + endforeach() +endfunction() + +function(add_flex_files) + foreach(_file ${ARGN}) + get_filename_component(_name ${_file} NAME_WE) + add_custom_command( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.c ${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.h + COMMAND flex -o ${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.c --header-file=${CMAKE_CURRENT_BINARY_DIR}/${_name}.yy.h ${CMAKE_CURRENT_SOURCE_DIR}/${_file} + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_file}) + endforeach() +endfunction() Propchange: trunk/reactos/cmake/bison-flex.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 68839: [CMAKE] Add and use baseaddress_msvc.cmake.
by akhaldi＠svn.reactos.org 27 Aug '15

27 Aug '15

Author: akhaldi Date: Thu Aug 27 22:35:06 2015 New Revision: 68839 URL: http://svn.reactos.org/svn/reactos?rev=68839&view=rev Log: [CMAKE] Add and use baseaddress_msvc.cmake. Added: trunk/reactos/cmake/baseaddress_msvc.cmake (with props) Modified: trunk/reactos/CMakeLists.txt Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=68839&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Thu Aug 27 22:35:06 2015 @@ -237,6 +237,8 @@ if(NO_ROSSYM) include(cmake/baseaddress_dwarf.cmake) + elseif(MSVC) + include(cmake/baseaddress_msvc.cmake) else() include(cmake/baseaddress.cmake) endif() Added: trunk/reactos/cmake/baseaddress_msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress_msvc.cma… ============================================================================== --- trunk/reactos/cmake/baseaddress_msvc.cmake (added) +++ trunk/reactos/cmake/baseaddress_msvc.cmake [iso-8859-1] Thu Aug 27 22:35:06 2015 @@ -0,0 +1,346 @@ +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x7c7c0000) +set(baseaddress_msvcrt 0x7c750000) +set(baseaddress_advapi32 0x7c6e0000) +set(baseaddress_gdi32 0x7c690000) +set(baseaddress_user32 0x7c570000) +set(baseaddress_dhcpcsvc 0x7c530000) +set(baseaddress_dnsapi 0x7c4f0000) +set(baseaddress_icmp 0x7c4d0000) +set(baseaddress_iphlpapi 0x7c4a0000) +set(baseaddress_ws2_32 0x7c470000) +set(baseaddress_ws2help 0x7c450000) +set(baseaddress_shlwapi 0x7c3e0000) +set(baseaddress_rpcrt4 0x7c350000) +set(baseaddress_comctl32 0x7c250000) +set(baseaddress_ole32 0x7c150000) +set(baseaddress_winspool.drv 0x7c130000) +set(baseaddress_winmm 0x7c090000) +set(baseaddress_comdlg32 0x7bfc0000) +set(baseaddress_shell32 0x7b290000) +set(baseaddress_lz32 0x7b270000) +set(baseaddress_version 0x7b250000) +set(baseaddress_oleaut32 0x7b140000) +set(baseaddress_setupapi 0x7afc0000) +set(baseaddress_mpr 0x7af90000) +set(baseaddress_crypt32 0x7aed0000) +set(baseaddress_wininet 0x7ae50000) +set(baseaddress_urlmon 0x7adb0000) +set(baseaddress_psapi 0x7ad90000) +set(baseaddress_imm32 0x7ad60000) +set(baseaddress_msvfw32 0x7ad30000) +set(baseaddress_dbghelp 0x7acc0000) +set(baseaddress_devmgr 0x7ac40000) +set(baseaddress_msacm32 0x7ac10000) +set(baseaddress_netapi32 0x7abc0000) +set(baseaddress_powrprof 0x7aba0000) +set(baseaddress_secur32 0x7ab70000) +set(baseaddress_wintrust 0x7ab30000) +set(baseaddress_avicap32 0x7ab10000) +set(baseaddress_cabinet 0x7aad0000) +set(baseaddress_dsound 0x7aa70000) +set(baseaddress_glu32 0x7a9e0000) +set(baseaddress_opengl32 0x7a850000) +set(baseaddress_riched20 0x7a7d0000) +set(baseaddress_smdll 0x7a7b0000) +set(baseaddress_userenv 0x7a770000) +set(baseaddress_uxtheme 0x7a730000) +set(baseaddress_cryptui 0x7a6a0000) +set(baseaddress_csrsrv 0x7a670000) +set(baseaddress_basesrv 0x7a650000) +set(baseaddress_consrv 0x7a630000) +set(baseaddress_winsrv 0x7a590000) +set(baseaddress_dplayx 0x7a540000) +set(baseaddress_gdiplus 0x7a4c0000) +set(baseaddress_msimg32 0x7a4a0000) +set(baseaddress_mswsock 0x7a480000) +set(baseaddress_oledlg 0x7a440000) +set(baseaddress_rasapi32 0x7a420000) +set(baseaddress_rsaenh 0x7a3d0000) +set(baseaddress_samlib 0x7a3a0000) +set(baseaddress_sensapi 0x7a380000) +set(baseaddress_sfc_os 0x7a360000) +set(baseaddress_snmpapi 0x7a340000) +set(baseaddress_spoolss 0x7a310000) +set(baseaddress_usp10 0x7a2b0000) +set(baseaddress_acledit 0x7a290000) +set(baseaddress_aclui 0x7a260000) +set(baseaddress_activeds 0x7a240000) +set(baseaddress_actxprxy 0x7a140000) +set(baseaddress_advpack 0x7a110000) +set(baseaddress_amstream 0x7a0d0000) +set(baseaddress_atl 0x7a0a0000) +set(baseaddress_atl100 0x7a070000) +set(baseaddress_atl80 0x7a040000) +set(baseaddress_authz 0x7a020000) +set(baseaddress_avifil32 0x79fd0000) +set(baseaddress_batt 0x79fa0000) +set(baseaddress_bcrypt 0x79f80000) +set(baseaddress_beepmidi 0x79f60000) +set(baseaddress_browseui 0x79ee0000) +set(baseaddress_cards 0x79e20000) +set(baseaddress_cfgmgr32 0x79e00000) +set(baseaddress_clusapi 0x79de0000) +set(baseaddress_comcat 0x79dc0000) +set(baseaddress_compstui 0x79da0000) +set(baseaddress_console 0x79d30000) +set(baseaddress_credui 0x79cf0000) +set(baseaddress_crtdll 0x79ca0000) +set(baseaddress_cryptdlg 0x79c70000) +set(baseaddress_cryptdll 0x79c50000) +set(baseaddress_cryptnet 0x79c30000) +set(baseaddress_d3d8 0x79bf0000) +set(baseaddress_d3d8thk 0x79bd0000) +set(baseaddress_d3d9 0x79b80000) +set(baseaddress_d3dcompiler_43 0x79af0000) +set(baseaddress_d3drm 0x79a90000) +set(baseaddress_d3dwine 0x798c0000) +set(baseaddress_d3dx9_24 0x798a0000) +set(baseaddress_d3dx9_25 0x79870000) +set(baseaddress_d3dx9_26 0x79850000) +set(baseaddress_d3dx9_27 0x79830000) +set(baseaddress_d3dx9_28 0x79810000) +set(baseaddress_d3dx9_29 0x797f0000) +set(baseaddress_d3dx9_30 0x797d0000) +set(baseaddress_d3dx9_31 0x797b0000) +set(baseaddress_d3dx9_32 0x79790000) +set(baseaddress_d3dx9_33 0x79770000) +set(baseaddress_d3dx9_34 0x79750000) +set(baseaddress_d3dx9_35 0x79730000) +set(baseaddress_d3dx9_36 0x79690000) +set(baseaddress_d3dx9_37 0x79670000) +set(baseaddress_d3dx9_38 0x79650000) +set(baseaddress_d3dx9_39 0x79630000) +set(baseaddress_d3dx9_40 0x79610000) +set(baseaddress_d3dx9_41 0x795f0000) +set(baseaddress_d3dx9_42 0x795d0000) +set(baseaddress_d3dx9_43 0x795b0000) +set(baseaddress_d3dxof 0x79580000) +set(baseaddress_dciman32 0x79560000) +set(baseaddress_ddraw 0x794e0000) +set(baseaddress_deskadp 0x794b0000) +set(baseaddress_deskmon 0x79480000) +set(baseaddress_devcpux 0x79460000) +set(baseaddress_devenum 0x79430000) +set(baseaddress_dinput 0x793f0000) +set(baseaddress_dinput8 0x793d0000) +set(baseaddress_dmusic 0x79390000) +set(baseaddress_dplay 0x79370000) +set(baseaddress_dwmapi 0x79350000) +set(baseaddress_dxdiagn 0x79320000) +set(baseaddress_dxgi 0x792f0000) +set(baseaddress_faultrep 0x792d0000) +set(baseaddress_fltlib 0x792b0000) +set(baseaddress_fmifs 0x79290000) +set(baseaddress_fontext 0x79270000) +set(baseaddress_framebuf 0x79250000) +set(baseaddress_framebuf_new 0x79230000) +set(baseaddress_framedyn 0x79210000) +set(baseaddress_genincdata 0x791e0000) +set(baseaddress_getuname 0x78f10000) +set(baseaddress_hid 0x78ef0000) +set(baseaddress_hlink 0x78ec0000) +set(baseaddress_hnetcfg 0x78e90000) +set(baseaddress_httpapi 0x78e70000) +set(baseaddress_iccvid 0x78e50000) +set(baseaddress_ieframe 0x78dd0000) +set(baseaddress_iernonce 0x78db0000) +set(baseaddress_imagehlp 0x78d90000) +set(baseaddress_inetcomm 0x78d50000) +set(baseaddress_inetmib1 0x78d30000) +set(baseaddress_initpki 0x78d10000) +set(baseaddress_input 0x78cc0000) +set(baseaddress_inseng 0x78ca0000) +set(baseaddress_iologmsg 0x78c80000) +set(baseaddress_itircl 0x78c60000) +set(baseaddress_itss 0x78c30000) +set(baseaddress_jscript 0x78ba0000) +set(baseaddress_jsproxy 0x78b80000) +set(baseaddress_kbsdll 0x78b60000) +set(baseaddress_kdvbox 0x78b20000) +set(baseaddress_kernel32_vista 0x78b00000) +set(baseaddress_ksuser 0x78ae0000) +set(baseaddress_libjpeg 0x78a80000) +set(baseaddress_libpng 0x78a20000) +set(baseaddress_libtiff 0x78970000) +set(baseaddress_libxslt 0x787d0000) +set(baseaddress_loadperf 0x787b0000) +set(baseaddress_localspl 0x78780000) +set(baseaddress_localui 0x78750000) +set(baseaddress_lpk 0x78730000) +set(baseaddress_lsasrv 0x786f0000) +set(baseaddress_mapi32 0x786c0000) +set(baseaddress_mciavi32 0x78690000) +set(baseaddress_mcicda 0x78670000) +set(baseaddress_mciqtz32 0x78640000) +set(baseaddress_mciseq 0x78610000) +set(baseaddress_mciwave 0x785e0000) +set(baseaddress_mgmtapi 0x785c0000) +set(baseaddress_midimap 0x785a0000) +set(baseaddress_mlang 0x78570000) +set(baseaddress_mmdevapi 0x78540000) +set(baseaddress_mmdrv 0x78520000) +set(baseaddress_modemui 0x784b0000) +set(baseaddress_mprapi 0x78480000) +set(baseaddress_msafd 0x78450000) +set(baseaddress_mscat32 0x78430000) +set(baseaddress_mscms 0x78400000) +set(baseaddress_mscoree 0x783c0000) +set(baseaddress_msctf 0x78380000) +set(baseaddress_msdmo 0x78360000) +set(baseaddress_msftedit 0x78340000) +set(baseaddress_msgina 0x782c0000) +set(baseaddress_mshtml 0x78150000) +set(baseaddress_msi 0x78080000) +set(baseaddress_msimtf 0x78060000) +set(baseaddress_msisip 0x78040000) +set(baseaddress_mspatcha 0x78020000) +set(baseaddress_msports 0x77ff0000) +set(baseaddress_msrle32 0x77fc0000) +set(baseaddress_mssign32 0x77fa0000) +set(baseaddress_mssip32 0x77f80000) +set(baseaddress_mstask 0x77f50000) +set(baseaddress_msv1_0 0x77f30000) +set(baseaddress_msvcrt20 0x77eb0000) +set(baseaddress_msvcrt40 0x77e30000) +set(baseaddress_msvidc32 0x77e10000) +set(baseaddress_msxml 0x77de0000) +set(baseaddress_msxml2 0x77db0000) +set(baseaddress_msxml3 0x77b90000) +set(baseaddress_msxml4 0x77b50000) +set(baseaddress_msxml6 0x77b10000) +set(baseaddress_mycomput 0x77af0000) +set(baseaddress_nddeapi 0x77ad0000) +set(baseaddress_netcfgx 0x77a60000) +set(baseaddress_netevent 0x77a40000) +set(baseaddress_netid 0x77a00000) +set(baseaddress_netshell 0x779a0000) +set(baseaddress_newdev 0x77950000) +set(baseaddress_npptools 0x77930000) +set(baseaddress_ntdsapi 0x77910000) +set(baseaddress_ntlanman 0x778f0000) +set(baseaddress_ntmarta 0x778d0000) +set(baseaddress_ntobjshex 0x77850000) +set(baseaddress_ntprint 0x77830000) +set(baseaddress_objsel 0x77810000) +set(baseaddress_odbc32 0x777e0000) +set(baseaddress_odbccp32 0x777c0000) +set(baseaddress_oleacc 0x77770000) +set(baseaddress_olecli32 0x77750000) +set(baseaddress_olepro32 0x77730000) +set(baseaddress_olesvr32 0x77710000) +set(baseaddress_olethk32 0x776f0000) +set(baseaddress_pdh 0x776c0000) +set(baseaddress_pidgen 0x776a0000) +set(baseaddress_printui 0x77680000) +set(baseaddress_propsys 0x77650000) +set(baseaddress_pstorec 0x77630000) +set(baseaddress_qedit 0x77600000) +set(baseaddress_qmgr 0x775d0000) +set(baseaddress_qmgrprxy 0x77590000) +set(baseaddress_quartz 0x774b0000) +set(baseaddress_query 0x77490000) +set(baseaddress_rasadhlp 0x77470000) +set(baseaddress_rasdlg 0x772a0000) +set(baseaddress_rasman 0x77270000) +set(baseaddress_resutils 0x77250000) +set(baseaddress_riched32 0x77230000) +set(baseaddress_rsabase 0x77210000) +set(baseaddress_rshell 0x771c0000) +set(baseaddress_samsrv 0x77170000) +set(baseaddress_sccbase 0x77150000) +set(baseaddress_schannel 0x77120000) +set(baseaddress_schedsvc 0x77100000) +set(baseaddress_scrrun 0x770c0000) +set(baseaddress_security 0x770a0000) +set(baseaddress_serialui 0x77080000) +set(baseaddress_sfc 0x77060000) +set(baseaddress_shdoclc 0x77020000) +set(baseaddress_shdocvw 0x76fe0000) +set(baseaddress_shfolder 0x76fc0000) +set(baseaddress_shimgvw 0x76f80000) +set(baseaddress_slayer 0x76f50000) +set(baseaddress_slbcsp 0x76f30000) +set(baseaddress_sndblst 0x76f10000) +set(baseaddress_softpub 0x76ef0000) +set(baseaddress_srclient 0x76ed0000) +set(baseaddress_srvsvc 0x76ea0000) +set(baseaddress_sti 0x76e70000) +set(baseaddress_stobject 0x76e20000) +set(baseaddress_streamci 0x76e00000) +set(baseaddress_sxs 0x76de0000) +set(baseaddress_syssetup 0x76d40000) +set(baseaddress_t2embed 0x76d20000) +set(baseaddress_tapi32 0x76cf0000) +set(baseaddress_tapiui 0x76c70000) +set(baseaddress_testvdd 0x76c50000) +set(baseaddress_themeui 0x76c30000) +set(baseaddress_traffic 0x76c10000) +set(baseaddress_twain_32 0x76bf0000) +set(baseaddress_uext2 0x76bc0000) +set(baseaddress_ufat 0x76ba0000) +set(baseaddress_ufatx 0x76b80000) +set(baseaddress_umpnpmgr 0x76b50000) +set(baseaddress_untfs 0x76b30000) +set(baseaddress_updspapi 0x76b10000) +set(baseaddress_url 0x76af0000) +set(baseaddress_vbscript 0x76a90000) +set(baseaddress_vdmdbg 0x76a70000) +set(baseaddress_wbemdisp 0x76a40000) +set(baseaddress_wbemprox 0x76a00000) +set(baseaddress_windowscodecs 0x76960000) +set(baseaddress_windowscodecsext 0x76940000) +set(baseaddress_winfax 0x76920000) +set(baseaddress_wing32 0x76900000) +set(baseaddress_winhttp 0x768c0000) +set(baseaddress_winscard 0x768a0000) +set(baseaddress_winsta 0x76870000) +set(baseaddress_wkssvc 0x76850000) +set(baseaddress_wlanapi 0x76830000) +set(baseaddress_wldap32 0x76800000) +set(baseaddress_wlnotify 0x767e0000) +set(baseaddress_wmi 0x767c0000) +set(baseaddress_wmisvc 0x767a0000) +set(baseaddress_wmiutils 0x76770000) +set(baseaddress_ws2_32_new 0x76740000) +set(baseaddress_wshirda 0x76720000) +set(baseaddress_wshtcpip 0x76700000) +set(baseaddress_wsock32 0x766e0000) +set(baseaddress_wtsapi32 0x766c0000) +set(baseaddress_wuapi 0x76690000) +set(baseaddress_xinput1_1 0x76670000) +set(baseaddress_xinput1_2 0x76650000) +set(baseaddress_xinput1_3 0x76630000) +set(baseaddress_xinput9_1_0 0x76610000) +set(baseaddress_xmllite 0x765e0000) +set(baseaddress_access 0x76570000) +set(baseaddress_appwiz 0x76500000) +set(baseaddress_cmicpl 0x764d0000) +set(baseaddress_desk 0x76450000) +set(baseaddress_hdwwiz 0x763d0000) +set(baseaddress_hhctrl 0x76390000) +set(baseaddress_imaadp32.acm 0x76370000) +set(baseaddress_inetcpl 0x762f0000) +set(baseaddress_intl 0x76290000) +set(baseaddress_joy 0x76250000) +set(baseaddress_main 0x761b0000) +set(baseaddress_mmsys 0x760c0000) +set(baseaddress_msacm32.drv 0x76090000) +set(baseaddress_msadp32.acm 0x76070000) +set(baseaddress_msg711.acm 0x76050000) +set(baseaddress_msgsm32.acm 0x76030000) +set(baseaddress_msisys 0x76010000) +set(baseaddress_ncpa 0x75ff0000) +set(baseaddress_odbccp32i 0x75fd0000) +set(baseaddress_powercfg 0x75f70000) +set(baseaddress_sysdm 0x75ea0000) +set(baseaddress_telephon 0x75e80000) +set(baseaddress_timedate 0x75e30000) +set(baseaddress_usrmgr 0x75de0000) +set(baseaddress_wdmaud.drv 0x75c40000) +set(baseaddress_wined3dcfg 0x75c10000) +set(baseaddress_winemp3.acm 0x75ba0000) +set(baseaddress_wshom 0x75b70000) +set(baseaddress_fusion 0x75a00000) +set(baseaddress_fusion_1_1 0x759e0000) +set(baseaddress_fusion_2_0 0x759b0000) Propchange: trunk/reactos/cmake/baseaddress_msvc.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[akhaldi] 68838: [CMAKE] Update baseaddress.cmake.
by akhaldi＠svn.reactos.org 27 Aug '15

27 Aug '15

Author: akhaldi Date: Thu Aug 27 22:33:07 2015 New Revision: 68838 URL: http://svn.reactos.org/svn/reactos?rev=68838&view=rev Log: [CMAKE] Update baseaddress.cmake. Modified: trunk/reactos/cmake/baseaddress.cmake Modified: trunk/reactos/cmake/baseaddress.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress.cmake?re… ============================================================================== --- trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/baseaddress.cmake [iso-8859-1] Thu Aug 27 22:33:07 2015 @@ -1,324 +1,345 @@ set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 -set(baseaddress_kernel32 0x77d80000) -set(baseaddress_msvcrt 0x77cd0000) -set(baseaddress_advapi32 0x77c20000) -set(baseaddress_gdi32 0x77bb0000) -set(baseaddress_user32 0x77a20000) -set(baseaddress_dhcpcsvc 0x779d0000) -set(baseaddress_dnsapi 0x77980000) -set(baseaddress_icmp 0x77950000) -set(baseaddress_iphlpapi 0x77910000) -set(baseaddress_ws2_32 0x778d0000) -set(baseaddress_ws2help 0x778a0000) -set(baseaddress_shlwapi 0x77800000) -set(baseaddress_rpcrt4 0x77740000) -set(baseaddress_comctl32 0x775c0000) -set(baseaddress_ole32 0x77400000) -set(baseaddress_winspool.drv 0x773c0000) -set(baseaddress_winmm 0x77320000) -set(baseaddress_comdlg32 0x77230000) -set(baseaddress_shell32 0x76540000) -set(baseaddress_lz32 0x76520000) -set(baseaddress_version 0x764f0000) -set(baseaddress_oleaut32 0x76340000) -set(baseaddress_setupapi 0x76170000) -set(baseaddress_mpr 0x76130000) -set(baseaddress_crypt32 0x76030000) -set(baseaddress_wininet 0x75f80000) -set(baseaddress_urlmon 0x75e90000) -set(baseaddress_psapi 0x75e60000) -set(baseaddress_imm32 0x75e20000) -set(baseaddress_msvfw32 0x75de0000) -set(baseaddress_dbghelp 0x75d30000) -set(baseaddress_devmgr 0x75cb0000) -set(baseaddress_msacm32 0x75c70000) -set(baseaddress_netapi32 0x75c00000) -set(baseaddress_powrprof 0x75bd0000) -set(baseaddress_secur32 0x75ba0000) -set(baseaddress_wintrust 0x75b40000) -set(baseaddress_avicap32 0x75b10000) -set(baseaddress_cabinet 0x75ac0000) -set(baseaddress_dsound 0x75a50000) -set(baseaddress_glu32 0x75950000) -set(baseaddress_wlnotify 0x758f0000) -set(baseaddress_opengl32 0x75720000) -set(baseaddress_riched20 0x75690000) -set(baseaddress_smdll 0x75670000) -set(baseaddress_userenv 0x75620000) -set(baseaddress_uxtheme 0x755c0000) -set(baseaddress_cryptui 0x75520000) -set(baseaddress_csrsrv 0x754f0000) -set(baseaddress_basesrv 0x754c0000) -set(baseaddress_consrv 0x754a0000) -set(baseaddress_winsrv 0x753e0000) -set(baseaddress_dplayx 0x75370000) -set(baseaddress_gdiplus 0x752b0000) -set(baseaddress_msimg32 0x75280000) -set(baseaddress_mswsock 0x75250000) -set(baseaddress_oledlg 0x75200000) -set(baseaddress_rasapi32 0x751d0000) -set(baseaddress_rsaenh 0x75160000) -set(baseaddress_samlib 0x75120000) -set(baseaddress_sensapi 0x750f0000) -set(baseaddress_sfc_os 0x750c0000) -set(baseaddress_snmpapi 0x75090000) -set(baseaddress_spoolss 0x75060000) -set(baseaddress_usp10 0x74ff0000) -set(baseaddress_acledit 0x74fc0000) -set(baseaddress_aclui 0x74f80000) -set(baseaddress_activeds 0x74f50000) -set(baseaddress_actxprxy 0x74da0000) -set(baseaddress_advpack 0x74d60000) -set(baseaddress_amstream 0x74d10000) -set(baseaddress_atl100 0x74cd0000) -set(baseaddress_atl80 0x74ca0000) -set(baseaddress_atl 0x74c70000) -set(baseaddress_authz 0x74c40000) -set(baseaddress_avifil32 0x74bd0000) -set(baseaddress_batt 0x74ba0000) -set(baseaddress_bcrypt 0x74b70000) -set(baseaddress_beepmidi 0x74b40000) -set(baseaddress_browseui 0x74a70000) -set(baseaddress_cards 0x749c0000) -set(baseaddress_cfgmgr32 0x74990000) -set(baseaddress_clusapi 0x74960000) -set(baseaddress_comcat 0x74930000) -set(baseaddress_compstui 0x74900000) -set(baseaddress_console 0x74880000) -set(baseaddress_credui 0x74840000) -set(baseaddress_crtdll 0x747e0000) -set(baseaddress_cryptdlg 0x747b0000) -set(baseaddress_cryptdll 0x74780000) -set(baseaddress_cryptnet 0x74750000) -set(baseaddress_d3d8 0x746f0000) -set(baseaddress_d3d8thk 0x746d0000) -set(baseaddress_d3d9 0x74670000) -set(baseaddress_d3dcompiler_43 0x745c0000) -set(baseaddress_d3dx9_24 0x74590000) -set(baseaddress_d3dx9_25 0x74560000) -set(baseaddress_d3dx9_26 0x74530000) -set(baseaddress_d3dx9_27 0x74500000) -set(baseaddress_d3dx9_28 0x744d0000) -set(baseaddress_d3dx9_29 0x744a0000) -set(baseaddress_d3dx9_30 0x74470000) -set(baseaddress_d3dx9_31 0x74440000) -set(baseaddress_d3dx9_32 0x74410000) -set(baseaddress_d3dx9_33 0x743e0000) -set(baseaddress_d3dx9_34 0x743b0000) -set(baseaddress_d3dx9_35 0x74380000) -set(baseaddress_d3dx9_36 0x742b0000) -set(baseaddress_d3dx9_37 0x74280000) -set(baseaddress_d3dx9_38 0x74250000) -set(baseaddress_d3dx9_39 0x74220000) -set(baseaddress_d3dx9_40 0x741f0000) -set(baseaddress_d3dx9_41 0x741c0000) -set(baseaddress_d3dx9_42 0x74190000) -set(baseaddress_d3dx9_43 0x74160000) -set(baseaddress_d3dxof 0x74110000) -set(baseaddress_dciman32 0x740e0000) -set(baseaddress_ddraw 0x74030000) -set(baseaddress_deskadp 0x74000000) -set(baseaddress_deskmon 0x73fd0000) -set(baseaddress_devcpux 0x73fa0000) -set(baseaddress_devenum 0x73f50000) -set(baseaddress_dinput8 0x73f20000) -set(baseaddress_dinput 0x73ec0000) -set(baseaddress_dmusic 0x73e70000) -set(baseaddress_dplay 0x73e40000) -set(baseaddress_dwmapi 0x73e10000) -set(baseaddress_dxdiagn 0x73dc0000) -set(baseaddress_dxgi 0x73d80000) -set(baseaddress_faultrep 0x73d50000) -set(baseaddress_fmifs 0x73d30000) -set(baseaddress_fontext 0x73d00000) -set(baseaddress_framebuf 0x73ce0000) -set(baseaddress_framebuf_new 0x73cc0000) -set(baseaddress_framedyn 0x73c80000) -set(baseaddress_genincdata 0x73c50000) -set(baseaddress_getuname 0x73ae0000) -set(baseaddress_hid 0x73ab0000) -set(baseaddress_hlink 0x73a70000) -set(baseaddress_hnetcfg 0x73a30000) -set(baseaddress_httpapi 0x73a00000) -set(baseaddress_iccvid 0x739d0000) -set(baseaddress_ieframe 0x73930000) -set(baseaddress_iernonce 0x73900000) -set(baseaddress_imagehlp 0x738d0000) -set(baseaddress_inetcomm 0x73870000) -set(baseaddress_inetmib1 0x73840000) -set(baseaddress_initpki 0x73810000) -set(baseaddress_input 0x737b0000) -set(baseaddress_inseng 0x73780000) -set(baseaddress_iologmsg 0x73760000) -set(baseaddress_itircl 0x73730000) -set(baseaddress_itss 0x736f0000) -set(baseaddress_jscript 0x73600000) -set(baseaddress_kbsdll 0x735d0000) -set(baseaddress_ksuser 0x735a0000) -set(baseaddress_libjpeg 0x73510000) -set(baseaddress_libpng 0x73490000) -set(baseaddress_libtiff 0x733a0000) -set(baseaddress_libxslt 0x730f0000) -set(baseaddress_loadperf 0x730c0000) -set(baseaddress_localspl 0x73080000) -set(baseaddress_localui 0x73050000) -set(baseaddress_lpk 0x73020000) -set(baseaddress_lsasrv 0x72fc0000) -set(baseaddress_mapi32 0x72f80000) -set(baseaddress_mciavi32 0x72f40000) -set(baseaddress_mcicda 0x72f10000) -set(baseaddress_mciqtz32 0x72ed0000) -set(baseaddress_mciseq 0x72ea0000) -set(baseaddress_mciwave 0x72e70000) -set(baseaddress_midimap 0x72e40000) -set(baseaddress_mlang 0x72e00000) -set(baseaddress_mmdevapi 0x72dc0000) -set(baseaddress_mmdrv 0x72d90000) -set(baseaddress_modemui 0x72d20000) -set(baseaddress_mprapi 0x72cf0000) -set(baseaddress_msafd 0x72cb0000) -set(baseaddress_mscat32 0x72c80000) -set(baseaddress_mscms 0x72c50000) -set(baseaddress_mscoree 0x72c00000) -set(baseaddress_msctf 0x72bb0000) -set(baseaddress_msdmo 0x72b80000) -set(baseaddress_msftedit 0x72b50000) -set(baseaddress_msgina 0x72ae0000) -set(baseaddress_mshtml 0x72910000) -set(baseaddress_msi 0x727b0000) -set(baseaddress_msimtf 0x72780000) -set(baseaddress_msisip 0x72750000) -set(baseaddress_msports 0x72720000) -set(baseaddress_msrle32 0x726e0000) -set(baseaddress_mssign32 0x726b0000) -set(baseaddress_mssip32 0x72680000) -set(baseaddress_mstask 0x72650000) -set(baseaddress_msv1_0 0x72620000) -set(baseaddress_msvcrt20 0x72560000) -set(baseaddress_msvcrt40 0x724a0000) -set(baseaddress_msvidc32 0x72470000) -set(baseaddress_msxml2 0x72440000) -set(baseaddress_msxml3 0x72110000) -set(baseaddress_msxml4 0x720d0000) -set(baseaddress_msxml6 0x72090000) -set(baseaddress_msxml 0x72060000) -set(baseaddress_nddeapi 0x72030000) -set(baseaddress_netcfgx 0x71fa0000) -set(baseaddress_netevent 0x71f80000) -set(baseaddress_netid 0x71f30000) -set(baseaddress_netshell 0x71ea0000) -set(baseaddress_newdev 0x71e40000) -set(baseaddress_notifyhook 0x71e10000) -set(baseaddress_ntdsapi 0x71de0000) -set(baseaddress_ntlanman 0x71db0000) -set(baseaddress_ntmarta 0x71d80000) -set(baseaddress_ntprint 0x71d50000) -set(baseaddress_objsel 0x71d20000) -set(baseaddress_odbc32 0x71ce0000) -set(baseaddress_odbccp32 0x71cb0000) -set(baseaddress_oleacc 0x71c80000) -set(baseaddress_olecli32 0x71c50000) -set(baseaddress_olepro32 0x71c20000) -set(baseaddress_olesvr32 0x71bf0000) -set(baseaddress_olethk32 0x71bc0000) -set(baseaddress_pdh 0x71b80000) -set(baseaddress_pidgen 0x71b50000) -set(baseaddress_printui 0x71b20000) -set(baseaddress_propsys 0x71ae0000) -set(baseaddress_pstorec 0x71ab0000) -set(baseaddress_qedit 0x71a60000) -set(baseaddress_qmgr 0x71a20000) -set(baseaddress_qmgrprxy 0x719d0000) -set(baseaddress_quartz 0x71860000) -set(baseaddress_query 0x71830000) -set(baseaddress_rasadhlp 0x71800000) -set(baseaddress_rasdlg 0x71670000) -set(baseaddress_rasman 0x71640000) -set(baseaddress_resutils 0x71610000) -set(baseaddress_riched32 0x715e0000) -set(baseaddress_rsabase 0x715c0000) -set(baseaddress_samsrv 0x71550000) -set(baseaddress_sccbase 0x71520000) -set(baseaddress_schannel 0x714f0000) -set(baseaddress_scrrun 0x714b0000) -set(baseaddress_security 0x71490000) -set(baseaddress_serialui 0x71460000) -set(baseaddress_sfc 0x71430000) -set(baseaddress_shdoclc 0x713f0000) -set(baseaddress_shdocvw 0x713a0000) -set(baseaddress_shfolder 0x71380000) -set(baseaddress_shimgvw 0x71340000) -set(baseaddress_slayer 0x71310000) -set(baseaddress_slbcsp 0x712e0000) -set(baseaddress_sndblst 0x712b0000) -set(baseaddress_softpub 0x71290000) -set(baseaddress_srclient 0x71260000) -set(baseaddress_sti 0x71220000) -set(baseaddress_sxs 0x711f0000) -set(baseaddress_syssetup 0x71140000) -set(baseaddress_t2embed 0x71110000) -set(baseaddress_tapi32 0x710d0000) -set(baseaddress_tapiui 0x71070000) -set(baseaddress_traffic 0x71040000) -set(baseaddress_twain_32 0x71010000) -set(baseaddress_uext2 0x70fd0000) -set(baseaddress_ufat 0x70fa0000) -set(baseaddress_ufatx 0x70f70000) -set(baseaddress_untfs 0x70f10000) -set(baseaddress_updspapi 0x70ee0000) -set(baseaddress_url 0x70eb0000) -set(baseaddress_vbscript 0x70e30000) -set(baseaddress_vdmdbg 0x70e00000) -set(baseaddress_wbemdisp 0x70cd0000) -set(baseaddress_wbemprox 0x70c70000) -set(baseaddress_windowscodecs 0x70b60000) -set(baseaddress_windowscodecsext 0x70b30000) -set(baseaddress_d3dwine 0x70960000) -set(baseaddress_winfax 0x70930000) -set(baseaddress_wing32 0x70900000) -set(baseaddress_winhttp 0x708a0000) -set(baseaddress_winsta 0x70870000) -set(baseaddress_wlanapi 0x70840000) -set(baseaddress_wldap32 0x70800000) -set(baseaddress_wmi 0x707e0000) -set(baseaddress_ws2_32_new 0x70790000) -set(baseaddress_wshirda 0x70760000) -set(baseaddress_wshtcpip 0x70730000) -set(baseaddress_wsock32 0x70700000) -set(baseaddress_wtsapi32 0x706d0000) -set(baseaddress_wuapi 0x70690000) -set(baseaddress_xinput1_1 0x70660000) -set(baseaddress_xinput1_2 0x70630000) -set(baseaddress_xinput1_3 0x70600000) -set(baseaddress_xinput9_1_0 0x705d0000) -set(baseaddress_xmllite 0x70590000) -set(baseaddress_access 0x70510000) -set(baseaddress_appwiz 0x704b0000) -set(baseaddress_cmicpl 0x70470000) -set(baseaddress_desk 0x703d0000) -set(baseaddress_hdwwiz 0x70340000) -set(baseaddress_hhctrl 0x702f0000) -set(baseaddress_imaadp32.acm 0x702c0000) -set(baseaddress_inetcpl 0x70260000) -set(baseaddress_intl 0x70200000) -set(baseaddress_joy 0x701c0000) -set(baseaddress_main 0x70110000) -set(baseaddress_mmsys 0x70010000) -set(baseaddress_msacm32.drv 0x6ffe0000) -set(baseaddress_msadp32.acm 0x6ffb0000) -set(baseaddress_msg711.acm 0x6ff80000) -set(baseaddress_msgsm32.acm 0x6ff50000) -set(baseaddress_msisys 0x6ff20000) -set(baseaddress_ncpa 0x6fef0000) -set(baseaddress_odbccp32i 0x6fec0000) -set(baseaddress_powercfg 0x6fe50000) -set(baseaddress_sysdm 0x6fd80000) -set(baseaddress_telephon 0x6fd50000) -set(baseaddress_timedate 0x6fcf0000) -set(baseaddress_usrmgr 0x6fc90000) -set(baseaddress_wdmaud.drv 0x6fad0000) -set(baseaddress_wined3dcfg 0x6faa0000) -set(baseaddress_winemp3.acm 0x6fa20000) -set(baseaddress_fusion 0x6fa10000) -set(baseaddress_fusion_1_1 0x6f9f0000) -set(baseaddress_fusion_2_0 0x6f9c0000) +set(baseaddress_kernel32 0x7c770000) +set(baseaddress_msvcrt 0x7c6c0000) +set(baseaddress_advapi32 0x7c610000) +set(baseaddress_gdi32 0x7c570000) +set(baseaddress_user32 0x7c3d0000) +set(baseaddress_dhcpcsvc 0x7c380000) +set(baseaddress_dnsapi 0x7c330000) +set(baseaddress_icmp 0x7c300000) +set(baseaddress_iphlpapi 0x7c2b0000) +set(baseaddress_ws2_32 0x7c270000) +set(baseaddress_ws2help 0x7c240000) +set(baseaddress_shlwapi 0x7c190000) +set(baseaddress_rpcrt4 0x7c0d0000) +set(baseaddress_comctl32 0x7bf40000) +set(baseaddress_ole32 0x7bd70000) +set(baseaddress_winspool.drv 0x7bd40000) +set(baseaddress_winmm 0x7bc90000) +set(baseaddress_comdlg32 0x7bba0000) +set(baseaddress_shell32 0x7adb0000) +set(baseaddress_lz32 0x7ad90000) +set(baseaddress_version 0x7ad60000) +set(baseaddress_oleaut32 0x7ab90000) +set(baseaddress_setupapi 0x7a9c0000) +set(baseaddress_mpr 0x7a980000) +set(baseaddress_crypt32 0x7a870000) +set(baseaddress_wininet 0x7a7b0000) +set(baseaddress_urlmon 0x7a6b0000) +set(baseaddress_psapi 0x7a680000) +set(baseaddress_imm32 0x7a640000) +set(baseaddress_msvfw32 0x7a600000) +set(baseaddress_dbghelp 0x7a550000) +set(baseaddress_devmgr 0x7a4c0000) +set(baseaddress_msacm32 0x7a480000) +set(baseaddress_netapi32 0x7a410000) +set(baseaddress_powrprof 0x7a3e0000) +set(baseaddress_secur32 0x7a3a0000) +set(baseaddress_wintrust 0x7a340000) +set(baseaddress_avicap32 0x7a310000) +set(baseaddress_cabinet 0x7a2c0000) +set(baseaddress_dsound 0x7a240000) +set(baseaddress_glu32 0x7a140000) +set(baseaddress_opengl32 0x79f30000) +set(baseaddress_riched20 0x79e70000) +set(baseaddress_smdll 0x79e50000) +set(baseaddress_userenv 0x79e00000) +set(baseaddress_uxtheme 0x79da0000) +set(baseaddress_cryptui 0x79cf0000) +set(baseaddress_csrsrv 0x79cc0000) +set(baseaddress_basesrv 0x79c90000) +set(baseaddress_consrv 0x79c70000) +set(baseaddress_winsrv 0x79ba0000) +set(baseaddress_dplayx 0x79b30000) +set(baseaddress_gdiplus 0x79a60000) +set(baseaddress_msimg32 0x79a30000) +set(baseaddress_mswsock 0x79a00000) +set(baseaddress_oledlg 0x799b0000) +set(baseaddress_rasapi32 0x79980000) +set(baseaddress_rsaenh 0x79910000) +set(baseaddress_samlib 0x798d0000) +set(baseaddress_sensapi 0x798a0000) +set(baseaddress_sfc_os 0x79870000) +set(baseaddress_snmpapi 0x79840000) +set(baseaddress_spoolss 0x79810000) +set(baseaddress_usp10 0x79790000) +set(baseaddress_acledit 0x79760000) +set(baseaddress_aclui 0x79720000) +set(baseaddress_activeds 0x796f0000) +set(baseaddress_actxprxy 0x79500000) +set(baseaddress_advpack 0x794c0000) +set(baseaddress_amstream 0x79470000) +set(baseaddress_atl 0x79430000) +set(baseaddress_atl100 0x793f0000) +set(baseaddress_atl80 0x793b0000) +set(baseaddress_authz 0x79380000) +set(baseaddress_avifil32 0x79310000) +set(baseaddress_batt 0x792e0000) +set(baseaddress_bcrypt 0x792b0000) +set(baseaddress_beepmidi 0x79280000) +set(baseaddress_browseui 0x79180000) +set(baseaddress_cards 0x790c0000) +set(baseaddress_cfgmgr32 0x79090000) +set(baseaddress_clusapi 0x79060000) +set(baseaddress_comcat 0x79030000) +set(baseaddress_compstui 0x79000000) +set(baseaddress_console 0x78f80000) +set(baseaddress_credui 0x78f40000) +set(baseaddress_crtdll 0x78ee0000) +set(baseaddress_cryptdlg 0x78eb0000) +set(baseaddress_cryptdll 0x78e80000) +set(baseaddress_cryptnet 0x78e50000) +set(baseaddress_d3d8 0x78df0000) +set(baseaddress_d3d8thk 0x78dd0000) +set(baseaddress_d3d9 0x78d60000) +set(baseaddress_d3dcompiler_43 0x78cb0000) +set(baseaddress_d3drm 0x78c30000) +set(baseaddress_d3dwine 0x78a30000) +set(baseaddress_d3dx9_24 0x78a00000) +set(baseaddress_d3dx9_25 0x789c0000) +set(baseaddress_d3dx9_26 0x78990000) +set(baseaddress_d3dx9_27 0x78960000) +set(baseaddress_d3dx9_28 0x78930000) +set(baseaddress_d3dx9_29 0x78900000) +set(baseaddress_d3dx9_30 0x788d0000) +set(baseaddress_d3dx9_31 0x788a0000) +set(baseaddress_d3dx9_32 0x78870000) +set(baseaddress_d3dx9_33 0x78840000) +set(baseaddress_d3dx9_34 0x78810000) +set(baseaddress_d3dx9_35 0x787e0000) +set(baseaddress_d3dx9_36 0x78700000) +set(baseaddress_d3dx9_37 0x786d0000) +set(baseaddress_d3dx9_38 0x786a0000) +set(baseaddress_d3dx9_39 0x78670000) +set(baseaddress_d3dx9_40 0x78640000) +set(baseaddress_d3dx9_41 0x78610000) +set(baseaddress_d3dx9_42 0x785e0000) +set(baseaddress_d3dx9_43 0x785b0000) +set(baseaddress_d3dxof 0x78570000) +set(baseaddress_dciman32 0x78540000) +set(baseaddress_ddraw 0x78480000) +set(baseaddress_deskadp 0x78440000) +set(baseaddress_deskmon 0x78400000) +set(baseaddress_devcpux 0x783d0000) +set(baseaddress_devenum 0x78380000) +set(baseaddress_dinput 0x78320000) +set(baseaddress_dinput8 0x782f0000) +set(baseaddress_dmusic 0x782a0000) +set(baseaddress_dplay 0x78270000) +set(baseaddress_dwmapi 0x78240000) +set(baseaddress_dxdiagn 0x781f0000) +set(baseaddress_dxgi 0x781b0000) +set(baseaddress_faultrep 0x78180000) +set(baseaddress_fltlib 0x78150000) +set(baseaddress_fmifs 0x78130000) +set(baseaddress_fontext 0x78100000) +set(baseaddress_framebuf 0x780e0000) +set(baseaddress_framebuf_new 0x780c0000) +set(baseaddress_framedyn 0x78080000) +set(baseaddress_genincdata 0x78050000) +set(baseaddress_getuname 0x77d80000) +set(baseaddress_hid 0x77d50000) +set(baseaddress_hlink 0x77d10000) +set(baseaddress_hnetcfg 0x77cd0000) +set(baseaddress_httpapi 0x77ca0000) +set(baseaddress_iccvid 0x77c70000) +set(baseaddress_ieframe 0x77b80000) +set(baseaddress_iernonce 0x77b50000) +set(baseaddress_imagehlp 0x77b20000) +set(baseaddress_inetcomm 0x77ac0000) +set(baseaddress_inetmib1 0x77a90000) +set(baseaddress_initpki 0x77a60000) +set(baseaddress_input 0x77a00000) +set(baseaddress_inseng 0x779d0000) +set(baseaddress_iologmsg 0x779b0000) +set(baseaddress_itircl 0x77980000) +set(baseaddress_itss 0x77940000) +set(baseaddress_jscript 0x77830000) +set(baseaddress_jsproxy 0x77800000) +set(baseaddress_kbsdll 0x777d0000) +set(baseaddress_kernel32_vista 0x777a0000) +set(baseaddress_ksuser 0x77770000) +set(baseaddress_libjpeg 0x776e0000) +set(baseaddress_libpng 0x77650000) +set(baseaddress_libtiff 0x77570000) +set(baseaddress_libxslt 0x772a0000) +set(baseaddress_loadperf 0x77270000) +set(baseaddress_localspl 0x77230000) +set(baseaddress_localui 0x77200000) +set(baseaddress_lpk 0x771d0000) +set(baseaddress_lsasrv 0x77170000) +set(baseaddress_mapi32 0x77130000) +set(baseaddress_mciavi32 0x770f0000) +set(baseaddress_mcicda 0x770c0000) +set(baseaddress_mciqtz32 0x77080000) +set(baseaddress_mciseq 0x77050000) +set(baseaddress_mciwave 0x77020000) +set(baseaddress_mgmtapi 0x76ff0000) +set(baseaddress_midimap 0x76fc0000) +set(baseaddress_mlang 0x76f80000) +set(baseaddress_mmdevapi 0x76f40000) +set(baseaddress_mmdrv 0x76f10000) +set(baseaddress_modemui 0x76ea0000) +set(baseaddress_mprapi 0x76e70000) +set(baseaddress_msafd 0x76e30000) +set(baseaddress_mscat32 0x76e00000) +set(baseaddress_mscms 0x76dd0000) +set(baseaddress_mscoree 0x76d80000) +set(baseaddress_msctf 0x76d20000) +set(baseaddress_msdmo 0x76cf0000) +set(baseaddress_msftedit 0x76cc0000) +set(baseaddress_msgina 0x76c30000) +set(baseaddress_mshtml 0x76950000) +set(baseaddress_msi 0x767e0000) +set(baseaddress_msimtf 0x767b0000) +set(baseaddress_msisip 0x76780000) +set(baseaddress_mspatcha 0x76750000) +set(baseaddress_msports 0x76720000) +set(baseaddress_msrle32 0x766f0000) +set(baseaddress_mssign32 0x766c0000) +set(baseaddress_mssip32 0x76690000) +set(baseaddress_mstask 0x76650000) +set(baseaddress_msv1_0 0x76620000) +set(baseaddress_msvcrt20 0x76560000) +set(baseaddress_msvcrt40 0x76490000) +set(baseaddress_msvidc32 0x76460000) +set(baseaddress_msxml 0x76430000) +set(baseaddress_msxml2 0x76400000) +set(baseaddress_msxml3 0x76040000) +set(baseaddress_msxml4 0x76000000) +set(baseaddress_msxml6 0x75fc0000) +set(baseaddress_mycomput 0x75fa0000) +set(baseaddress_nddeapi 0x75f70000) +set(baseaddress_netcfgx 0x75ee0000) +set(baseaddress_netevent 0x75ec0000) +set(baseaddress_netid 0x75e70000) +set(baseaddress_netshell 0x75de0000) +set(baseaddress_newdev 0x75d80000) +set(baseaddress_npptools 0x75d50000) +set(baseaddress_ntdsapi 0x75d20000) +set(baseaddress_ntlanman 0x75cf0000) +set(baseaddress_ntmarta 0x75cc0000) +set(baseaddress_ntobjshex 0x75c10000) +set(baseaddress_ntprint 0x75be0000) +set(baseaddress_objsel 0x75bb0000) +set(baseaddress_odbc32 0x75b70000) +set(baseaddress_odbccp32 0x75b40000) +set(baseaddress_oleacc 0x75ab0000) +set(baseaddress_olecli32 0x75a80000) +set(baseaddress_olepro32 0x75a50000) +set(baseaddress_olesvr32 0x75a20000) +set(baseaddress_olethk32 0x759f0000) +set(baseaddress_pdh 0x759b0000) +set(baseaddress_pidgen 0x75980000) +set(baseaddress_printui 0x75950000) +set(baseaddress_propsys 0x75910000) +set(baseaddress_pstorec 0x758e0000) +set(baseaddress_qedit 0x75890000) +set(baseaddress_qmgr 0x75850000) +set(baseaddress_qmgrprxy 0x757f0000) +set(baseaddress_quartz 0x75680000) +set(baseaddress_query 0x75650000) +set(baseaddress_rasadhlp 0x75620000) +set(baseaddress_rasdlg 0x75450000) +set(baseaddress_rasman 0x75420000) +set(baseaddress_resutils 0x753f0000) +set(baseaddress_riched32 0x753c0000) +set(baseaddress_rsabase 0x753a0000) +set(baseaddress_rshell 0x75310000) +set(baseaddress_samsrv 0x752a0000) +set(baseaddress_sccbase 0x75270000) +set(baseaddress_schannel 0x75230000) +set(baseaddress_schedsvc 0x75200000) +set(baseaddress_scrrun 0x751a0000) +set(baseaddress_security 0x75180000) +set(baseaddress_serialui 0x75150000) +set(baseaddress_sfc 0x75120000) +set(baseaddress_shdoclc 0x750e0000) +set(baseaddress_shdocvw 0x75090000) +set(baseaddress_shfolder 0x75070000) +set(baseaddress_shimgvw 0x75020000) +set(baseaddress_slayer 0x74ff0000) +set(baseaddress_slbcsp 0x74fc0000) +set(baseaddress_sndblst 0x74f90000) +set(baseaddress_softpub 0x74f70000) +set(baseaddress_srclient 0x74f40000) +set(baseaddress_srvsvc 0x74f10000) +set(baseaddress_sti 0x74ed0000) +set(baseaddress_stobject 0x74e60000) +set(baseaddress_streamci 0x74e30000) +set(baseaddress_sxs 0x74e00000) +set(baseaddress_syssetup 0x74d50000) +set(baseaddress_t2embed 0x74d20000) +set(baseaddress_tapi32 0x74ce0000) +set(baseaddress_tapiui 0x74c60000) +set(baseaddress_testvdd 0x74c30000) +set(baseaddress_themeui 0x74c10000) +set(baseaddress_traffic 0x74be0000) +set(baseaddress_twain_32 0x74bb0000) +set(baseaddress_uext2 0x74b70000) +set(baseaddress_ufat 0x74b50000) +set(baseaddress_ufatx 0x74b30000) +set(baseaddress_umpnpmgr 0x74b00000) +set(baseaddress_untfs 0x74ae0000) +set(baseaddress_updspapi 0x74ab0000) +set(baseaddress_url 0x74a80000) +set(baseaddress_vbscript 0x749e0000) +set(baseaddress_vdmdbg 0x749b0000) +set(baseaddress_wbemdisp 0x74970000) +set(baseaddress_wbemprox 0x74910000) +set(baseaddress_windowscodecs 0x747f0000) +set(baseaddress_windowscodecsext 0x747c0000) +set(baseaddress_winfax 0x74790000) +set(baseaddress_wing32 0x74760000) +set(baseaddress_winhttp 0x74700000) +set(baseaddress_winscard 0x746d0000) +set(baseaddress_winsta 0x746a0000) +set(baseaddress_wkssvc 0x74670000) +set(baseaddress_wlanapi 0x74640000) +set(baseaddress_wldap32 0x74600000) +set(baseaddress_wlnotify 0x745e0000) +set(baseaddress_wmi 0x745c0000) +set(baseaddress_wmisvc 0x74590000) +set(baseaddress_wmiutils 0x74550000) +set(baseaddress_ws2_32_new 0x74500000) +set(baseaddress_wshirda 0x744d0000) +set(baseaddress_wshtcpip 0x744a0000) +set(baseaddress_wsock32 0x74470000) +set(baseaddress_wtsapi32 0x74440000) +set(baseaddress_wuapi 0x74400000) +set(baseaddress_xinput1_1 0x743d0000) +set(baseaddress_xinput1_2 0x743a0000) +set(baseaddress_xinput1_3 0x74370000) +set(baseaddress_xinput9_1_0 0x74340000) +set(baseaddress_xmllite 0x74300000) +set(baseaddress_access 0x74280000) +set(baseaddress_appwiz 0x74210000) +set(baseaddress_cmicpl 0x741d0000) +set(baseaddress_desk 0x74130000) +set(baseaddress_hdwwiz 0x740a0000) +set(baseaddress_hhctrl 0x74050000) +set(baseaddress_imaadp32.acm 0x74020000) +set(baseaddress_inetcpl 0x73fa0000) +set(baseaddress_intl 0x73f30000) +set(baseaddress_joy 0x73ef0000) +set(baseaddress_main 0x73e40000) +set(baseaddress_mmsys 0x73d40000) +set(baseaddress_msacm32.drv 0x73d10000) +set(baseaddress_msadp32.acm 0x73ce0000) +set(baseaddress_msg711.acm 0x73cb0000) +set(baseaddress_msgsm32.acm 0x73c80000) +set(baseaddress_msisys 0x73c50000) +set(baseaddress_ncpa 0x73c20000) +set(baseaddress_odbccp32i 0x73bf0000) +set(baseaddress_powercfg 0x73b80000) +set(baseaddress_sysdm 0x73aa0000) +set(baseaddress_telephon 0x73a70000) +set(baseaddress_timedate 0x73a10000) +set(baseaddress_usrmgr 0x739b0000) +set(baseaddress_wdmaud.drv 0x737f0000) +set(baseaddress_wined3dcfg 0x737c0000) +set(baseaddress_winemp3.acm 0x73740000) +set(baseaddress_wshom 0x736f0000) +set(baseaddress_fusion 0x73500000) +set(baseaddress_fusion_1_1 0x734e0000) +set(baseaddress_fusion_2_0 0x734b0000)

1 0

[pschweitzer] 68837: Delete pierre-fsd branch, it has been taken over by trunk which is far more advanced than this branch. It served us well
by pschweitzer＠svn.reactos.org 27 Aug '15

27 Aug '15

Author: pschweitzer Date: Thu Aug 27 21:33:04 2015 New Revision: 68837 URL: http://svn.reactos.org/svn/reactos?rev=68837&view=rev Log: Delete pierre-fsd branch, it has been taken over by trunk which is far more advanced than this branch. It served us well Removed: branches/pierre-fsd/

1 0

[pschweitzer] 68836: [NTFS] Return proper status
by pschweitzer＠svn.reactos.org 27 Aug '15

27 Aug '15

Author: pschweitzer Date: Thu Aug 27 21:02:52 2015 New Revision: 68836 URL: http://svn.reactos.org/svn/reactos?rev=68836&view=rev Log: [NTFS] Return proper status Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Thu Aug 27 21:02:52 2015 @@ -833,7 +833,7 @@ ReleaseAttributeContext(DataContext); ExFreePoolWithTag(BitmapRecord, TAG_NTFS); - return STATUS_SUCCESS; + return Status; }

1 0

[pschweitzer] 68835: [NTFS] It seems that our disk.sys returns "unknown" media type when performing IOCTL_DISK_GET_DRIVE_GEOMETRY on an extended partition. Not sure how Windows handles this (if any...
by pschweitzer＠svn.reactos.org 27 Aug '15

27 Aug '15

Author: pschweitzer Date: Thu Aug 27 20:56:08 2015 New Revision: 68835 URL: http://svn.reactos.org/svn/reactos?rev=68835&view=rev Log: [NTFS] It seems that our disk.sys returns "unknown" media type when performing IOCTL_DISK_GET_DRIVE_GEOMETRY on an extended partition. Not sure how Windows handles this (if any volunteer for a test :-)), in the meantime, forcibly sector size to 512B to allow NTFS driver opening volumes on extended partitions Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/ntfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ntfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ntfs/fsctl.c [iso-8859-1] Thu Aug 27 20:56:08 2015 @@ -89,6 +89,10 @@ return STATUS_UNRECOGNIZED_VOLUME; } } + else if (DiskGeometry.MediaType == Unknown) + { + DiskGeometry.BytesPerSector = 512; + } DPRINT1("BytesPerSector: %lu\n", DiskGeometry.BytesPerSector); BootSector = ExAllocatePoolWithTag(NonPagedPool,

1 0

[dquintana] 68834: [SHELL32] The desktop.ini file is only meant to be read if the folder has the R (read-only) or S (system) attributes. If this causes your favorite folder to stop showing the icon...
by dquintana＠svn.reactos.org 27 Aug '15

27 Aug '15

Author: dquintana Date: Thu Aug 27 16:37:13 2015 New Revision: 68834 URL: http://svn.reactos.org/svn/reactos?rev=68834&view=rev Log: [SHELL32] The desktop.ini file is only meant to be read if the folder has the R (read-only) or S (system) attributes. If this causes your favorite folder to stop showing the icon, use "attrib +r <foldername>" or edit it from the properties dialog. When we add the desktop.ini files, we will also need to add the R attribute to their respective folders. Followup to CORE-9002 Modified: trunk/reactos/dll/win32/shell32/folders.cpp Modified: trunk/reactos/dll/win32/shell32/folders.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/folders.… ============================================================================== --- trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/folders.cpp [iso-8859-1] Thu Aug 27 16:37:13 2015 @@ -34,36 +34,40 @@ static const WCHAR iconIndex[] = { 'I', 'c', 'o', 'n', 'I', 'n', 'd', 'e', 'x', 0 }; static const WCHAR wszDesktopIni[] = { 'd','e','s','k','t','o','p','.','i','n','i',0 }; int icon_idx; - WCHAR wszFolderPath[MAX_PATH]; - - if (!SHGetPathFromIDListW(pidl, wszFolderPath)) - return FALSE; - - PathAppendW(wszFolderPath, wszDesktopIni); - - if (!(uFlags & GIL_DEFAULTICON) && PathFileExistsW(wszFolderPath)) - { - WCHAR wszPath[MAX_PATH]; - WCHAR wszCLSIDValue[CHARS_IN_GUID]; - - if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) - { - ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); - - *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; - } - else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && - HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) - { - *piIndex = icon_idx; - return S_OK; + + if (!(uFlags & GIL_DEFAULTICON) && (_ILGetFileAttributes(ILFindLastID(pidl), NULL, 0) & (FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_READONLY)) != 0 ) + { + WCHAR wszFolderPath[MAX_PATH]; + + if (!SHGetPathFromIDListW(pidl, wszFolderPath)) + return FALSE; + + PathAppendW(wszFolderPath, wszDesktopIni); + + if (PathFileExistsW(wszFolderPath)) + { + WCHAR wszPath[MAX_PATH]; + WCHAR wszCLSIDValue[CHARS_IN_GUID]; + + if (GetPrivateProfileStringW(shellClassInfo, iconFile, NULL, wszPath, MAX_PATH, wszFolderPath)) + { + ExpandEnvironmentStringsW(wszPath, szIconFile, cchMax); + + *piIndex = GetPrivateProfileIntW(shellClassInfo, iconIndex, 0, wszFolderPath); + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + return S_OK; + } + else if (GetPrivateProfileStringW(shellClassInfo, clsid2, NULL, wszCLSIDValue, CHARS_IN_GUID, wszFolderPath) && + HCR_GetIconW(wszCLSIDValue, szIconFile, NULL, cchMax, &icon_idx)) + { + *piIndex = icon_idx; + return S_OK; + } } }

1 0

[dquintana] 68833: [NTOBJSHEX] * Fix comment headers.
by dquintana＠svn.reactos.org 26 Aug '15

26 Aug '15

Author: dquintana Date: Wed Aug 26 23:35:38 2015 New Revision: 68833 URL: http://svn.reactos.org/svn/reactos?rev=68833&view=rev Log: [NTOBJSHEX] * Fix comment headers. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjns.cpp + * FILE: dll\shellext\ntobjshex\ntobjfolder.cpp * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjns.h + * FILE: dll\shellext\ntobjshex\ntobjfolder.h * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\shellext\ntobjshex\ntobjns.cpp + * FILE: dll\shellext\ntobjshex\regfolder.cpp * PURPOSE: NT Object Namespace shell extension * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ @@ -23,7 +23,6 @@ #define GET_SHGDN_RELATION(dwFlags) ((DWORD)dwFlags & (DWORD)0x000000FF) WINE_DEFAULT_DEBUG_CHANNEL(ntobjshex); - // {1C6D6E08-2332-4A7B-A94D-6432DB2B5AE6} const GUID CLSID_RegistryFolder = { 0x1c6d6e08, 0x2332, 0x4a7b, { 0xa9, 0x4d, 0x64, 0x32, 0xdb, 0x2b, 0x5a, 0xe6 } }; Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Wed Aug 26 23:35:38 2015 @@ -1,10 +1,9 @@ /* - * PROJECT: ReactOS system libraries + * PROJECT: ReactOS shell extensions * LICENSE: GPL - See COPYING in the top level directory - * FILE: dll\win32\stobject\stobject.cpp - * PURPOSE: Systray shell service object - * PROGRAMMERS: Robert Naumann - David Quintana <gigaherz(a)gmail.com> + * FILE: dll\shellext\ntobjshex\regfolder.h + * PURPOSE: NT Object Namespace shell extension + * PROGRAMMERS: David Quintana <gigaherz(a)gmail.com> */ #pragma once

1 0

[dquintana] 68832: [NTOBJSHEX] * Now that we use lazy enumeration instead of keeping a full list of all items, I was able to simplify a few things.
by dquintana＠svn.reactos.org 26 Aug '15

26 Aug '15

Author: dquintana Date: Wed Aug 26 23:30:47 2015 New Revision: 68832 URL: http://svn.reactos.org/svn/reactos?rev=68832&view=rev Log: [NTOBJSHEX] * Now that we use lazy enumeration instead of keeping a full list of all items, I was able to simplify a few things. Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp trunk/reactos/dll/shellext/ntobjshex/regfolder.h Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.cpp [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -131,28 +131,9 @@ }; -class CNtObjectPidlManager -{ -private: - PWSTR m_ntPath; - +class CNtObjectPidlHelper +{ public: - CNtObjectPidlManager() : - m_ntPath(NULL) - { - } - - ~CNtObjectPidlManager() - { - } - - HRESULT Initialize(PWSTR ntPath) - { - m_ntPath = ntPath; - - return S_OK; - } - static HRESULT CompareIDs(LPARAM lParam, const NtPidlEntry * first, const NtPidlEntry * second) { if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) @@ -285,7 +266,7 @@ return flags & mask; } - BOOL IsFolder(LPCITEMIDLIST pcidl) + static BOOL IsFolder(LPCITEMIDLIST pcidl) { NtPidlEntry * entry = (NtPidlEntry*) &(pcidl->mkid); if ((entry->cb < sizeof(NtPidlEntry)) || (entry->magic != NT_OBJECT_PIDL_MAGIC)) @@ -296,7 +277,7 @@ (entry->objectType == KEY_OBJECT); } - HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const NtPidlEntry ** pentry) + static HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const NtPidlEntry ** pentry) { NtPidlEntry * entry = (NtPidlEntry*) &(pcidl->mkid); @@ -321,7 +302,6 @@ // CNtObjectFolder CNtObjectFolder::CNtObjectFolder() : - m_PidlManager(NULL), m_shellPidl(NULL) { } @@ -330,8 +310,6 @@ { if (m_shellPidl) ILFree(m_shellPidl); - if (m_PidlManager) - delete m_PidlManager; } // IShellFolder @@ -370,7 +348,7 @@ if (hr != S_OK) break; - hr = m_PidlManager->GetInfoFromPidl(*ppidl, &info); + hr = CNtObjectPidlHelper::GetInfoFromPidl(*ppidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -389,7 +367,7 @@ *pchEaten = wcslen(info->entryName); if (pdwAttributes) - *pdwAttributes = m_PidlManager->ConvertAttributes(info, pdwAttributes); + *pdwAttributes = CNtObjectPidlHelper::ConvertAttributes(info, pdwAttributes); } return S_OK; @@ -413,7 +391,7 @@ if (IsEqualIID(riid, IID_IShellFolder)) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -514,7 +492,7 @@ { TRACE("CompareIDs\n"); - HRESULT hr = m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + HRESULT hr = CNtObjectPidlHelper::CompareIDs(lParam, pidl1, pidl2); if (hr != S_OK) return hr; @@ -581,12 +559,12 @@ { PCUITEMID_CHILD pidl = apidl[i]; - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; // Update attributes. - *rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut); + *rgfInOut = CNtObjectPidlHelper::ConvertAttributes(info, rgfInOut); } return S_OK; @@ -612,7 +590,7 @@ HKEY keys[1]; int nkeys = _countof(keys); - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CNtObjectPidlHelper::IsFolder(apidl[0])) { res = RegOpenKey(HKEY_CLASSES_ROOT, L"Folder", keys + 0); if (!NT_SUCCESS(res)) @@ -642,7 +620,7 @@ if (IsEqualIID(riid, IID_IQueryAssociations)) { - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CNtObjectPidlHelper::IsFolder(apidl[0])) { CComPtr<IQueryAssociations> pqa; HRESULT hr = AssocCreate(CLSID_QueryAssociations, IID_PPV_ARG(IQueryAssociations, &pqa)); @@ -669,7 +647,7 @@ TRACE("GetDisplayNameOf %p\n", pidl); - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -748,16 +726,9 @@ { m_shellPidl = ILClone(pidl); - PCWSTR ntPath = L"\\"; - - if (!m_PidlManager) - { - m_PidlManager = new CNtObjectPidlManager(); - - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - } - - return m_PidlManager->Initialize(m_NtPath); + StringCbCopy(m_NtPath, _countof(m_NtPath), L"\\"); + + return S_OK; } // Internal @@ -765,11 +736,9 @@ { m_shellPidl = ILClone(pidl); - if (!m_PidlManager) - m_PidlManager = new CNtObjectPidlManager(); - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - return m_PidlManager->Initialize(m_NtPath); + + return S_OK; } // IPersistFolder2 @@ -840,7 +809,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -907,7 +876,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CNtObjectPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/nto… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/ntobjfolder.h [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -9,8 +9,6 @@ extern const GUID CLSID_NtObjectFolder; -class CNtObjectPidlManager; - class CNtObjectFolder : public CComCoClass<CNtObjectFolder, &CLSID_NtObjectFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -18,8 +16,6 @@ public IPersistFolder2, public IShellFolderViewCB { - CNtObjectPidlManager * m_PidlManager; - WCHAR m_NtPath[MAX_PATH]; LPITEMIDLIST m_shellPidl; @@ -28,8 +24,6 @@ CNtObjectFolder(); virtual ~CNtObjectFolder(); - - CNtObjectPidlManager& GetManager() { return *m_PidlManager; } // IShellFolder virtual HRESULT STDMETHODCALLTYPE ParseDisplayName( Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.cpp [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -125,44 +125,9 @@ }; -class CRegistryPidlManager -{ -private: - PWSTR m_ntPath; - HKEY m_hRoot; - - int DpaDeleteCallback(RegPidlEntry * info) - { - CoTaskMemFree(info); - return 0; - } - - static int CALLBACK s_DpaDeleteCallback(void *pItem, void *pData) - { - CRegistryPidlManager * mf = (CRegistryPidlManager*) pData; - RegPidlEntry * item = (RegPidlEntry*) pItem; - return mf->DpaDeleteCallback(item); - } - +class CRegistryPidlHelper +{ public: - CRegistryPidlManager() : - m_ntPath(NULL), - m_hRoot(NULL) - { - } - - ~CRegistryPidlManager() - { - } - - HRESULT Initialize(PWSTR ntPath, HKEY hRoot) - { - m_ntPath = ntPath; - m_hRoot = hRoot; - - return S_OK; - } - static HRESULT CompareIDs(LPARAM lParam, const RegPidlEntry * first, const RegPidlEntry * second) { if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS) @@ -290,7 +255,7 @@ return flags & mask; } - BOOL IsFolder(LPCITEMIDLIST pcidl) + static BOOL IsFolder(LPCITEMIDLIST pcidl) { RegPidlEntry * entry = (RegPidlEntry*) &(pcidl->mkid); if ((entry->cb < sizeof(RegPidlEntry)) || (entry->magic != REGISTRY_PIDL_MAGIC)) @@ -300,7 +265,7 @@ (entry->entryType == REG_ENTRY_ROOT); } - HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const RegPidlEntry ** pentry) + static HRESULT GetInfoFromPidl(LPCITEMIDLIST pcidl, const RegPidlEntry ** pentry) { RegPidlEntry * entry = (RegPidlEntry*) &(pcidl->mkid); @@ -371,7 +336,7 @@ } } - HRESULT FormatContentsForDisplay(const RegPidlEntry * info, PCWSTR * strContents) + static HRESULT FormatContentsForDisplay(const RegPidlEntry * info, LPCWSTR ntPath, PCWSTR * strContents) { PVOID td = (((PBYTE) info) + FIELD_OFFSET(RegPidlEntry, entryName) + info->entryNameLength + sizeof(WCHAR)); @@ -386,7 +351,7 @@ { PVOID valueData; DWORD valueLength; - HRESULT hr = ReadRegistryValue(NULL, m_ntPath, info->entryName, &valueData, &valueLength); + HRESULT hr = ReadRegistryValue(NULL, ntPath, info->entryName, &valueData, &valueLength); if (FAILED_UNEXPECTEDLY(hr)) { PCWSTR strEmpty = L"(Error reading value)"; @@ -429,7 +394,6 @@ // CRegistryFolder CRegistryFolder::CRegistryFolder() : - m_PidlManager(NULL), m_shellPidl(NULL) { } @@ -438,8 +402,6 @@ { if (m_shellPidl) ILFree(m_shellPidl); - if (m_PidlManager) - delete m_PidlManager; } // IShellFolder @@ -480,7 +442,7 @@ if (hr != S_OK) break; - hr = m_PidlManager->GetInfoFromPidl(*ppidl, &info); + hr = CRegistryPidlHelper::GetInfoFromPidl(*ppidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -499,7 +461,7 @@ *pchEaten = wcslen(info->entryName); if (pdwAttributes) - *pdwAttributes = m_PidlManager->ConvertAttributes(info, pdwAttributes); + *pdwAttributes = CRegistryPidlHelper::ConvertAttributes(info, pdwAttributes); } return S_OK; @@ -530,7 +492,7 @@ if (IsEqualIID(riid, IID_IShellFolder)) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -586,7 +548,7 @@ { TRACE("CompareIDs\n"); - HRESULT hr = m_PidlManager->CompareIDs(lParam, pidl1, pidl2); + HRESULT hr = CRegistryPidlHelper::CompareIDs(lParam, pidl1, pidl2); if (hr != S_OK) return hr; @@ -653,12 +615,12 @@ { PCUITEMID_CHILD pidl = apidl[i]; - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; // Update attributes. - *rgfInOut = m_PidlManager->ConvertAttributes(info, rgfInOut); + *rgfInOut = CRegistryPidlHelper::ConvertAttributes(info, rgfInOut); } return S_OK; @@ -684,7 +646,7 @@ HKEY keys[1]; int nkeys = _countof(keys); - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CRegistryPidlHelper::IsFolder(apidl[0])) { res = RegOpenKey(HKEY_CLASSES_ROOT, L"Folder", keys + 0); if (!NT_SUCCESS(res)) @@ -714,7 +676,7 @@ if (IsEqualIID(riid, IID_IQueryAssociations)) { - if (cidl == 1 && m_PidlManager->IsFolder(apidl[0])) + if (cidl == 1 && CRegistryPidlHelper::IsFolder(apidl[0])) { CComPtr<IQueryAssociations> pqa; HRESULT hr = AssocCreate(CLSID_QueryAssociations, IID_PPV_ARG(IQueryAssociations, &pqa)); @@ -741,7 +703,7 @@ TRACE("GetDisplayNameOf %p\n", pidl); - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -821,16 +783,8 @@ m_shellPidl = ILClone(pidl); m_hRoot = NULL; - PCWSTR ntPath = L""; - - if (!m_PidlManager) - { - m_PidlManager = new CRegistryPidlManager(); - - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - } - - return m_PidlManager->Initialize(m_NtPath, m_hRoot); + StringCbCopy(m_NtPath, _countof(m_NtPath), L""); + return S_OK; } // Internal @@ -839,11 +793,8 @@ m_shellPidl = ILClone(pidl); m_hRoot = hRoot; - if (!m_PidlManager) - m_PidlManager = new CRegistryPidlManager(); - StringCbCopy(m_NtPath, _countof(m_NtPath), ntPath); - return m_PidlManager->Initialize(m_NtPath, m_hRoot); + return S_OK; } // IPersistFolder2 @@ -914,7 +865,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -953,7 +904,7 @@ { PCWSTR strValueContents; - hr = m_PidlManager->FormatContentsForDisplay(info, &strValueContents); + hr = CRegistryPidlHelper::FormatContentsForDisplay(info, m_NtPath, &strValueContents); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -987,7 +938,7 @@ if (pidl) { - HRESULT hr = m_PidlManager->GetInfoFromPidl(pidl, &info); + HRESULT hr = CRegistryPidlHelper::GetInfoFromPidl(pidl, &info); if (FAILED_UNEXPECTEDLY(hr)) return hr; @@ -1029,7 +980,7 @@ PCWSTR strValueContents; - hr = m_PidlManager->FormatContentsForDisplay(info, &strValueContents); + hr = CRegistryPidlHelper::FormatContentsForDisplay(info, m_NtPath, &strValueContents); if (FAILED_UNEXPECTEDLY(hr)) return hr; Modified: trunk/reactos/dll/shellext/ntobjshex/regfolder.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/shellext/ntobjshex/reg… ============================================================================== --- trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] (original) +++ trunk/reactos/dll/shellext/ntobjshex/regfolder.h [iso-8859-1] Wed Aug 26 23:30:47 2015 @@ -10,8 +10,6 @@ extern const GUID CLSID_RegistryFolder; -class CRegistryPidlManager; - class CRegistryFolder : public CComCoClass<CRegistryFolder, &CLSID_RegistryFolder>, public CComObjectRootEx<CComMultiThreadModelNoCS>, @@ -19,8 +17,6 @@ public IPersistFolder2, public IShellFolderViewCB { - CRegistryPidlManager * m_PidlManager; - HKEY m_hRoot; WCHAR m_NtPath[MAX_PATH]; @@ -30,8 +26,6 @@ CRegistryFolder(); virtual ~CRegistryFolder(); - - CRegistryPidlManager& GetManager() { return *m_PidlManager; } // IShellFolder virtual HRESULT STDMETHODCALLTYPE ParseDisplayName(

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