Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 64673: [NTVDM]: we have a FPU.
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 15:39:18 2014 New Revision: 64673 URL: http://svn.reactos.org/svn/reactos?rev=64673&view=rev Log: [NTVDM]: we have a FPU. Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h Modified: trunk/reactos/subsystems/ntvdm/bios/bios.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios.h [iso-8859-1] Sat Oct 11 15:39:18 2014 @@ -30,8 +30,7 @@ #define BDA_SEGMENT 0x40 #define BIOS_SEGMENT 0xF000 -// HACK: Disable FPU for now -#define BIOS_EQUIPMENT_LIST 0x2C // Bit 2 set: Mouse present +#define BIOS_EQUIPMENT_LIST 0x2E // Bit1: FPU, Bit 2: Mouse #pragma pack(push, 1)

1 0

[hbelusca] 64672: [FAST486]: group Fast486GetIntVector and Fast486InterruptInternal calls into Fast486PerformInterrupt and use it in the code.
by hbelusca＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: hbelusca Date: Sat Oct 11 15:28:21 2014 New Revision: 64672 URL: http://svn.reactos.org/svn/reactos?rev=64672&view=rev Log: [FAST486]: group Fast486GetIntVector and Fast486InterruptInternal calls into Fast486PerformInterrupt and use it in the code. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/common.h trunk/reactos/lib/fast486/common.inl trunk/reactos/lib/fast486/fast486.c trunk/reactos/lib/fast486/opcodes.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -160,6 +160,56 @@ return Fast486WriteLinearMemory(State, LinearAddress, Buffer, Size); } +static +inline +BOOLEAN +Fast486GetIntVector(PFAST486_STATE State, + UCHAR Number, + PFAST486_IDT_ENTRY IdtEntry) +{ + ULONG FarPointer; + + /* Check for protected mode */ + if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) + { + /* Read from the IDT */ + if (!Fast486ReadLinearMemory(State, + State->Idtr.Address + + Number * sizeof(*IdtEntry), + IdtEntry, + sizeof(*IdtEntry))) + { + /* Exception occurred */ + return FALSE; + } + } + else + { + /* Read from the real-mode IVT */ + + /* Paging is always disabled in real mode */ + State->MemReadCallback(State, + State->Idtr.Address + + Number * sizeof(FarPointer), + &FarPointer, + sizeof(FarPointer)); + + /* Fill a fake IDT entry */ + IdtEntry->Offset = LOWORD(FarPointer); + IdtEntry->Selector = HIWORD(FarPointer); + IdtEntry->Zero = 0; + IdtEntry->Type = FAST486_IDT_INT_GATE; + IdtEntry->Storage = FALSE; + IdtEntry->Dpl = 0; + IdtEntry->Present = TRUE; + IdtEntry->OffsetHigh = 0; + } + + return TRUE; +} + +static +inline BOOLEAN Fast486InterruptInternal(PFAST486_STATE State, USHORT SegmentSelector, @@ -304,14 +354,38 @@ return Success; } +BOOLEAN +Fast486PerformInterrupt(PFAST486_STATE State, + UCHAR Number) +{ + FAST486_IDT_ENTRY IdtEntry; + + /* Get the interrupt vector */ + if (!Fast486GetIntVector(State, Number, &IdtEntry)) + { + /* Exception occurred */ + return FALSE; + } + + /* Perform the interrupt */ + if (!Fast486InterruptInternal(State, + IdtEntry.Selector, + MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), + IdtEntry.Type)) + { + /* Exception occurred */ + return FALSE; + } + + return TRUE; +} + VOID FASTCALL Fast486ExceptionWithErrorCode(PFAST486_STATE State, FAST486_EXCEPTIONS ExceptionCode, ULONG ErrorCode) { - FAST486_IDT_ENTRY IdtEntry; - /* Increment the exception count */ State->ExceptionCount++; @@ -337,7 +411,8 @@ /* Restore the IP to the saved IP */ State->InstPtr = State->SavedInstPtr; - if (!Fast486GetIntVector(State, ExceptionCode, &IdtEntry)) + /* Perform the interrupt */ + if (!Fast486PerformInterrupt(State, ExceptionCode)) { /* * If this function failed, that means Fast486Exception @@ -346,19 +421,6 @@ return; } - /* Perform the interrupt */ - if (!Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type)) - { - /* - * If this function failed, that means Fast486Exception - * was called again, so just return in this case. - */ - return; - } - if (EXCEPTION_HAS_ERROR_CODE(ExceptionCode) && (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE)) { Modified: trunk/reactos/lib/fast486/common.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.h?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.h [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.h [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -154,12 +154,10 @@ ); BOOLEAN -Fast486InterruptInternal +Fast486PerformInterrupt ( PFAST486_STATE State, - USHORT SegmentSelector, - ULONG Offset, - ULONG GateType + UCHAR Number ); VOID Modified: trunk/reactos/lib/fast486/common.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.inl?rev… ============================================================================== --- trunk/reactos/lib/fast486/common.inl [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.inl [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -693,53 +693,6 @@ FORCEINLINE BOOLEAN -Fast486GetIntVector(PFAST486_STATE State, - UCHAR Number, - PFAST486_IDT_ENTRY IdtEntry) -{ - ULONG FarPointer; - - /* Check for protected mode */ - if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) - { - /* Read from the IDT */ - if (!Fast486ReadLinearMemory(State, - State->Idtr.Address - + Number * sizeof(*IdtEntry), - IdtEntry, - sizeof(*IdtEntry))) - { - /* Exception occurred */ - return FALSE; - } - } - else - { - /* Read from the real-mode IVT */ - - /* Paging is always disabled in real mode */ - State->MemReadCallback(State, - State->Idtr.Address - + Number * sizeof(FarPointer), - &FarPointer, - sizeof(FarPointer)); - - /* Fill a fake IDT entry */ - IdtEntry->Offset = LOWORD(FarPointer); - IdtEntry->Selector = HIWORD(FarPointer); - IdtEntry->Zero = 0; - IdtEntry->Type = FAST486_IDT_INT_GATE; - IdtEntry->Storage = FALSE; - IdtEntry->Dpl = 0; - IdtEntry->Present = TRUE; - IdtEntry->OffsetHigh = 0; - } - - return TRUE; -} - -FORCEINLINE -BOOLEAN Fast486CalculateParity(UCHAR Number) { // See http://graphics.stanford.edu/~seander/bithacks.html#ParityLookupTable too... Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -93,17 +93,8 @@ */ if (State->IntStatus == FAST486_INT_EXECUTE) { - FAST486_IDT_ENTRY IdtEntry; - - /* Get the interrupt vector */ - if (Fast486GetIntVector(State, State->PendingIntNum, &IdtEntry)) - { - /* Perform the interrupt */ - Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type); - } + /* Perform the interrupt */ + Fast486PerformInterrupt(State, State->PendingIntNum); /* Clear the interrupt status */ State->IntStatus = FAST486_INT_NONE; Modified: trunk/reactos/lib/fast486/opcodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/opcodes.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/opcodes.c [iso-8859-1] Sat Oct 11 15:28:21 2014 @@ -4615,7 +4615,6 @@ FAST486_OPCODE_HANDLER(Fast486OpcodeInt) { UCHAR IntNum; - FAST486_IDT_ENTRY IdtEntry; switch (Opcode) { @@ -4656,24 +4655,8 @@ } } - /* Get the interrupt vector */ - if (!Fast486GetIntVector(State, IntNum, &IdtEntry)) - { - /* Exception occurred */ - return FALSE; - } - /* Perform the interrupt */ - if (!Fast486InterruptInternal(State, - IdtEntry.Selector, - MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), - IdtEntry.Type)) - { - /* Exception occurred */ - return FALSE; - } - - return TRUE; + return Fast486PerformInterrupt(State, IntNum); } FAST486_OPCODE_HANDLER(Fast486OpcodeIret)

1 0

[aandrejevic] 64671: [FAST486] Revert the previous fix and fix it again, but properly.
by aandrejevic＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: aandrejevic Date: Sat Oct 11 14:40:53 2014 New Revision: 64671 URL: http://svn.reactos.org/svn/reactos?rev=64671&view=rev Log: [FAST486] Revert the previous fix and fix it again, but properly. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6467… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Oct 11 14:40:53 2014 @@ -511,10 +511,10 @@ else { /* Only a few of these instructions have any meaning on a 487 */ - switch ((ModRegRm.SecondRegister << 3) | ModRegRm.Register) + switch ((ModRegRm.Register << 3) | ModRegRm.SecondRegister) { /* FCLEX */ - case 0x42: + case 0x22: { /* Clear exception data */ State->FpuStatus.Ie = @@ -531,7 +531,7 @@ } /* FINIT */ - case 0x43: + case 0x23: { /* Restore the state */ State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; @@ -542,9 +542,9 @@ } /* FENI */ - case 0x40: + case 0x20: /* FDISI */ - case 0x41: + case 0x21: { /* These do nothing */ break;

1 0

[tfaber] 64670: [ROSAUTOTEST] - Do not duplicate console output in StringOut if forcePrint = false ROSTESTS-144
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 14:34:56 2014 New Revision: 64670 URL: http://svn.reactos.org/svn/reactos?rev=64670&view=rev Log: [ROSAUTOTEST] - Do not duplicate console output in StringOut if forcePrint = false ROSTESTS-144 Modified: trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Sat Oct 11 14:34:56 2014 @@ -143,14 +143,14 @@ } } - /* Output the string */ - cout << NewString; - size = curr_pos - start; /* Only print if forced to or if the rest is a whole line */ if(forcePrint == true || NewString[curr_pos - 1] == '\n') { + /* Output the whole string */ + cout << NewString; + memcpy(DbgString, NewString.c_str() + start, size); DbgString[size] = 0; DbgPrint(DbgString); @@ -158,6 +158,9 @@ NewString.clear(); return NewString; } + + /* Output full lines only */ + cout << NewString.substr(0, start); /* Return the remaining chunk */ return NewString.substr(start, size);

1 0

[aandrejevic] 64669: [FAST486] Fix the 6-bit sub-opcode numbers for opcode 0xDB.
by aandrejevic＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: aandrejevic Date: Sat Oct 11 14:34:31 2014 New Revision: 64669 URL: http://svn.reactos.org/svn/reactos?rev=64669&view=rev Log: [FAST486] Fix the 6-bit sub-opcode numbers for opcode 0xDB. Modified: trunk/reactos/lib/fast486/fpu.c Modified: trunk/reactos/lib/fast486/fpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fpu.c?rev=6466… ============================================================================== --- trunk/reactos/lib/fast486/fpu.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fpu.c [iso-8859-1] Sat Oct 11 14:34:31 2014 @@ -514,7 +514,7 @@ switch ((ModRegRm.SecondRegister << 3) | ModRegRm.Register) { /* FCLEX */ - case 0x22: + case 0x42: { /* Clear exception data */ State->FpuStatus.Ie = @@ -531,7 +531,7 @@ } /* FINIT */ - case 0x23: + case 0x43: { /* Restore the state */ State->FpuControl.Value = FAST486_FPU_DEFAULT_CONTROL; @@ -542,9 +542,9 @@ } /* FENI */ - case 0x20: + case 0x40: /* FDISI */ - case 0x21: + case 0x41: { /* These do nothing */ break;

1 0

[aandrejevic] 64668: [FAST486] Save and restore the prefix flags in Fast486InterruptInternal instead of hacking around this everywhere else.
by aandrejevic＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: aandrejevic Date: Sat Oct 11 14:03:17 2014 New Revision: 64668 URL: http://svn.reactos.org/svn/reactos?rev=64668&view=rev Log: [FAST486] Save and restore the prefix flags in Fast486InterruptInternal instead of hacking around this everywhere else. Modified: trunk/reactos/lib/fast486/common.c trunk/reactos/lib/fast486/fast486.c Modified: trunk/reactos/lib/fast486/common.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/common.c?rev=6… ============================================================================== --- trunk/reactos/lib/fast486/common.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/common.c [iso-8859-1] Sat Oct 11 14:03:17 2014 @@ -168,6 +168,8 @@ { BOOLEAN GateSize = (GateType == FAST486_IDT_INT_GATE_32) || (GateType == FAST486_IDT_TRAP_GATE_32); + BOOLEAN Success = FALSE; + ULONG OldPrefixFlags = State->PrefixFlags; /* Check for protected mode */ if (State->ControlRegisters[FAST486_REG_CR0] & FAST486_CR0_PE) @@ -195,7 +197,7 @@ sizeof(Tss))) { /* Exception occurred */ - return FALSE; + goto Cleanup; } /* Check the new (higher) privilege level */ @@ -206,7 +208,7 @@ if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss0)) { /* Exception occurred */ - return FALSE; + goto Cleanup; } State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp0; @@ -218,7 +220,7 @@ if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss1)) { /* Exception occurred */ - return FALSE; + goto Cleanup; } State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp1; @@ -230,7 +232,7 @@ if (!Fast486LoadSegment(State, FAST486_REG_SS, Tss.Ss2)) { /* Exception occurred */ - return FALSE; + goto Cleanup; } State->GeneralRegs[FAST486_REG_ESP].Long = Tss.Esp2; @@ -245,10 +247,10 @@ } /* Push SS selector */ - if (!Fast486StackPush(State, OldSs)) return FALSE; + if (!Fast486StackPush(State, OldSs)) goto Cleanup; /* Push stack pointer */ - if (!Fast486StackPush(State, OldEsp)) return FALSE; + if (!Fast486StackPush(State, OldEsp)) goto Cleanup; } } else @@ -261,13 +263,13 @@ } /* Push EFLAGS */ - if (!Fast486StackPush(State, State->Flags.Long)) return FALSE; + if (!Fast486StackPush(State, State->Flags.Long)) goto Cleanup; /* Push CS selector */ - if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_CS].Selector)) return FALSE; + if (!Fast486StackPush(State, State->SegmentRegs[FAST486_REG_CS].Selector)) goto Cleanup; /* Push the instruction pointer */ - if (!Fast486StackPush(State, State->InstPtr.Long)) return FALSE; + if (!Fast486StackPush(State, State->InstPtr.Long)) goto Cleanup; if ((GateType == FAST486_IDT_INT_GATE) || (GateType == FAST486_IDT_INT_GATE_32)) { @@ -279,7 +281,7 @@ if (!Fast486LoadSegment(State, FAST486_REG_CS, SegmentSelector)) { /* An exception occurred during the jump */ - return FALSE; + goto Cleanup; } if (GateSize) @@ -293,7 +295,13 @@ State->InstPtr.LowWord = LOWORD(Offset); } - return TRUE; + Success = TRUE; + +Cleanup: + /* Restore the prefix flags */ + State->PrefixFlags = OldPrefixFlags; + + return Success; } VOID Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Sat Oct 11 14:03:17 2014 @@ -103,9 +103,6 @@ IdtEntry.Selector, MAKELONG(IdtEntry.Offset, IdtEntry.OffsetHigh), IdtEntry.Type); - - /* Restore the prefix flags, which would be set to OPSIZE for 32-bit real mode */ - State->PrefixFlags = 0; } /* Clear the interrupt status */

1 0

[akhaldi] 64667: [NTOS] * Set the base address to 0x00800000 only in gdb mode, otherwise use the correct one.
by akhaldi＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: akhaldi Date: Sat Oct 11 13:43:02 2014 New Revision: 64667 URL: http://svn.reactos.org/svn/reactos?rev=64667&view=rev Log: [NTOS] * Set the base address to 0x00800000 only in gdb mode, otherwise use the correct one. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 11 13:43:02 2014 @@ -30,7 +30,11 @@ if(MSVC) set_image_base(ntoskrnl 0x00400000) else() - set_image_base(ntoskrnl 0x00800000) + if(GDB) + set_image_base(ntoskrnl 0x00800000) + else() + set_image_base(ntoskrnl 0x80800000) + endif() endif() target_link_libraries(ntoskrnl

1 0

[akhaldi] 64666: [CMAKE/BASEADDRESS] * Take the dwarf builds (NO_ROSSYM on) into account when assigning base addresses. * Dedicated to V.
by akhaldi＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: akhaldi Date: Sat Oct 11 13:36:08 2014 New Revision: 64666 URL: http://svn.reactos.org/svn/reactos?rev=64666&view=rev Log: [CMAKE/BASEADDRESS] * Take the dwarf builds (NO_ROSSYM on) into account when assigning base addresses. * Dedicated to V. Added: trunk/reactos/cmake/baseaddress_dwarf.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=64666&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Sat Oct 11 13:36:08 2014 @@ -221,7 +221,11 @@ add_subdirectory(include/reactos/mc) add_subdirectory(include/asm) - include(cmake/baseaddress.cmake) + if(NO_ROSSYM) + include(cmake/baseaddress_dwarf.cmake) + else() + include(cmake/baseaddress.cmake) + endif() # For MSVC builds, this puts all debug symbols file in the same directory. set(CMAKE_PDB_OUTPUT_DIRECTORY "${REACTOS_BINARY_DIR}/msvc_pdb") Added: trunk/reactos/cmake/baseaddress_dwarf.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/baseaddress_dwarf.cm… ============================================================================== --- trunk/reactos/cmake/baseaddress_dwarf.cmake (added) +++ trunk/reactos/cmake/baseaddress_dwarf.cmake [iso-8859-1] Sat Oct 11 13:36:08 2014 @@ -0,0 +1,329 @@ +set(baseaddress_ntdll 0x7c920000) # should be above 0x7c920000 +set(baseaddress_kernel32 0x77ca0000) +set(baseaddress_msvcrt 0x77b90000) +set(baseaddress_advapi32 0x77aa0000) +set(baseaddress_gdi32 0x77a20000) +set(baseaddress_user32 0x77820000) +set(baseaddress_dhcpcsvc 0x777c0000) +set(baseaddress_dnsapi 0x77760000) +set(baseaddress_icmp 0x77730000) +set(baseaddress_iphlpapi 0x776e0000) +set(baseaddress_ws2_32 0x77690000) +set(baseaddress_ws2help 0x77660000) +set(baseaddress_shlwapi 0x775a0000) +set(baseaddress_rpcrt4 0x77490000) +set(baseaddress_comctl32 0x772b0000) +set(baseaddress_ole32 0x77020000) +set(baseaddress_winspool.drv 0x76fe0000) +set(baseaddress_winmm 0x76f20000) +set(baseaddress_comdlg32 0x76e10000) +set(baseaddress_shell32 0x76010000) +set(baseaddress_lz32 0x75ff0000) +set(baseaddress_version 0x75fb0000) +set(baseaddress_oleaut32 0x75d60000) +set(baseaddress_setupapi 0x75b50000) +set(baseaddress_mpr 0x75b00000) +set(baseaddress_crypt32 0x759a0000) +set(baseaddress_wininet 0x758b0000) +set(baseaddress_urlmon 0x75760000) +set(baseaddress_psapi 0x75720000) +set(baseaddress_imm32 0x756d0000) +set(baseaddress_msvfw32 0x75680000) +set(baseaddress_dbghelp 0x75590000) +set(baseaddress_devmgr 0x754f0000) +set(baseaddress_msacm32 0x754a0000) +set(baseaddress_netapi32 0x75420000) +set(baseaddress_powrprof 0x753e0000) +set(baseaddress_secur32 0x75390000) +set(baseaddress_wintrust 0x75320000) +set(baseaddress_avicap32 0x752f0000) +set(baseaddress_cabinet 0x75290000) +set(baseaddress_dsound 0x751f0000) +set(baseaddress_glu32 0x750a0000) +set(baseaddress_opengl32 0x74d90000) +set(baseaddress_riched20 0x74cd0000) +set(baseaddress_smdll 0x74cb0000) +set(baseaddress_userenv 0x74c50000) +set(baseaddress_uxtheme 0x74bd0000) +set(baseaddress_cryptui 0x74b10000) +set(baseaddress_csrsrv 0x74ad0000) +set(baseaddress_basesrv 0x74a90000) +set(baseaddress_consrv 0x74a70000) +set(baseaddress_winsrv 0x74980000) +set(baseaddress_dplayx 0x748f0000) +set(baseaddress_gdiplus 0x747e0000) +set(baseaddress_msimg32 0x747b0000) +set(baseaddress_mswsock 0x74780000) +set(baseaddress_oledlg 0x74730000) +set(baseaddress_rasapi32 0x746f0000) +set(baseaddress_rsaenh 0x74670000) +set(baseaddress_samlib 0x74620000) +set(baseaddress_sensapi 0x745f0000) +set(baseaddress_sfc_os 0x745c0000) +set(baseaddress_snmpapi 0x74580000) +set(baseaddress_spoolss 0x74540000) +set(baseaddress_usp10 0x744a0000) +set(baseaddress_acledit 0x74470000) +set(baseaddress_aclui 0x74420000) +set(baseaddress_activeds 0x743f0000) +set(baseaddress_actxprxy 0x74170000) +set(baseaddress_advpack 0x74120000) +set(baseaddress_amstream 0x740b0000) +set(baseaddress_atl 0x74050000) +set(baseaddress_atl100 0x74000000) +set(baseaddress_atl80 0x73fb0000) +set(baseaddress_authz 0x73f80000) +set(baseaddress_avifil32 0x73f00000) +set(baseaddress_batt 0x73ec0000) +set(baseaddress_bcrypt 0x73e80000) +set(baseaddress_beepmidi 0x73e50000) +set(baseaddress_browseui 0x73d10000) +set(baseaddress_cards 0x73c40000) +set(baseaddress_cfgmgr32 0x73c10000) +set(baseaddress_clusapi 0x73bd0000) +set(baseaddress_comcat 0x73ba0000) +set(baseaddress_compstui 0x73b70000) +set(baseaddress_console 0x73ae0000) +set(baseaddress_credui 0x73a90000) +set(baseaddress_crtdll 0x73a10000) +set(baseaddress_cryptdlg 0x739d0000) +set(baseaddress_cryptdll 0x739a0000) +set(baseaddress_cryptnet 0x73960000) +set(baseaddress_d3d8 0x738e0000) +set(baseaddress_d3d8thk 0x738c0000) +set(baseaddress_d3d9 0x73830000) +set(baseaddress_d3dcompiler_43 0x73750000) +set(baseaddress_d3drm 0x736a0000) +set(baseaddress_d3dx9_24 0x73670000) +set(baseaddress_d3dx9_25 0x73640000) +set(baseaddress_d3dx9_26 0x73610000) +set(baseaddress_d3dx9_27 0x735e0000) +set(baseaddress_d3dx9_28 0x735b0000) +set(baseaddress_d3dx9_29 0x73580000) +set(baseaddress_d3dx9_30 0x73550000) +set(baseaddress_d3dx9_31 0x73520000) +set(baseaddress_d3dx9_32 0x734f0000) +set(baseaddress_d3dx9_33 0x734c0000) +set(baseaddress_d3dx9_34 0x73490000) +set(baseaddress_d3dx9_35 0x73460000) +set(baseaddress_d3dx9_36 0x73330000) +set(baseaddress_d3dx9_37 0x73300000) +set(baseaddress_d3dx9_38 0x732d0000) +set(baseaddress_d3dx9_39 0x732a0000) +set(baseaddress_d3dx9_40 0x73270000) +set(baseaddress_d3dx9_41 0x73240000) +set(baseaddress_d3dx9_42 0x73210000) +set(baseaddress_d3dx9_43 0x731e0000) +set(baseaddress_d3dxof 0x73190000) +set(baseaddress_dciman32 0x73160000) +set(baseaddress_ddraw 0x73070000) +set(baseaddress_deskadp 0x73030000) +set(baseaddress_deskmon 0x72ff0000) +set(baseaddress_devcpux 0x72fc0000) +set(baseaddress_devenum 0x72f60000) +set(baseaddress_dinput 0x72ee0000) +set(baseaddress_dinput8 0x72ea0000) +set(baseaddress_dmusic 0x72e40000) +set(baseaddress_dplay 0x72e10000) +set(baseaddress_dwmapi 0x72de0000) +set(baseaddress_dxdiagn 0x72d80000) +set(baseaddress_dxgi 0x72d30000) +set(baseaddress_faultrep 0x72d00000) +set(baseaddress_fltlib 0x72cd0000) +set(baseaddress_fmifs 0x72ca0000) +set(baseaddress_fontext 0x72c70000) +set(baseaddress_framebuf 0x72c40000) +set(baseaddress_framebuf_new 0x72c10000) +set(baseaddress_framedyn 0x72bc0000) +set(baseaddress_genincdata 0x72b90000) +set(baseaddress_getuname 0x728b0000) +set(baseaddress_hid 0x72880000) +set(baseaddress_hlink 0x72830000) +set(baseaddress_hnetcfg 0x727e0000) +set(baseaddress_httpapi 0x727a0000) +set(baseaddress_iccvid 0x72760000) +set(baseaddress_ieframe 0x72660000) +set(baseaddress_iernonce 0x72630000) +set(baseaddress_imagehlp 0x725f0000) +set(baseaddress_inetcomm 0x72570000) +set(baseaddress_inetmib1 0x72530000) +set(baseaddress_initpki 0x72500000) +set(baseaddress_input 0x724a0000) +set(baseaddress_inseng 0x72460000) +set(baseaddress_iologmsg 0x72440000) +set(baseaddress_itircl 0x72410000) +set(baseaddress_itss 0x723b0000) +set(baseaddress_jscript 0x72230000) +set(baseaddress_jsproxy 0x721f0000) +set(baseaddress_kbsdll 0x721c0000) +set(baseaddress_kernel32_vista 0x721a0000) +set(baseaddress_ksuser 0x72170000) +set(baseaddress_libjpeg 0x720b0000) +set(baseaddress_libpng 0x72010000) +set(baseaddress_libtiff 0x71f00000) +set(baseaddress_libxslt 0x71b80000) +set(baseaddress_loadperf 0x71b50000) +set(baseaddress_localspl 0x71b00000) +set(baseaddress_localui 0x71ac0000) +set(baseaddress_lpk 0x71a90000) +set(baseaddress_lsasrv 0x71a10000) +set(baseaddress_mapi32 0x719b0000) +set(baseaddress_mciavi32 0x71960000) +set(baseaddress_mcicda 0x71920000) +set(baseaddress_mciqtz32 0x718d0000) +set(baseaddress_mciseq 0x71890000) +set(baseaddress_mciwave 0x71850000) +set(baseaddress_mgmtapi 0x71820000) +set(baseaddress_midimap 0x717e0000) +set(baseaddress_mlang 0x71790000) +set(baseaddress_mmdevapi 0x71740000) +set(baseaddress_mmdrv 0x71710000) +set(baseaddress_modemui 0x71690000) +set(baseaddress_mprapi 0x71650000) +set(baseaddress_msafd 0x71610000) +set(baseaddress_mscat32 0x715e0000) +set(baseaddress_mscms 0x715a0000) +set(baseaddress_mscoree 0x71530000) +set(baseaddress_msctf 0x714b0000) +set(baseaddress_msdmo 0x71470000) +set(baseaddress_msftedit 0x71440000) +set(baseaddress_msgina 0x713b0000) +set(baseaddress_mshtml 0x70f90000) +set(baseaddress_msi 0x70d70000) +set(baseaddress_msimtf 0x70d30000) +set(baseaddress_msisip 0x70d00000) +set(baseaddress_mspatcha 0x70cd0000) +set(baseaddress_msports 0x70c90000) +set(baseaddress_msrle32 0x70c50000) +set(baseaddress_mssign32 0x70c20000) +set(baseaddress_mssip32 0x70bf0000) +set(baseaddress_mstask 0x70ba0000) +set(baseaddress_msv1_0 0x70b70000) +set(baseaddress_msvcrt20 0x70a40000) +set(baseaddress_msvcrt40 0x70910000) +set(baseaddress_msvidc32 0x708d0000) +set(baseaddress_msxml 0x70890000) +set(baseaddress_msxml2 0x70850000) +set(baseaddress_msxml3 0x70370000) +set(baseaddress_msxml4 0x70320000) +set(baseaddress_msxml6 0x702d0000) +set(baseaddress_nddeapi 0x702a0000) +set(baseaddress_netcfgx 0x70200000) +set(baseaddress_netevent 0x701e0000) +set(baseaddress_netid 0x70190000) +set(baseaddress_netshell 0x700f0000) +set(baseaddress_newdev 0x70080000) +set(baseaddress_notifyhook 0x70050000) +set(baseaddress_ntdsapi 0x70010000) +set(baseaddress_ntlanman 0x6ffe0000) +set(baseaddress_ntmarta 0x6ffb0000) +set(baseaddress_ntprint 0x6ff80000) +set(baseaddress_objsel 0x6ff40000) +set(baseaddress_odbc32 0x6fef0000) +set(baseaddress_odbccp32 0x6feb0000) +set(baseaddress_oleacc 0x6fe40000) +set(baseaddress_olecli32 0x6fe00000) +set(baseaddress_olepro32 0x6fdd0000) +set(baseaddress_olesvr32 0x6fda0000) +set(baseaddress_olethk32 0x6fd70000) +set(baseaddress_pdh 0x6fd30000) +set(baseaddress_pidgen 0x6fd00000) +set(baseaddress_printui 0x6fcc0000) +set(baseaddress_propsys 0x6fc70000) +set(baseaddress_pstorec 0x6fc30000) +set(baseaddress_qedit 0x6fbd0000) +set(baseaddress_qmgr 0x6fb80000) +set(baseaddress_qmgrprxy 0x6fb10000) +set(baseaddress_quartz 0x6f910000) +set(baseaddress_query 0x6f8e0000) +set(baseaddress_rasadhlp 0x6f8b0000) +set(baseaddress_rasdlg 0x6f6d0000) +set(baseaddress_rasman 0x6f690000) +set(baseaddress_resutils 0x6f650000) +set(baseaddress_riched32 0x6f620000) +set(baseaddress_rsabase 0x6f600000) +set(baseaddress_samsrv 0x6f570000) +set(baseaddress_sccbase 0x6f540000) +set(baseaddress_schannel 0x6f4f0000) +set(baseaddress_scrrun 0x6f490000) +set(baseaddress_security 0x6f470000) +set(baseaddress_serialui 0x6f440000) +set(baseaddress_sfc 0x6f410000) +set(baseaddress_shdoclc 0x6f3d0000) +set(baseaddress_shdocvw 0x6f370000) +set(baseaddress_shfolder 0x6f350000) +set(baseaddress_shimgvw 0x6f310000) +set(baseaddress_slayer 0x6f2d0000) +set(baseaddress_slbcsp 0x6f2a0000) +set(baseaddress_sndblst 0x6f260000) +set(baseaddress_softpub 0x6f240000) +set(baseaddress_srclient 0x6f210000) +set(baseaddress_sti 0x6f1c0000) +set(baseaddress_sxs 0x6f180000) +set(baseaddress_syssetup 0x6f0c0000) +set(baseaddress_t2embed 0x6f090000) +set(baseaddress_tapi32 0x6f040000) +set(baseaddress_tapiui 0x6efd0000) +set(baseaddress_traffic 0x6efa0000) +set(baseaddress_twain_32 0x6ef60000) +set(baseaddress_uext2 0x6ef20000) +set(baseaddress_ufat 0x6eef0000) +set(baseaddress_ufatx 0x6eec0000) +set(baseaddress_umpnpmgr 0x6ee80000) +set(baseaddress_unicows 0x6ee40000) +set(baseaddress_untfs 0x6ee20000) +set(baseaddress_updspapi 0x6edf0000) +set(baseaddress_url 0x6edc0000) +set(baseaddress_vbscript 0x6ecf0000) +set(baseaddress_vdmdbg 0x6ecc0000) +set(baseaddress_wbemdisp 0x6ec80000) +set(baseaddress_wbemprox 0x6ebf0000) +set(baseaddress_windowscodecs 0x6ea60000) +set(baseaddress_windowscodecsext 0x6ea30000) +set(baseaddress_wined3d 0x6e790000) +set(baseaddress_winfax 0x6e760000) +set(baseaddress_wing32 0x6e730000) +set(baseaddress_winhttp 0x6e6b0000) +set(baseaddress_winscard 0x6e670000) +set(baseaddress_winsta 0x6e630000) +set(baseaddress_wlanapi 0x6e5f0000) +set(baseaddress_wldap32 0x6e590000) +set(baseaddress_wmi 0x6e570000) +set(baseaddress_ws2_32_new 0x6e500000) +set(baseaddress_wshirda 0x6e4d0000) +set(baseaddress_wshtcpip 0x6e4a0000) +set(baseaddress_wsock32 0x6e470000) +set(baseaddress_wtsapi32 0x6e430000) +set(baseaddress_wuapi 0x6e3e0000) +set(baseaddress_xinput1_1 0x6e3b0000) +set(baseaddress_xinput1_2 0x6e380000) +set(baseaddress_xinput1_3 0x6e350000) +set(baseaddress_xinput9_1_0 0x6e320000) +set(baseaddress_xmllite 0x6e2d0000) +set(baseaddress_access 0x6e240000) +set(baseaddress_appwiz 0x6e1d0000) +set(baseaddress_cmicpl 0x6e190000) +set(baseaddress_desk 0x6e0e0000) +set(baseaddress_hdwwiz 0x6e050000) +set(baseaddress_hhctrl 0x6dfe0000) +set(baseaddress_imaadp32.acm 0x6dfa0000) +set(baseaddress_inetcpl 0x6df30000) +set(baseaddress_intl 0x6dec0000) +set(baseaddress_joy 0x6de70000) +set(baseaddress_main 0x6ddb0000) +set(baseaddress_mmsys 0x6dca0000) +set(baseaddress_msacm32.drv 0x6dc60000) +set(baseaddress_msadp32.acm 0x6dc20000) +set(baseaddress_msg711.acm 0x6dbe0000) +set(baseaddress_msgsm32.acm 0x6dbb0000) +set(baseaddress_msisys 0x6db80000) +set(baseaddress_ncpa 0x6db50000) +set(baseaddress_odbccp32i 0x6db20000) +set(baseaddress_powercfg 0x6dab0000) +set(baseaddress_sysdm 0x6d9c0000) +set(baseaddress_telephon 0x6d990000) +set(baseaddress_timedate 0x6d930000) +set(baseaddress_usrmgr 0x6d8d0000) +set(baseaddress_wdmaud.drv 0x6d6f0000) +set(baseaddress_wined3dcfg 0x6d6b0000) +set(baseaddress_winemp3.acm 0x6d620000) Propchange: trunk/reactos/cmake/baseaddress_dwarf.cmake ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tfaber] 64665: [NTOS:KE] - Implement KiRaiseSecurityCheckFailure[Handler] to handle int 0x29 (__fastfail). Based on patch by Timo Kreuzer. (Yes, this is a Windows 8 feature. However all it does is...
by tfaber＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tfaber Date: Sat Oct 11 13:15:10 2014 New Revision: 64665 URL: http://svn.reactos.org/svn/reactos?rev=64665&view=rev Log: [NTOS:KE] - Implement KiRaiseSecurityCheckFailure[Handler] to handle int 0x29 (__fastfail). Based on patch by Timo Kreuzer. (Yes, this is a Windows 8 feature. However all it does is improve the debugging experience, and we have a need for that) CORE-8419 Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sat Oct 11 13:15:10 2014 @@ -1128,7 +1128,7 @@ Run a system diagnostic utility supplied by your hardware manufacturer. In particular, run a memory check, and check for faulty or mismatched memory. Try changing video adapters. - + Disable or remove any newly installed hardware and drivers. Disable or remove any newly installed software. If you need to use Safe Mode to remove or disable components, restart your computer, press F8 to select @@ -1322,7 +1322,7 @@ SymbolicName=DRIVER_CORRUPTED_EXPOOL Language=English A device driver has pool. - + Check to make sure any new hardware or software is properly installed. If this is a new installation, ask your hardware or software manufacturer for any ReactOS updates you might need. @@ -1478,7 +1478,7 @@ must not contain such items. Usually this is memory being freed. This is usually caused by a device driver that has not cleaned up properly before freeing memory. - + If Parameter1 == 1, an attempt was made to queue an executive worker item with a usermode execution routine. . @@ -1570,3 +1570,11 @@ Language=English An attempt was made to execute to non-executable memory. . + +MessageId=0x139 +Severity=Success +Facility=System +SymbolicName=KERNEL_SECURITY_CHECK_FAILURE +Language=English +A critical kernel security check failed. +. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Oct 11 13:15:10 2014 @@ -59,9 +59,11 @@ idt _KiTrap11, INT_32_DPL0 /* INT 11: Align Check Exception (#AC) */ idt _KiTrap0F, INT_32_DPL0 /* INT 12: Machine Check Exception (#MC)*/ idt _KiTrap0F, INT_32_DPL0 /* INT 13: SIMD FPU Exception (#XF) */ -REPEAT 22 -idt _KiTrap0F, INT_32_DPL0 /* INT 14-29: UNDEFINED INTERRUPTS */ +REPEAT 21 +idt _KiTrap0F, INT_32_DPL0 /* INT 14-28: UNDEFINED INTERRUPTS */ ENDR +idt _KiRaiseSecurityCheckFailure, INT_32_DPL3 + /* INT 29: Handler for __fastfail */ idt _KiGetTickCount, INT_32_DPL3 /* INT 2A: Get Tick Count Handler */ idt _KiCallbackReturn, INT_32_DPL3 /* INT 2B: User-Mode Callback Return */ idt _KiRaiseAssertion, INT_32_DPL3 /* INT 2C: Debug Assertion Handler */ @@ -113,6 +115,7 @@ TRAP_ENTRY KiTrap10, KI_PUSH_FAKE_ERROR_CODE TRAP_ENTRY KiTrap11, KI_PUSH_FAKE_ERROR_CODE TRAP_ENTRY KiTrap13, KI_PUSH_FAKE_ERROR_CODE +TRAP_ENTRY KiRaiseSecurityCheckFailure, KI_PUSH_FAKE_ERROR_CODE TRAP_ENTRY KiGetTickCount, KI_PUSH_FAKE_ERROR_CODE TRAP_ENTRY KiCallbackReturn, KI_PUSH_FAKE_ERROR_CODE TRAP_ENTRY KiRaiseAssertion, KI_PUSH_FAKE_ERROR_CODE 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] Sat Oct 11 13:15:10 2014 @@ -1462,6 +1462,46 @@ VOID FASTCALL +KiRaiseSecurityCheckFailureHandler(IN PKTRAP_FRAME TrapFrame) +{ + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Decrement EIP to point to the INT29 instruction (2 bytes, not 1 like INT3) */ + TrapFrame->Eip -= 2; + + /* Check if this is a user trap */ + if (KiUserTrap(TrapFrame)) + { + /* Dispatch exception to user mode */ + KiDispatchException1Args(STATUS_STACK_BUFFER_OVERRUN, + TrapFrame->Eip, + TrapFrame->Ecx, + TrapFrame); + } + else + { + EXCEPTION_RECORD ExceptionRecord; + + /* Bugcheck the system */ + ExceptionRecord.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; + ExceptionRecord.ExceptionFlags = EXCEPTION_NONCONTINUABLE; + ExceptionRecord.ExceptionRecord = NULL; + ExceptionRecord.ExceptionAddress = (PVOID)TrapFrame->Eip; + ExceptionRecord.NumberParameters = 1; + ExceptionRecord.ExceptionInformation[0] = TrapFrame->Ecx; + + KeBugCheckWithTf(KERNEL_SECURITY_CHECK_FAILURE, + TrapFrame->Ecx, + (ULONG_PTR)TrapFrame, + (ULONG_PTR)&ExceptionRecord, + 0, + TrapFrame); + } +} + +VOID +FASTCALL KiGetTickCountHandler(IN PKTRAP_FRAME TrapFrame) { UNIMPLEMENTED_DBGBREAK();

1 0

[tkreuzer] 64664: [RTL/NTOSKRNL] Rename AVL tree functions with macros when included from Mm. This is necessary since the compiler might chose to not inline these functions (and does so on MSVC deb...
by tkreuzer＠svn.reactos.org 11 Oct '14

11 Oct '14

Author: tkreuzer Date: Sat Oct 11 12:40:24 2014 New Revision: 64664 URL: http://svn.reactos.org/svn/reactos?rev=64664&view=rev Log: [RTL/NTOSKRNL] Rename AVL tree functions with macros when included from Mm. This is necessary since the compiler might chose to not inline these functions (and does so on MSVC debug builds) yet only generate one instance of the function, where 2 different versions are required. This caused RtlAvlTree functions to fail on MSVC builds, since they were calling the functions compiled for Mm AVL trees! Modified: trunk/reactos/lib/rtl/avlsupp.c trunk/reactos/ntoskrnl/mm/ARM3/miavl.h Modified: trunk/reactos/lib/rtl/avlsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=6466… ============================================================================== --- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Sat Oct 11 12:40:24 2014 @@ -96,7 +96,7 @@ FORCEINLINE VOID -RtlPromoteAvlTreeNode(IN PRTL_BALANCED_LINKS Node) +RtlpPromoteAvlTreeNode(IN PRTL_BALANCED_LINKS Node) { PRTL_BALANCED_LINKS ParentNode, SuperParentNode; PRTL_BALANCED_LINKS *SwapNode1, *SwapNode2; @@ -139,7 +139,7 @@ if (RtlBalance(ChildNode) == Balance) { /* This performs the rotation described in Knuth A8-A10 for Case 1 */ - RtlPromoteAvlTreeNode(ChildNode); + RtlpPromoteAvlTreeNode(ChildNode); /* The nodes are now balanced */ RtlSetBalance(ChildNode, RtlBalancedAvlTree); @@ -155,8 +155,8 @@ RtlLeftChildAvl(ChildNode) : RtlRightChildAvl(ChildNode); /* Do the double-rotation described in Knuth A8-A10 for Case 2 */ - RtlPromoteAvlTreeNode(SubChildNode); - RtlPromoteAvlTreeNode(SubChildNode); + RtlpPromoteAvlTreeNode(SubChildNode); + RtlpPromoteAvlTreeNode(SubChildNode); /* Was the sub-child sharing the same balance as the node? */ if (RtlBalance(SubChildNode) == Balance) @@ -194,7 +194,7 @@ * The case that remains is that the child was already balanced, so this is * This is the rotation required for Case 3 in Knuth A8-A10 */ - RtlPromoteAvlTreeNode(ChildNode); + RtlpPromoteAvlTreeNode(ChildNode); /* Now the child has the opposite weight of the node */ RtlSetBalance(ChildNode, -Balance); Modified: trunk/reactos/ntoskrnl/mm/ARM3/miavl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miavl.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miavl.h [iso-8859-1] Sat Oct 11 12:40:24 2014 @@ -28,9 +28,30 @@ #define PRTL_BALANCED_LINKS PMMADDRESS_NODE #define MI_ASSERT(x) ASSERT(x) +/* We need to rename the functions to prevent conflicts when not inlined! */ +#define RtlpFindAvlTableNodeOrParent MiFindAvlTableNodeOrParent +#define RtlpPromoteAvlTreeNode MiPromoteAvlTreeNode +#define RtlpRebalanceAvlTreeNode MiRebalanceAvlTreeNode +#define RtlpInsertAvlTreeNode MiInsertAvlTreeNode +#define RtlpDeleteAvlTreeNode MiDeleteAvlTreeNode + +/* These are implementation specific */ +#define RtlpCopyAvlNodeData MiCopyAvlNodeData +#define RtlpAvlCompareRoutine MiAvlCompareRoutine +#define RtlSetParent MiSetParent +#define RtlSetBalance MiSetBalance +#define RtlBalance MiBalance +#define RtlParentAvl MiParentAvl +#define RtlRightChildAvl MiRightChildAvl +#define RtlLeftChildAvl MiLeftChildAvl +#define RtlIsLeftChildAvl MiIsLeftChildAvl +#define RtlIsRightChildAvl MiIsRightChildAvl +#define RtlInsertAsLeftChildAvl MiInsertAsLeftChildAvl +#define RtlInsertAsRightChildAvl MiInsertAsRightChildAvl + FORCEINLINE VOID -RtlpCopyAvlNodeData(IN PRTL_BALANCED_LINKS Node1, +MiCopyAvlNodeData(IN PRTL_BALANCED_LINKS Node1, IN PRTL_BALANCED_LINKS Node2) { Node1->u1.Parent = Node2->u1.Parent; @@ -40,7 +61,7 @@ FORCEINLINE RTL_GENERIC_COMPARE_RESULTS -RtlpAvlCompareRoutine(IN PRTL_AVL_TABLE Table, +MiAvlCompareRoutine(IN PRTL_AVL_TABLE Table, IN PVOID Buffer, IN PVOID UserData) { @@ -62,7 +83,7 @@ FORCEINLINE VOID -RtlSetParent(IN PRTL_BALANCED_LINKS Node, +MiSetParent(IN PRTL_BALANCED_LINKS Node, IN PRTL_BALANCED_LINKS Parent) { Node->u1.Parent = (PRTL_BALANCED_LINKS)((ULONG_PTR)Parent | (Node->u1.Balance & 0x3)); @@ -70,7 +91,7 @@ FORCEINLINE VOID -RtlSetBalance(IN PRTL_BALANCED_LINKS Node, +MiSetBalance(IN PRTL_BALANCED_LINKS Node, IN SCHAR Balance) { Node->u1.Balance = Balance; @@ -78,56 +99,49 @@ FORCEINLINE SCHAR -RtlBalance(IN PRTL_BALANCED_LINKS Node) +MiBalance(IN PRTL_BALANCED_LINKS Node) { return (SCHAR)Node->u1.Balance; } FORCEINLINE PRTL_BALANCED_LINKS -RtlParentAvl(IN PRTL_BALANCED_LINKS Node) +MiParentAvl(IN PRTL_BALANCED_LINKS Node) { return (PRTL_BALANCED_LINKS)((ULONG_PTR)Node->u1.Parent & ~3); } FORCEINLINE -BOOLEAN -RtlIsRootAvl(IN PRTL_BALANCED_LINKS Node) -{ - return (RtlParentAvl(Node) == Node); -} - -FORCEINLINE PRTL_BALANCED_LINKS -RtlRightChildAvl(IN PRTL_BALANCED_LINKS Node) +MiRightChildAvl(IN PRTL_BALANCED_LINKS Node) { return Node->RightChild; } FORCEINLINE PRTL_BALANCED_LINKS -RtlLeftChildAvl(IN PRTL_BALANCED_LINKS Node) +MiLeftChildAvl(IN PRTL_BALANCED_LINKS Node) { return Node->LeftChild; } FORCEINLINE BOOLEAN -RtlIsLeftChildAvl(IN PRTL_BALANCED_LINKS Node) +MiIsLeftChildAvl(IN PRTL_BALANCED_LINKS Node) { return (RtlLeftChildAvl(RtlParentAvl(Node)) == Node); } FORCEINLINE BOOLEAN -RtlIsRightChildAvl(IN PRTL_BALANCED_LINKS Node) +MiIsRightChildAvl(IN PRTL_BALANCED_LINKS Node) { return (RtlRightChildAvl(RtlParentAvl(Node)) == Node); } FORCEINLINE VOID -RtlInsertAsLeftChildAvl(IN PRTL_BALANCED_LINKS Parent, +MiInsertAsLeftChildAvl(IN PRTL_BALANCED_LINKS Parent, IN PRTL_BALANCED_LINKS Node) { Parent->LeftChild = Node; @@ -136,7 +150,7 @@ FORCEINLINE VOID -RtlInsertAsRightChildAvl(IN PRTL_BALANCED_LINKS Parent, +MiInsertAsRightChildAvl(IN PRTL_BALANCED_LINKS Parent, IN PRTL_BALANCED_LINKS Node) { Parent->RightChild = Node;

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