Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 37428: RtlWalkFrameChain: - stop when we leave the stack or Rip gets 0
by tkreuzer＠svn.reactos.org 18 Nov '08

18 Nov '08

Author: tkreuzer Date: Mon Nov 17 18:39:39 2008 New Revision: 37428 URL: http://svn.reactos.org/svn/reactos?rev=37428&view=rev Log: RtlWalkFrameChain: - stop when we leave the stack or Rip gets 0 Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Mon Nov 17 18:39:39 2008 @@ -336,11 +336,14 @@ PVOID HandlerData; INT i; PRUNTIME_FUNCTION FunctionEntry; -DPRINT1("RtlWalkFrameChain called\n"); + + DPRINT("Enter RtlWalkFrameChain\n"); + + /* Capture the current Context */ RtlCaptureContext(&Context); - ControlPc = Context.Rip; + /* Get the stack limits */ RtlpGetStackLimits(&StackLow, &StackHigh); /* Check if we want the user-mode stack frame */ @@ -374,13 +377,24 @@ DPRINT("normal funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); } + /* Check if new Rip is valid */ + if (!Context.Rip) + { + break; + } + + /* Check, if we have left our stack */ + if ((Context.Rsp < StackLow) || (Context.Rsp > StackHigh)) + { + break; + } + + /* Save this frame and continue with new Rip */ ControlPc = Context.Rip; - /* Save this frame */ - Callers[i] = (PVOID)ControlPc; - - } - + } + + DPRINT("RtlWalkFrameChain returns %ld\n", i); return i; }

1 0

[tkreuzer] 37427: remove kernel32 dependency from mingw.rbuild
by tkreuzer＠svn.reactos.org 18 Nov '08

18 Nov '08

Author: tkreuzer Date: Mon Nov 17 18:32:20 2008 New Revision: 37427 URL: http://svn.reactos.org/svn/reactos?rev=37427&view=rev Log: remove kernel32 dependency from mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild Modified: branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/3rdparty/mingw/mingw.rbuild [iso-8859-1] Mon Nov 17 18:32:20 2008 @@ -4,7 +4,7 @@ <module name="mingw_common" type="staticlibrary" isstartuplib="true" underscoresymbols="true" crt="dll"> <importlibrary definition="moldname-msvcrt.def" dllname="msvcrt.dll" /> <include base="mingw_common">include</include> - <library>kernel32</library> +  <file>_newmode.c</file> <file>_wgetopt.c</file> <file>argv.c</file>

1 0

[tkreuzer] 37426: "[00:08] Stefan100: 5) Alex_Ionescu will have your head" Well, no risk, no fun... ; -) Implement RtlpGetStackLimits
by tkreuzer＠svn.reactos.org 18 Nov '08

18 Nov '08

Author: tkreuzer Date: Mon Nov 17 18:31:22 2008 New Revision: 37426 URL: http://svn.reactos.org/svn/reactos?rev=37426&view=rev Log: "[00:08] Stefan100: 5) Alex_Ionescu will have your head" Well, no risk, no fun... ;-) Implement RtlpGetStackLimits Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c Modified: branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/n… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/ntdll/rtl/libsupp.c [iso-8859-1] Mon Nov 17 18:31:22 2008 @@ -204,6 +204,19 @@ *StackEnd = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; return TRUE; } + +#ifdef _AMD64_ +VOID +NTAPI +RtlpGetStackLimits( + OUT PULONG_PTR LowLimit, + OUT PULONG_PTR HighLimit) +{ + *LowLimit = (ULONG_PTR)NtCurrentTeb()->Tib.StackLimit; + *HighLimit = (ULONG_PTR)NtCurrentTeb()->Tib.StackBase; + return; +} +#endif /* RTL Atom Tables ************************************************************/ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Mon Nov 17 18:31:22 2008 @@ -435,6 +435,19 @@ #endif +#ifdef _AMD64_ +VOID +NTAPI +RtlpGetStackLimits( + OUT PULONG_PTR LowLimit, + OUT PULONG_PTR HighLimit) +{ + PKTHREAD CurrentThread = KeGetCurrentThread(); + *HighLimit = (ULONG_PTR)CurrentThread->InitialStack; + *LowLimit = (ULONG_PTR)CurrentThread->StackLimit; +} +#endif + /* RTL Atom Tables ************************************************************/ NTSTATUS

1 0

[tkreuzer] 37425: Implement RtlGetCallersAddress
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 17:24:59 2008 New Revision: 37425 URL: http://svn.reactos.org/svn/reactos?rev=37425&view=rev Log: Implement RtlGetCallersAddress Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Mon Nov 17 17:24:59 2008 @@ -332,7 +332,7 @@ { CONTEXT Context; ULONG64 ControlPc, ImageBase, EstablisherFrame; - ULONG64 StackBegin, StackEnd; + ULONG64 StackLow, StackHigh; PVOID HandlerData; INT i; PRUNTIME_FUNCTION FunctionEntry; @@ -341,7 +341,7 @@ ControlPc = Context.Rip; - RtlpGetStackLimits(&StackBegin, &StackEnd); + RtlpGetStackLimits(&StackLow, &StackHigh); /* Check if we want the user-mode stack frame */ if (Flags == 1) @@ -384,3 +384,29 @@ return i; } +// CHEKCME: return PVOID? +// http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Debug… +VOID +NTAPI +RtlGetCallersAddress( + OUT PVOID *CallersAddress, + OUT PVOID *CallersCaller ) +{ + PVOID Callers[4]; + ULONG Number; + + /* Get callers: + * RtlWalkFrameChain -> RtlGetCallersAddress -> x -> y */ + Number = RtlWalkFrameChain(Callers, 4, 0); + + if (CallersAddress) + { + *CallersAddress = (Number >= 3) ? Callers[2] : NULL; + } + if (CallersCaller) + { + *CallersCaller = (Number == 4) ? Callers[3] : NULL; + } + + return; +}

1 0

[tkreuzer] 37424: StackLimit < StackBase! Rename parameters in prototype of RtlpGetStackLimits to LowLimit and HighLimit.
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 16:24:54 2008 New Revision: 37424 URL: http://svn.reactos.org/svn/reactos?rev=37424&view=rev Log: StackLimit < StackBase! Rename parameters in prototype of RtlpGetStackLimits to LowLimit and HighLimit. Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtlp.h branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/util.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/rtlp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/rtlp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/rtlp.h [iso-8859-1] Mon Nov 17 16:24:54 2008 @@ -28,8 +28,8 @@ VOID NTAPI -RtlpGetStackLimits(PULONG_PTR StackBase, - PULONG_PTR StackLimit); +RtlpGetStackLimits(PULONG_PTR LowLimit, + PULONG_PTR HighLimit); PEXCEPTION_REGISTRATION_RECORD NTAPI Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/util.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/io/iomgr/util.c [iso-8859-1] Mon Nov 17 16:24:54 2008 @@ -16,8 +16,8 @@ VOID NTAPI -RtlpGetStackLimits(PULONG_PTR StackBase, - PULONG_PTR StackLimit); +RtlpGetStackLimits(PULONG_PTR LowLimit, + PULONG_PTR HighLimit); /* FUNCTIONS *****************************************************************/

1 0

[sginsberg] 37423: - "byte" is defined by the Win32 headers, so define it conditionally
by sginsberg＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sginsberg Date: Mon Nov 17 16:01:19 2008 New Revision: 37423 URL: http://svn.reactos.org/svn/reactos?rev=37423&view=rev Log: - "byte" is defined by the Win32 headers, so define it conditionally Modified: trunk/reactos/lib/3rdparty/adns/src/internal.h Modified: trunk/reactos/lib/3rdparty/adns/src/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/inte… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/internal.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/internal.h [iso-8859-1] Mon Nov 17 16:01:19 2008 @@ -31,7 +31,11 @@ #define ADNS_INTERNAL_H_INCLUDED #include "config.h" + +#ifndef ADNS_JGAA_WIN32 typedef unsigned char byte; +#endif + #include <stdarg.h> #include <assert.h>

1 0

[sginsberg] 37422: - MSTSC: Don't redefine BOOL - Regedit: Don't include basetyps.h. Not needed and it just breaks things. Also don't include aclui.h as we...for some reason...implement the required parts of that API locally
by sginsberg＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: sginsberg Date: Mon Nov 17 15:52:55 2008 New Revision: 37422 URL: http://svn.reactos.org/svn/reactos?rev=37422&view=rev Log: - MSTSC: Don't redefine BOOL - Regedit: Don't include basetyps.h. Not needed and it just breaks things. Also don't include aclui.h as we...for some reason...implement the required parts of that API locally Modified: trunk/reactos/base/applications/mstsc/types.h trunk/reactos/base/applications/regedit/regedit.h Modified: trunk/reactos/base/applications/mstsc/types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ty… ============================================================================== --- trunk/reactos/base/applications/mstsc/types.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mstsc/types.h [iso-8859-1] Mon Nov 17 15:52:55 2008 @@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ - -typedef int BOOL; #ifndef True #define True (1) Modified: trunk/reactos/base/applications/regedit/regedit.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.h [iso-8859-1] Mon Nov 17 15:52:55 2008 @@ -13,9 +13,7 @@ #include <limits.h> #include <accctrl.h> #include <objbase.h> -#include <basetyps.h> #include <unknwn.h> -#include <aclui.h> #include <aclapi.h> #include <commdlg.h> #include <cderr.h>

1 0

[dreimer] 37421: OH my.... the ELF problem was MY!!!! Fault...
by dreimer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: dreimer Date: Mon Nov 17 14:35:59 2008 New Revision: 37421 URL: http://svn.reactos.org/svn/reactos?rev=37421&view=rev Log: OH my.... the ELF problem was MY!!!! Fault... Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Mon Nov 17 14:35:59 2008 @@ -211,6 +211,18 @@ } cls +"Whether to compile support for ELF files. Do not enable unless you know what" +"you're doing." +"Default is: 0" +"" +$ELF = $xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value} +"Right now: $ELF" +$ELF_CH = Read-Host "(0), (1)" +if ($ELF_CH -eq $null) { + $ELF_CH = $ELF +} +cls + # # Generate a config.rbuild, copy it to the Source Tree and delete temp files. # @@ -222,6 +234,7 @@ $xml.group.property | ? { $_.Name -eq "GDB" } | % { $_.Value = "$GDB_CH"} $xml.group.property | ? { $_.Name -eq "NSWPAT" } | % { $_.Value = "$NSWPAT_CH"} $xml.group.property | ? { $_.Name -eq "_WINKD_" } | % { $_.Value = "$WINKD_CH"} +$xml.group.property | ? { $_.Name -eq "_ELF_" } | % { $_.Value = "$ELF_CH"} $xml.save("$ENV:APPDATA\RosBE\config.rbuild") copy "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" @@ -241,6 +254,7 @@ $GDB_CH = $null $NSWPAT_CH = $null $WINKD_CH = $null +$ELF_CH = $null $SARCH = $null $OARCH = $null $OPTIMIZE = $null @@ -249,6 +263,7 @@ $GDB = $null $NSWPAT = $null $WINKD = $null +$ELF = $null $XML = $null settitle Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd [iso-8859-1] Mon Nov 17 14:35:59 2008 @@ -226,6 +226,19 @@ ) cls +echo Whether to compile support for ELF files. Do not enable unless you know what +echo you're doing. +echo Default is: 0 +echo. +for /f "usebackq tokens=3" %%i in (`"type "%APPDATA%\RosBE\config.rbuild" | find "_ELF_" | find "property name""`) do set ELF=%%i +set ELF=%ELF:~7,-1% +echo Right now: %ELF% +set /p ELF_CH="(0), (1)" +if "%ELF_CH%" == "" ( + set ELF_CH=%ELF% +) +cls + :: :: Generate a config.rbuild, copy it to the Source Tree and delete temp files. :: @@ -240,6 +253,7 @@ echo ^<property name="GDB" value="%GDB_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="NSWPAT" value="%NSWPAT_CH%" /^>>>%TEMP%\config.tmp echo ^<property name="_WINKD_" value="%WINKD_CH%" /^>>>%TEMP%\config.tmp +echo ^<property name="_ELF_" value="%ELF_CH%" /^>>>%TEMP%\config.tmp echo ^</group^>>>%TEMP%\config.tmp copy "%TEMP%\config.tmp" "%APPDATA%\RosBE\config.rbuild" >NUL @@ -266,6 +280,7 @@ set GDB_CH= set NSWPAT_CH= set WINKD_CH= +set ELF_CH= set SARCH= set OARCH= set OPTIMIZE= @@ -274,3 +289,4 @@ set GDB= set NSWPAT= set WINKD= +set ELF=

1 0

[tkreuzer] 37420: ...and remove it from amd64stubs.c
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:53:18 2008 New Revision: 37420 URL: http://svn.reactos.org/svn/reactos?rev=37420&view=rev Log: ...and remove it from amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Mon Nov 17 13:53:18 2008 @@ -46,5 +46,4 @@ STUB(NtVdmControl) STUB(PspGetOrSetContextKernelRoutine) STUB(RtlGetCallersAddress) -STUB(RtlUnwind) STUB(RtlpGetStackLimits)

1 0

[tkreuzer] 37419: Add RtlUnwind stub to rtl...
by tkreuzer＠svn.reactos.org 17 Nov '08

17 Nov '08

Author: tkreuzer Date: Mon Nov 17 13:52:30 2008 New Revision: 37419 URL: http://svn.reactos.org/svn/reactos?rev=37419&view=rev Log: Add RtlUnwind stub to rtl... Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/unwind.c [iso-8859-1] Mon Nov 17 13:52:30 2008 @@ -1,7 +1,8 @@ -/* COPYRIGHT: See COPYING in the top level directory +/* + * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries * PURPOSE: Exception related functions - * PROGRAMMER: Timo Kreuzer + * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -132,7 +133,6 @@ /* Do a binary search */ IndexLo = 0; IndexHi = TableLength; - while (IndexHi > IndexLo) { IndexMid = (IndexLo + IndexHi) / 2; @@ -293,7 +293,7 @@ /* Unwind is finished, pop new Rip from Stack */ Context->Rip = *(DWORD64*)Context->Rsp; - Context->Rsp += 8; + Context->Rsp += sizeof(DWORD64); return 0; } @@ -307,6 +307,18 @@ IN PVOID ReturnValue, OUT PCONTEXT OriginalContext, IN PUNWIND_HISTORY_TABLE HistoryTable) +{ + UNIMPLEMENTED; + return; +} + +VOID +NTAPI +RtlUnwind( + IN PVOID TargetFrame, + IN PVOID TargetIp, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PVOID ReturnValue) { UNIMPLEMENTED; return; @@ -345,9 +357,9 @@ /* Is this a leaf function? */ if (!FunctionEntry) { - Context.Rip = *(ULONG64*)Context.Rsp; - Context.Rsp += sizeof(ULONG64); - DPRINT1("leaf funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); + Context.Rip = *(DWORD64*)Context.Rsp; + Context.Rsp += sizeof(DWORD64); + DPRINT("leaf funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); } else { @@ -359,7 +371,7 @@ &HandlerData, &EstablisherFrame, NULL); - DPRINT1("normal funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); + DPRINT("normal funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); } ControlPc = Context.Rip;

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