Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 37337: Adding a old test for ddraw, that have lying around for awhile now, small rewrite have been done so it can be compile with reactos
by greatlrd＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: greatlrd Date: Thu Nov 13 03:43:46 2008 New Revision: 37337 URL: http://svn.reactos.org/svn/reactos?rev=37337&view=rev Log: Adding a old test for ddraw, that have lying around for awhile now, small rewrite have been done so it can be compile with reactos Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c Modified: branches/reactx/rostests/apitests/ddrawapi/testlist.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/testlist.c [iso-8859-1] Thu Nov 13 03:43:46 2008 @@ -3,6 +3,7 @@ #include "ddrawapi.h" void dump_ddrawi_directdraw_int(LPDDRAWI_DIRECTDRAW_INT lpDraw_int); +void dump_ddrawi_directdraw_lcl(LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl); /* dump all data struct when this is trun onm usefull when u debug ddraw.dll */ #define DUMP_ON 1 @@ -26,7 +27,7 @@ /* The function that gives us the number of tests */ INT NumTests(void) { - return sizeof(TestList) / sizeof(TESTENTRY); + return sizeof(TestList) / sizeof(TESTENTRY); } /* old debug macro and dump data */ @@ -34,11 +35,45 @@ void dump_ddrawi_directdraw_int(LPDDRAWI_DIRECTDRAW_INT lpDraw_int) { - printf("%08lx pIntDirectDraw7->lpVtbl : 0x%p\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl), lpDraw_int->lpVtbl); - printf("%08lx pIntDirectDraw7->lpLcl : 0x%p\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl), lpDraw_int->lpLcl ); - printf("%08lx pIntDirectDraw7->lpLink : 0x%p\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink), lpDraw_int->lpLink ); - printf("%08lx pIntDirectDraw7->dwIntRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt), lpDraw_int->dwIntRefCnt ); + printf("%08lx LPVOID pDirectDraw->lpVtbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpVtbl), lpDraw_int->lpVtbl); + printf("%08lx LPDDRAWI_DIRECTDRAW_LCL pDirectDraw->lpLcl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLcl), lpDraw_int->lpLcl ); + printf("%08lx LPDDRAWI_DIRECTDRAW_INT pDirectDraw->lpLink : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, lpLink), lpDraw_int->lpLink ); + printf("%08lx DWORD pDirectDraw->dwIntRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_INT, dwIntRefCnt), lpDraw_int->dwIntRefCnt ); } + + +void dump_ddrawi_directdraw_lcl(LPDDRAWI_DIRECTDRAW_LCL lpDraw_lcl) +{ + printf("%08lx DWORD lpLcl->lpDDMore : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDMore), lpDraw_lcl->lpDDMore); + printf("%08lx LPDDRAWI_DIRECTDRAW_GBL lpLcl->lpGbl : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGbl), lpDraw_lcl->lpGbl); + printf("%08lx DWORD lpLcl->dwUnused0 : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwUnused0), lpDraw_lcl->dwUnused0); + printf("%08lx DWORD lpLcl->dwLocalFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalFlags), lpDraw_lcl->dwLocalFlags); + printf("%08lx DWORD lpLcl->dwLocalRefCnt : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwLocalRefCnt), lpDraw_lcl->dwLocalRefCnt); + printf("%08lx DWORD lpLcl->dwProcessId : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwProcessId), lpDraw_lcl->dwProcessId); + printf("%08lx PVOID lpLcl->pUnkOuter : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pUnkOuter), lpDraw_lcl->pUnkOuter); + printf("%08lx DWORD lpLcl->dwObsolete1 : 0x%08lx\n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwObsolete1), lpDraw_lcl->dwObsolete1); + printf("%08lx ULONG_PTR lpLcl->hWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWnd), (PVOID)lpDraw_lcl->hWnd); + printf("%08lx ULONG_PTR lpLcl->hDC : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDC), (PVOID) lpDraw_lcl->hDC); + printf("%08lx DWORD lpLcl->dwErrorMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwErrorMode), lpDraw_lcl->dwErrorMode); + printf("%08lx LPDDRAWI_DDRAWSURFACE_INT lpLcl->lpPrimary : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpPrimary), lpDraw_lcl->lpPrimary); + printf("%08lx LPDDRAWI_DDRAWSURFACE_INT lpLcl->lpCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpCB), lpDraw_lcl->lpCB); + printf("%08lx DWORD lpLcl->dwPreferredMode : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwPreferredMode), lpDraw_lcl->dwPreferredMode); + printf("%08lx HINSTANCE lpLcl->hD3DInstance : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hD3DInstance), lpDraw_lcl->hD3DInstance); + printf("%08lx PVOID lpLcl->pD3DIUnknown : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, pD3DIUnknown), (PVOID) lpDraw_lcl->pD3DIUnknown); + printf("%08lx LPDDHAL_CALLBACKS lpLcl->lpDDCB : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpDDCB), lpDraw_lcl->lpDDCB); + printf("%08lx ULONG_PTR lpLcl->hDDVxd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDDVxd), (PVOID) lpDraw_lcl->hDDVxd); + printf("%08lx DWORD lpLcl->dwAppHackFlags : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwAppHackFlags), lpDraw_lcl->dwAppHackFlags); + printf("%08lx ULONG_PTR lpLcl->hFocusWnd : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hFocusWnd), (PVOID) lpDraw_lcl->hFocusWnd); + printf("%08lx DWORD lpLcl->dwHotTracking : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwHotTracking), lpDraw_lcl->dwHotTracking); + printf("%08lx DWORD lpLcl->dwIMEState : 0x%08lx \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, dwIMEState), lpDraw_lcl->dwIMEState); + printf("%08lx ULONG_PTR lpLcl->hWndPopup : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hWndPopup), (PVOID) lpDraw_lcl->hWndPopup); + printf("%08lx ULONG_PTR lpLcl->hDD : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hDD), (PVOID) lpDraw_lcl->hDD); + printf("%08lx ULONG_PTR lpLcl->hGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, hGammaCalibrator), (PVOID) lpDraw_lcl->hGammaCalibrator); + printf("%08lx LPDDGAMMACALIBRATORPROC lpLcl->lpGammaCalibrator : 0x%p \n", FIELD_OFFSET(DDRAWI_DIRECTDRAW_LCL, lpGammaCalibrator), lpDraw_lcl->lpGammaCalibrator); +} + + + #endif /* EOF */ Modified: branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/rostests/apitests/ddrawa… ============================================================================== --- branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] (original) +++ branches/reactx/rostests/apitests/ddrawapi/tests/Test_DirectDrawCreateEx.c [iso-8859-1] Thu Nov 13 03:43:46 2008 @@ -19,12 +19,47 @@ RTEST(pIntDirectDraw7->lpLcl != NULL); RTEST(pIntDirectDraw7->lpLink == NULL); RTEST(pIntDirectDraw7->dwIntRefCnt == 1); + + RTEST(pIntDirectDraw7->lpLcl->lpDDMore == 0); + RTEST(pIntDirectDraw7->lpLcl->lpGbl != NULL); + RTEST(pIntDirectDraw7->lpLcl->dwUnused0 == 0); + RTEST(pIntDirectDraw7->lpLcl->dwLocalFlags == DDRAWILCL_DIRECTDRAW7); + RTEST(pIntDirectDraw7->lpLcl->dwLocalRefCnt == 1); + + /* pIntDirectDraw7->lpLcl->dwProcessId call see if we have same ProcessId */ + RTEST(pIntDirectDraw7->lpLcl->dwProcessId != 0); + + RTEST(pIntDirectDraw7->lpLcl->pUnkOuter == NULL); + RTEST(pIntDirectDraw7->lpLcl->dwObsolete1 == 0); + RTEST(pIntDirectDraw7->lpLcl->hWnd == 0); + + /* FIXME vaildate pIntDirectDraw7->lpLcl->hDC */ + RTEST(pIntDirectDraw7->lpLcl->hDC != 0); + + RTEST(pIntDirectDraw7->lpLcl->dwErrorMode == 0); + RTEST(pIntDirectDraw7->lpLcl->lpPrimary == NULL); + RTEST(pIntDirectDraw7->lpLcl->lpCB == NULL); + RTEST(pIntDirectDraw7->lpLcl->dwPreferredMode == 0); + RTEST(pIntDirectDraw7->lpLcl->hD3DInstance == NULL); + RTEST(pIntDirectDraw7->lpLcl->pD3DIUnknown == NULL); + + RTEST(pIntDirectDraw7->lpLcl->lpDDCB != NULL); + //RTEST(pIntDirectDraw7->lpLcl->hDDVxd != -1); fixme + RTEST(pIntDirectDraw7->lpLcl->hFocusWnd == 0); + RTEST(pIntDirectDraw7->lpLcl->dwHotTracking == 0); + RTEST(pIntDirectDraw7->lpLcl->dwIMEState == 0); + + RTEST(pIntDirectDraw7->lpLcl->hWndPopup == 0); + RTEST(pIntDirectDraw7->lpLcl->hDD != 0); + RTEST(pIntDirectDraw7->lpLcl->hGammaCalibrator != 0); + RTEST(pIntDirectDraw7->lpLcl->lpGammaCalibrator != NULL); } #if DUMP_ON if (pIntDirectDraw7 != NULL) { dump_ddrawi_directdraw_int(pIntDirectDraw7); + dump_ddrawi_directdraw_lcl(pIntDirectDraw7->lpLcl); } #endif

1 0

[dreimer] 37336: Add the last missing commands in a PS1 Version. These DO NOT FULLY work yet. Commited as backup, because of PC formatting needed.
by dreimer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: dreimer Date: Thu Nov 13 02:31:17 2008 New Revision: 37336 URL: http://svn.reactos.org/svn/reactos?rev=37336&view=rev Log: Add the last missing commands in a PS1 Version. These DO NOT FULLY work yet. Commited as backup, because of PC formatting needed. Added: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Added: 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 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -1,0 +1,258 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/Config.cmd +# PURPOSE: A Basic Config.rbuild Creator for ReactOS. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# +# + +$host.ui.RawUI.WindowTitle = "ReactOS Build Configurator" + +function settitle { + if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" + } + exit +} + +# +# Receive the first Parameter and decide what to do. +# +if ($args[0] -eq "delete") { + "config.rbuild will be permanently deleted. All your settings will be gone." + "Continue?" + $YESNO = Read-Host "(yes), (no)" + if ($YESNO -eq "yes") { + if (Test-Path ".\config.rbuild") { + del ".\config.rbuild" + "Main Configuration File was found and deleted." + } else { + "Main Configuration File was not found in ReactOS Source Tree." + } + if (Test-Path "$ENV:APPDATA\RosBE\config.rbuild") { + del "$ENV:APPDATA\RosBE\config.rbuild" + "Working Configuration File was found and deleted." + } else { + "Working Configuration File was not found in ReactOS Source Tree." + } + } +} +elseif ($args[0] -eq "update") { + "old config.rbuild will be deleted and will be updated with a recent," + "default one. You will need to reconfigure it to your wishes later." + "Continue?" + $YESNO = Read-Host "(yes), (no)" + if ($YESNO -eq "yes") { + del "$_ROSBE_BASEDIR\*.rbuild" + del ".\config.rbuild" + copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" + "Successfully Updated." + } +} +elseif ($args[0] -ne $null) { + "Unknown parameter specified. Try 'help [COMMAND]'." +} + +# +# Check if config.rbuild already exists. If not, get a working copy. +# +if (!(Test-Path "$ENV:APPDATA\RosBE\config.rbuild")) { + copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild" +} + +# +# Help prevent non-useful bug reports/questions. +# +"" +"*** Configurations other than release/debug are not useful for ***" +"*** posting bug reports, and generally not very useful for ***" +"*** IRC/Forum discussion. Please refrain from doing so unless ***" +"*** you are sure about what you are doing. ***" +"" + +$YESNO = Read-Host "(yes), (no)" + +if ($YESNO -eq "no") {settitle} + +# +# Check if config.template.rbuild is newer than config.rbuild, if it is then +# inform the user and offer an update. +# +if (Test-Path ".\config.rbuild") { + if ((gi .\config.template.rbuild).LastWriteTime -gt (gi .\config.rbuild).LastWriteTime) { + "" + "*** config.template.rbuild is newer than working config.rbuild ***" + "*** The Editor cannot continue with this file. Do you wanna ***" + "*** update to the most recent one? You need to reset all your ***" + "*** previously made settings. ***" + "" + $YESNO = Read-Host "(yes), (no)" + if ($YESNO -eq "yes") {del "$ENV:APPDATA\RosBE\*.rbuild" | del ".\config.rbuild" | copy ".\config.template.rbuild" "$ENV:APPDATA\RosBE\config.rbuild"} + } +} + +# +# Start with reading settings from config.rbuild and let the user edit them. +# +"Sub-Architecture to build for." +"Default is: none" +"" +$SARCH = type "$ENV:APPDATA\RosBE\config.rbuild" | find "SARCH" | find "property name" +"$SARCH = $SARCH:~7,-1" +"Right now: $SARCH" +$SARCH_CH = Read-Host "(), (xbox)" +cls + +"Which CPU ReactOS should be optimized for." +"" +"Examples:" +"Intel: i486, i586 / pentium, pentium-mmx, i686 / pentiumpro, pentium2, pentium3" +" pentium3m, pentium-m, pentium4 / pentium4m, prescott, nocona" +" AMD: k6, k6-2 / k6-3, athlon / athlon-tbird, athlon-4 / athlon-xp / athlon-mp" +" k8 / opteron / athlon64 / athlon-fx" +" IDT: winchip-c6, winchip2" +" VIA: c3, c3-2" +" Default is: pentium" +"" +$OARCH = type "$ENV:APPDATA\RosBE\config.rbuild" | find "OARCH" | find "property name" +"$OARCH = $OARCH:~7,-1" +"Right now: $OARCH" +$OARCH_CH = Read-Host +if ($OARCH_CH -eq $null) { + $OARCH_CH = "pentium" +} +cls + +"What level do you want ReactOS to be optimized at." +"This setting does not work if GDB is set." +"0 = off" +"1 = Normal compiling. Recommended. It is the default setting in" +"official release builds and debug builds." +"warning : 2,3,4,5 is not tested on ReactOS. Change at own risk." +"" +$OPTIMIZE = type "$ENV:APPDATA\RosBE\config.rbuild" | find "OPTIMIZE" | find "property name" +"$OPTIMIZE = $OPTIMIZE:~7,-1" +"Right now: $OPTIMIZE" +OPTIMIZE_CH = Read-Host "(0), (1), (2), (3), (4), (5)" +if ($OPTIMIZE_CH -eq $null) { + $OPTIMIZE_CH = 1 +} +cls + +"Whether to compile in the integrated kernel debugger." +"Default is: 1" +"" +$KDBG = type "$ENV:APPDATA\RosBE\config.rbuild" | find "KDBG" | find "property name" +"$KDBG = $KDBG:~7,-1" +"Right now: $KDBG" +$KDBG_CH = Read-Host "(0), (1)" +if ($KDBG_CH -eq $null) { + $KDBG_CH = 1 +} +cls + +"Whether to compile for debugging. No compiler optimizations will be" +"performed." +"Default is: 1" +"" +$DBG = type "$ENV:APPDATA\RosBE\config.rbuild" | find "DBG" | find "property name" | find /V "KDBG" +"$DBG = $DBG:~7,-1" +"Right now: $DBG" +$DBG_CH = Read-Host "(0), (1)" +if ($KDBG_CH -eq $null) { + $DBG_CH = 1 +} +cls + +"Whether to compile for debugging with GDB. If you don't use GDB," +"don't enable this." +"Default is: 0" +"" +$GDB = type "$ENV:APPDATA\RosBE\config.rbuild" | find "GDB" | find "property name" +"$GDB = $GDB:~7,-1" +"Right now: $GDB" +$GDB_CH = Read-Host "(0), (1)" +if ($GDB_CH -eq $null) { + $GDB_CH = 0 +} +cls + +"Whether to compile apps/libs with features covered software patents" +"or not. If you live in a country where software patents are" +"valid/apply, don't enable this (except they/you purchased a license" +"from the patent owner)." +"Default is: 0" +"" +$NSWPAT = type "$ENV:APPDATA\RosBE\config.rbuild" | find "NSWPAT" | find "property name" +"$NSWPAT = $NSWPAT:~7,-1" +"Right now: $NSWPAT" +$NSWPAT_CH = Read-Host "(0), (1)" +if ($NSWPAT_CH -eq $null) { + $NSWPAT_CH = 0 +} +cls + +"Whether to compile with the KD protocol. This will disable support for" +"KDBG as well as rossym and symbol lookups, and allow WinDBG to connect" +"to ReactOS. This is currently not fully working, and requires kdcom" +"from Windows 2003 or TinyKRNL. Booting into debug mode with this flag" +"enabled will result in a failure to enter GUI mode. Do not enable" +"unless you know what you're doing." +"Default is: 0" +"" +$WINKD = type "$ENV:APPDATA\RosBE\config.rbuild" | find "_WINKD_" | find "property name" +"$WINKD = $WINKD:~7,-1" +"Right now: $WINKD" +$WINKD_CH = Read-Host "(0), (1)" +if ($WINKD_CH -eq $null) { + $WINKD_CH = 0 +} +cls + +# +# Generate a config.rbuild, copy it to the Source Tree and delete temp files. +# +'<?xml version="1.0"?>' | out-file "$ENV:TEMP\config.tmp" +'<!DOCTYPE group SYSTEM "tools/rbuild/project.dtd">' | out-file -append "$ENV:TEMP\config.tmp" +'<group>' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="SARCH" value="' + $SARCH_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="OARCH" value="' + $OARCH_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="OPTIMIZE" value="' + $OPTIMIZE_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="KDBG" value="' + $KDBG_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="DBG" value="' + $DBG_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="GDB" value="' + $GDB_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="NSWPAT" value="' + $NSWPAT_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'<property name="_WINKD_" value="' + $WINKD_CH + '" />' | out-file -append "$ENV:TEMP\config.tmp" +'</group^>' | out-file -append "'$ENV:TEMP\config.tmp" + +copy "$ENV:TEMP\config.tmp" "$ENV:APPDATA\RosBE\config.rbuild" +del $ENV:TEMP\config.tmp +copy "$ENV:APPDATA\RosBE\config.rbuild" ".\config.rbuild" + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$YESNO = $null +$SARCH_CH = $null +$OARCH_CH = $null +$OPTIMIZE_CH = $null +$KDBG_CH = $null +$DBG_CH = $null +$GDB_CH = $null +$NSWPAT_CH = $null +$WINKD_CH = $null +$SARCH = $null +$OARCH = $null +$OPTIMIZE = $null +$KDBG = $null +$DBG = $null +$GDB = $null +$NSWPAT = $null +$WINKD = $null + +settitle Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/Config.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -19,7 +19,7 @@ function SYSPARAM { IEX "& '$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" } -if ($args[0] -eq $null) { +if ($args.count -eq 0) { # # If Parameters were set, parse them, if not, ask the user to add them. # Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -14,7 +14,7 @@ # # Parse the command line arguments. # -if ($args[0] -eq $null) { +if ($args.count -eq 0) { # # If Parameters were set, parse them, if not, ask the user to add them. # Added: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -1,0 +1,73 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/chdefgcc.cmd +# PURPOSE: Tool to change the current gcc in RosBE. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# + +if ($_ROSBE_MODE -eq "RosBE") { + $host.ui.RawUI.WindowTitle = "Change the current MinGW/GCC Host/Target directory..." +} + +function EOA { + IEX "&'$_ROSBE_BASEDIR\rosbe-gcc-env.cmd' chdefgcc" +} + +function INTERACTIVE { + $_1 = Read-Host "Please enter a MinGW/GCC directory (don't use quotes): " + if ($_1 -eq $null) { + "ERROR: You must enter a MinGW/GCC directory." + } + $_2 = Read-Host "Please specify, if this will be the Target or Host GCC: " + if ($_2 -eq $null) { + "ERROR: You must enter ""target"" or ""host""." + } +} +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Parse the command line arguments. +# +$_1 = $args[0] +"$_1" +$_1 = IEX "& '$_ROSBE_BASEDIR\Tools\rquote.exe' '$_1'" +$_2 = $args[1] +if ($_1 -eq $null) { + INTERACTIVE +} +if ($_2 -eq $null) { + INTERACTIVE +} + +if (Test-Path "$_ROSBE_BASEDIR\$_1\.") { + $_1 = "$_ROSBE_BASEDIR\$_1" +} elseif (!(Test-Path "$_1\.")) { + "ERROR: The path specified doesn't seem to exist." +} + +if (!(Test-Path "$_1\bin\*gcc.exe")) { + "ERROR: No MinGW/GCC found in the specified path." +} + +if ($_2 -eq "target") { + $_ROSBE_TARGET_MINGWPATH = $_1 + "Target Location: $_ROSBE_TARGET_MINGWPATH" + EOA +} +if ($_2 -eq "host") { + $_ROSBE_HOST_MINGWPATH = $_1 + "Host Location: $_ROSBE_HOST_MINGWPATH" + EOA +} else { + "ERROR: You specified wrong parameters." +} + +# +# Unload all used Vars. +# +$_1 = $null +$_2 = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefgcc.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -1,0 +1,85 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/reladdr2line.cmd +# PURPOSE: Converts a value to hex and displays it. +# COPYRIGHT: Copyright 2007 Christoph von Wittich <Christoph_vW(a)reactos.org> +# Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# +# + +$host.ui.RawUI.WindowTitle = "reladdr2line..." + +# +# Check if the user supplied a path, if they didn't look for +# the specified file in the current directory and any +# sub-directories. +# +function CHECKPATH { + IEX "$ '&_ROSBE_BASEDIR\Tools\chkslash.exe' $_1" + if (errorlevel -eq 2) { + $_1 = dir /a:-d /s /b $_1 2>NUL | findstr "$_1" + } +} + +# +# If Parameters were set, parse them, if not, ask the user to add them. +# +function INTERACTIVE { + if ($_1 -eq $null) { + $_1 = Read-Host "Please enter the path/file to be examined: " + CHECKPATH + } + if ($_2 -eq $null) { + $_2 = Read-Host "Please enter the address you would like to analyze: " + } +} + +# +# Receive the Parameters and decide what to do. +# +if ($args[2] -ne $null) { + "ERROR: Too many parameters specified." +} +elseif ($args[0] -ne $null) { + $_1 = $args[0] + CHECKPATH +} +elseif ($args[1] -ne $null) { + $_2 = $args[1] +} +INTERACTIVE + +# +# First get the ImageBase of the File. If its smaller than the given +# Parameter, everything is ok, because it was already added onto the +# adress and can be given directly to raddr2line. If not, add it and +# give the result to raddr2line. +# +if ($_1 -eq $null) { + "ERROR: You must specify a path/file to examine." +} +if ($_2 -eq $null) { + "ERROR: You must specify a address to analyze." +} +$baseaddr = objdump -p $_1 2>NUL | findstr ImageBase +if ($i -lt $_2) { + IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$_2'" +} else { + set /a baseaddr+=0x$_2 + $relbase = IEX "'$_ROSBE_BASEDIR\Tools\echoh.exe' $baseaddr" + IEX "& '$_ROSBE_BASEDIR\Tools\raddr2line.exe' '$_1' '$relbase'" +} + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$_1 = $null +$_2 = $null +$baseaddr = $null +$relbase = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/reladdr2line.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -1,0 +1,96 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/sSVN.cmd +# PURPOSE: Integrated SVN Client. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# +# + +function UP { + "Local Revision: $OFFSVN" + "Online HEAD Revision: $ONSVN" + "" + if ($OFFSVN -lt $ONSVN) { + "Your tree is not up to date. Do you want to update it?" + $UP = Read-Host "Please enter 'yes' or 'no': " + if ($UP -eq "yes") { + IEX "'$_ROSBE_BASEDIR\ssvn' update" + } + } + if ($OFFSVN -eq $ONSVN) { + "Your tree is up to date." + } +} + +# +# Receive the first parameter and decide what to do. +# +if ($args[0] -eq $null) { + "No parameter specified. Try 'help [COMMAND]'." +} + +# +# These two are directly parsed to svn. +# +elseif ($args[0] -eq "update") { + $host.ui.RawUI.WindowTitle = "SVN Updating..." + "This might take a while, so please be patient." + "" + if ($args[1] -ne $null) { + IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' update -r $args[1]" + } else { + IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' update" + } +} +elseif ($args[0] -eq "cleanup") { + $host.ui.RawUI.WindowTitle = "SVN Cleaning..." + "This might take a while, so please be patient." + "" + IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' cleanup" +} + +# +# Check if the folder is empty. If not, output an error. +# +elseif ($args[0] -eq "create") { + $host.ui.RawUI.WindowTitle = "SVN Creating..." + if (Test-Path ".svn\.") { + "ERROR: Folder already contains a repository." + } else { + dir /b 2>nul | findstr "." >nul + if (errorlevel -eq 1) { + IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' checkout svn://svn.reactos.org/reactos/trunk/reactos ." + } else { + "ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED" + } + } +} + +# +# Output the revision of the local and online trees and tell the user if +# its up to date or not. +# +elseif ($args[0] -eq "status") { + $host.ui.RawUI.WindowTitle = "SVN Status" + "This might take a while, so please be patient." + "" + $OFFSVN = IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' info" | find "Revision:" + $ONSVN = IEX "'$_ROSBE_BASEDIR\Tools\svn.exe' info svn://svn.reactos.org/reactos/trunk/reactos" | find "Revision:" + UP +} + +elseif ($args[0] -ne $null) { + "Unknown parameter specified. Try 'help ssvn'." +} + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$OFFSVN = $null +$ONSVN = $null +$UP = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/sSVN.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -1,0 +1,41 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows. +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/scut.cmd +# PURPOSE: Manages named shortcuts to ReactOS source directories. +# COPYRIGHT: Copyright 2007 Colin Finck <mail(a)colinfinck.de> +# Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# + +function paramcall { + $OUT = IEX "'$_ROSBE_BASEDIR\Tools\scut.exe' $args" + + # It's a shortcut name, so change the directory + + if ($OUT -ne "Default") { + if (Test-Path "$OUT\.") { + cd $OUT + $_ROSBE_ROSSOURCEDIR = $OUT + } + } +} + +# Check if the parameter is an scut parameter, which can just be forwarded to the EXE file +if ($args[0] -eq "add") {paramcall} +if ($args[0] -eq "rem") {paramcall} +if ($args[0] -eq "edit") {paramcall} +if ($args[0] -eq "def") {paramcall} +if ($args[0] -eq "list") {paramcall} +if ($args[0] -eq "/?") {paramcall} +if ($args[0] -eq "-h") {paramcall} +if ($args[0] -eq "--help") {paramcall} + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$OUT = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/scut.ps1 ------------------------------------------------------------------------------ svn:eol-style = native 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] Thu Nov 13 02:31:17 2008 @@ -26,7 +26,6 @@ goto :NOK :CONT - if exist "config.rbuild" ( del "config.rbuild" echo Main Configuration File was found and deleted. @@ -50,7 +49,6 @@ if /i "%YESNO%"=="no" goto :NOK :CONT2 - del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd [iso-8859-1] Thu Nov 13 02:31:17 2008 @@ -38,8 +38,6 @@ :: adress and can be given directly to raddr2line. If not, add it and :: give the result to raddr2line. :: - -:RADD2RLINE if "%_1%" == "" ( echo ERROR: You must specify a path/file to examine.

1 0

[dreimer] 37335: Update 3rd party txt file
by dreimer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: dreimer Date: Thu Nov 13 02:26:51 2008 New Revision: 37335 URL: http://svn.reactos.org/svn/reactos?rev=37335&view=rev Log: Update 3rd party txt file Modified: trunk/reactos/media/doc/3rd Party Files.txt Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… ============================================================================== --- trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] (original) +++ trunk/reactos/media/doc/3rd Party Files.txt [iso-8859-1] Thu Nov 13 02:26:51 2008 @@ -9,7 +9,7 @@ Title: DejaVu Fonts Version: 2.26 -Actual Version: 2.26 +Actual Version: 2.27 Website: http://dejavu.sourceforge.net Title: DXTN OpenGL Compression Libs @@ -23,12 +23,12 @@ Website: http://www.freetype.org Title: Mesa3D -Version: 7.0.2 -Actual Version: 7.1 +Version: 7.2 +Actual Version: 7.2 Website: http://www.mesa3d.org Title: GNU adns -Version: 1.0 REV 1 +Version: 1.0 REV 5 Actual Version: 1.0 REV 5 Website: http://www.chiark.greenend.org.uk/~ian/adns | http://adns.jgaa.com

1 0

[tkreuzer] 37334: Forgot this one
by tkreuzer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: tkreuzer Date: Wed Nov 12 22:54:47 2008 New Revision: 37334 URL: http://svn.reactos.org/svn/reactos?rev=37334&view=rev Log: Forgot this one Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Wed Nov 12 22:54:47 2008 @@ -807,7 +807,7 @@ VOID NTAPI KeRosDumpStackFrames( - PULONG Frame, + PULONG_PTR Frame, ULONG FrameCount );

1 0

[tkreuzer] 37333: ULONG -> ULONG_PTR in KeRosDumpStackFrames
by tkreuzer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: tkreuzer Date: Wed Nov 12 22:48:07 2008 New Revision: 37333 URL: http://svn.reactos.org/svn/reactos?rev=37333&view=rev Log: ULONG -> ULONG_PTR in KeRosDumpStackFrames Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Wed Nov 12 22:48:07 2008 @@ -229,7 +229,7 @@ VOID FASTCALL -KeRosDumpStackFrameArray(IN PULONG Frames, +KeRosDumpStackFrameArray(IN PULONG_PTR Frames, IN ULONG FrameCount) { ULONG i; @@ -267,13 +267,13 @@ { /* Print out the module name */ Addr -= (ULONG_PTR)LdrEntry->DllBase; - DbgPrint("<%wZ: %x>\n", &LdrEntry->FullDllName, Addr); + DbgPrint("<%wZ: %p>", &LdrEntry->FullDllName, (PVOID)Addr); } } else { /* Print only the address */ - DbgPrint("<%x>\n", Addr); + DbgPrint("<%p>", (PVOID)Addr); } /* Go to the next frame */ @@ -283,10 +283,10 @@ VOID NTAPI -KeRosDumpStackFrames(IN PULONG Frame OPTIONAL, +KeRosDumpStackFrames(IN PULONG_PTR Frame OPTIONAL, IN ULONG FrameCount OPTIONAL) { - ULONG Frames[32]; + ULONG_PTR Frames[32]; ULONG RealFrameCount; /* If the caller didn't ask, assume 32 frames */

1 0

[tkreuzer] 37332: Initial Implementations of RtlVirtualUnwind and RtlWalkFrameChain. They are not yet perfect, but unwinding works!
by tkreuzer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: tkreuzer Date: Wed Nov 12 22:17:53 2008 New Revision: 37332 URL: http://svn.reactos.org/svn/reactos?rev=37332&view=rev Log: Initial Implementations of RtlVirtualUnwind and RtlWalkFrameChain. They are not yet perfect, but unwinding works! 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] Wed Nov 12 22:17:53 2008 @@ -15,6 +15,48 @@ #define UNWIND_HISTORY_TABLE_GLOBAL 1 #define UNWIND_HISTORY_TABLE_LOCAL 2 +#define UWOP_PUSH_NONVOL 0 +#define UWOP_ALLOC_LARGE 1 +#define UWOP_ALLOC_SMALL 2 +#define UWOP_SET_FPREG 3 +#define UWOP_SAVE_NONVOL 4 +#define UWOP_SAVE_NONVOL_FAR 5 +#define UWOP_SAVE_XMM 6 +#define UWOP_SAVE_XMM_FAR 7 +#define UWOP_SAVE_XMM128 8 +#define UWOP_SAVE_XMM128_FAR 9 +#define UWOP_PUSH_MACHFRAME 10 + +typedef unsigned char UBYTE; + +typedef union _UNWIND_CODE +{ + struct + { + UBYTE CodeOffset; + UBYTE UnwindOp:4; + UBYTE OpInfo:4; + }; + USHORT FrameOffset; +} UNWIND_CODE, *PUNWIND_CODE; + +typedef struct _UNWIND_INFO +{ + UBYTE Version:3; + UBYTE Flags:5; + UBYTE SizeOfProlog; + UBYTE CountOfCodes; + UBYTE FrameRegister:4; + UBYTE FrameOffset:4; + UNWIND_CODE UnwindCode[1]; +/* union { + OPTIONAL ULONG ExceptionHandler; + OPTIONAL ULONG FunctionEntry; + }; + OPTIONAL ULONG ExceptionData[]; +*/ +} UNWIND_INFO, *PUNWIND_INFO; + PVOID NTAPI RtlpLookupModuleBase( @@ -119,6 +161,12 @@ return NULL; } +void +FORCEINLINE +SetReg(PCONTEXT Context, UCHAR Reg, ULONG64 Value) +{ + ((PULONG64)(&Context->Rax))[Reg] = Value; +} PEXCEPTION_ROUTINE NTAPI @@ -127,12 +175,126 @@ IN ULONG64 ImageBase, IN ULONG64 ControlPc, IN PRUNTIME_FUNCTION FunctionEntry, - IN OUT PCONTEXT ContextRecord, + IN OUT PCONTEXT Context, OUT PVOID *HandlerData, OUT PULONG64 EstablisherFrame, IN OUT PKNONVOLATILE_CONTEXT_POINTERS ContextPointers) { - UNIMPLEMENTED; + PUNWIND_INFO UnwindInfo; + ULONG CodeOffset; + ULONG i; + UNWIND_CODE UnwindCode; + UCHAR Reg; + + /* Use relative virtual address */ + ControlPc -= ImageBase; + + /* Sanity checks */ + if ( (ControlPc < FunctionEntry->BeginAddress) || + (ControlPc >= FunctionEntry->EndAddress) ) + { + return NULL; + } + + /* Get a pointer to the unwind info */ + UnwindInfo = RVA(ImageBase, FunctionEntry->UnwindData); + + /* Calculate relative offset to function start */ + CodeOffset = ControlPc - FunctionEntry->BeginAddress; + + /* Skip all Ops with an offset greater than the current Offset */ + i = 0; + while (i < UnwindInfo->CountOfCodes && + CodeOffset < UnwindInfo->UnwindCode[i].CodeOffset) + { + UnwindCode = UnwindInfo->UnwindCode[i]; + switch (UnwindCode.UnwindOp) + { + case UWOP_SAVE_NONVOL: + case UWOP_SAVE_XMM: + case UWOP_SAVE_XMM128: + i += 2; + break; + + case UWOP_SAVE_NONVOL_FAR: + case UWOP_SAVE_XMM_FAR: + case UWOP_SAVE_XMM128_FAR: + i += 3; + break; + + case UWOP_ALLOC_LARGE: + i += UnwindCode.OpInfo ? 3 : 2; + break; + + default: + i++; + } + } + + /* Process the left Ops */ + while (i < UnwindInfo->CountOfCodes) + { + UnwindCode = UnwindInfo->UnwindCode[i]; + switch (UnwindCode.UnwindOp) + { + case UWOP_PUSH_NONVOL: + Reg = UnwindCode.OpInfo; + SetReg(Context, Reg, *(DWORD64*)Context->Rsp); + Context->Rsp += sizeof(DWORD64); + i++; + break; + + case UWOP_ALLOC_LARGE: + if (UnwindCode.OpInfo) + { + ULONG Offset = *(ULONG*)(&UnwindInfo->UnwindCode[i+1]); + Context->Rsp += Offset; + i += 3; + } + else + { + USHORT Offset = UnwindInfo->UnwindCode[i+1].FrameOffset; + Context->Rsp += Offset * 8; + i += 2; + } + break; + + case UWOP_ALLOC_SMALL: + Context->Rsp += (UnwindCode.OpInfo + 1) * 8; + i++; + break; + + case UWOP_SET_FPREG: + i++; + break; + + case UWOP_SAVE_NONVOL: + i += 2; + break; + + case UWOP_SAVE_NONVOL_FAR: + i += 3; + break; + + case UWOP_SAVE_XMM: + i += 2; + break; + + case UWOP_SAVE_XMM_FAR: + i += 3; + case UWOP_SAVE_XMM128: + i += 2; + case UWOP_SAVE_XMM128_FAR: + i += 3; + case UWOP_PUSH_MACHFRAME: + i += 1; + } + } + + /* Unwind is finished, pop new Rip from Stack */ + Context->Rip = *(DWORD64*)Context->Rsp; + Context->Rsp += 8; + return 0; } @@ -150,4 +312,63 @@ return; } - +ULONG +NTAPI +RtlWalkFrameChain(OUT PVOID *Callers, + IN ULONG Count, + IN ULONG Flags) +{ + CONTEXT Context; + ULONG64 ControlPc, ImageBase, EstablisherFrame; + ULONG64 StackBegin, StackEnd; + PVOID HandlerData; + INT i; + PRUNTIME_FUNCTION FunctionEntry; +DPRINT1("RtlWalkFrameChain called\n"); + RtlCaptureContext(&Context); + + ControlPc = Context.Rip; + + RtlpGetStackLimits(&StackBegin, &StackEnd); + + /* Check if we want the user-mode stack frame */ + if (Flags == 1) + { + } + + /* Loop the frames */ + for (i = 0; i < Count; i++) + { + /* Lookup the FunctionEntry for the current ControlPc */ + FunctionEntry = RtlLookupFunctionEntry(ControlPc, &ImageBase, NULL); + + /* 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); + } + else + { + RtlVirtualUnwind(0, + ImageBase, + ControlPc, + FunctionEntry, + &Context, + &HandlerData, + &EstablisherFrame, + NULL); + DPRINT1("normal funtion, new Rip = %p, new Rsp = %p\n", (PVOID)Context.Rip, (PVOID)Context.Rsp); + } + + ControlPc = Context.Rip; + /* Save this frame */ + + Callers[i] = (PVOID)ControlPc; + + } + + return i; +} +

1 0

[tkreuzer] 37331: Remove RtlCaptureContext from stubs
by tkreuzer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: tkreuzer Date: Wed Nov 12 22:06:02 2008 New Revision: 37331 URL: http://svn.reactos.org/svn/reactos?rev=37331&view=rev Log: Remove RtlCaptureContext from stubs Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/stubs.c [iso-8859-1] Wed Nov 12 22:06:02 2008 @@ -32,17 +32,6 @@ /* * @unimplemented */ -VOID -NTAPI -RtlCaptureContext(OUT PCONTEXT ContextRecord) -{ - UNIMPLEMENTED; - return; -} - -/* - * @unimplemented - */ PVOID NTAPI RtlpGetExceptionAddress(VOID)

1 0

[tkreuzer] 37330: RtlCaptureContext: - Don't safe the current rsp, but the one before calling the function. - Try to optimize a bit by moving stuff around
by tkreuzer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: tkreuzer Date: Wed Nov 12 22:05:06 2008 New Revision: 37330 URL: http://svn.reactos.org/svn/reactos?rev=37330&view=rev Log: RtlCaptureContext: - Don't safe the current rsp, but the one before calling the function. - Try to optimize a bit by moving stuff around Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/except_asm.S [iso-8859-1] Wed Nov 12 22:05:06 2008 @@ -23,6 +23,41 @@ _RtlCaptureContext: .cfi_startproc + /* Push eflags */ + pushfq + + /* Save the basic register context */ + mov [rcx + CONTEXT_Rax], rax + mov [rcx + CONTEXT_Rcx], rcx + mov [rcx + CONTEXT_Rdx], rdx + mov [rcx + CONTEXT_Rbx], rbx + + /* pop eflags */ + pop [rcx + CONTEXT_EFlags] + + mov [rcx + CONTEXT_Rsi], rsi + mov [rcx + CONTEXT_Rdi], rdi + mov [rcx + CONTEXT_Rbp], rbp + + /* Load former stack pointer in rax */ + lea rax, [rsp + 8] + + mov [rcx + CONTEXT_R8], r8 + mov [rcx + CONTEXT_R9], r9 + mov [rcx + CONTEXT_R10], r10 + mov [rcx + CONTEXT_R11], r11 + + /* Store stack pointer */ + mov [rcx + CONTEXT_Rsp], rax + + mov [rcx + CONTEXT_R12], r12 + mov [rcx + CONTEXT_R13], r13 + mov [rcx + CONTEXT_R14], r14 + mov [rcx + CONTEXT_R15], r15 + + /* Load return address in rax */ + mov rax, [rsp] + /* Safe segment selectors */ mov [rcx + CONTEXT_SegCs], cs mov [rcx + CONTEXT_SegDs], ds @@ -31,31 +66,7 @@ mov [rcx + CONTEXT_SegGs], gs mov [rcx + CONTEXT_SegSs], ss - /* Save the basic register context */ - mov [rcx + CONTEXT_Rax], rax - mov [rcx + CONTEXT_Rcx], rcx - mov [rcx + CONTEXT_Rdx], rdx - mov [rcx + CONTEXT_Rbx], rbx - mov [rcx + CONTEXT_Rsp], rsp - mov [rcx + CONTEXT_Rbp], rbp - mov [rcx + CONTEXT_Rsi], rsi - mov [rcx + CONTEXT_Rdi], rdi - mov [rcx + CONTEXT_R8], r8 - mov [rcx + CONTEXT_R9], r9 - mov [rcx + CONTEXT_R10], r10 - mov [rcx + CONTEXT_R11], r11 - mov [rcx + CONTEXT_R12], r12 - mov [rcx + CONTEXT_R13], r13 - mov [rcx + CONTEXT_R14], r14 - mov [rcx + CONTEXT_R15], r15 - - /* Capture eflags */ - pushfq - pop rax - mov [rcx + CONTEXT_EFlags], rax - - /* Put return address in rip member */ - mov rax, [rsp] + /* Store return address */ mov [rcx + CONTEXT_Rip], rax /* Safe mmx registers */

1 0

[tkreuzer] 37329: Fix a bug in DeDecodeU/Sleb128, resulting in wrong allocation unwind codes. Add some debugging stuff.
by tkreuzer＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: tkreuzer Date: Wed Nov 12 21:32:09 2008 New Revision: 37329 URL: http://svn.reactos.org/svn/reactos?rev=37329&view=rev Log: Fix a bug in DeDecodeU/Sleb128, resulting in wrong allocation unwind codes. Add some debugging stuff. Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c Modified: branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/rsym/rsym64.c [iso-8859-1] Wed Nov 12 21:32:09 2008 @@ -5,6 +5,11 @@ #include "rsym.h" #include "rsym64.h" #include "dwarf2.h" + +char DoPrint = 0; +ULONG g_ehframep; + +#define DPRINT if(DoPrint) printf struct {char *name; char regnt;} regs[] = { {"rax", REG_RAX}, {"rdx", REG_RDX}, {"rcx", REG_RCX}, {"rbx", REG_RBX}, @@ -35,7 +40,7 @@ { current = pc[ulSize]; ulSize++; - ulResult |= current & 0x7f << ulShift; + ulResult |= (current & 0x7f) << ulShift; ulShift += 7; } while (current & 0x80); @@ -56,7 +61,7 @@ { current = pc[ulSize]; ulSize++; - lResult |= current & 0x7f << ulShift; + lResult |= (current & 0x7f) << ulShift; ulShift += 7; } while (current & 0x80); @@ -214,7 +219,8 @@ } State->FramePtrDiff = State->FramePtr - PrevFramePtr; -//printf("@%p: code=%x, Loc=%lx, offset=%lx, reg=0x%lx:%s\n", pc, code, State->Location, State->Offset, State->Reg, regnames_64[State->Reg]); + DPRINT("@%p: code=%x, Loc=%lx, offset=%lx, reg=0x%lx:%s\n", + (void*)((ULONG)pc - g_ehframep), Code, State->Location, State->Offset, State->Reg, regs[State->Reg].name); return Length; } @@ -427,6 +433,7 @@ /* Get pointer to eh_frame section */ eh_frame = GetSectionPointer(File, File->eh_frame.idx); + g_ehframep = (ULONG)eh_frame; /* Get sizes */ CountUnwindData(File);

1 0

[cgutman] 37328: - Merge aicom-network-fixes up to r37326
by cgutman＠svn.reactos.org 13 Nov '08

13 Nov '08

Author: cgutman Date: Wed Nov 12 19:07:17 2008 New Revision: 37328 URL: http://svn.reactos.org/svn/reactos?rev=37328&view=rev Log: - Merge aicom-network-fixes up to r37326 Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/3rdparty/adns/adns_win32/README.TXT trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h trunk/reactos/lib/3rdparty/adns/client/adh-main.c trunk/reactos/lib/3rdparty/adns/client/adnslogres.c trunk/reactos/lib/3rdparty/adns/client/fanftest.c trunk/reactos/lib/3rdparty/adns/src/adns.h trunk/reactos/lib/3rdparty/adns/src/check.c trunk/reactos/lib/3rdparty/adns/src/event.c trunk/reactos/lib/3rdparty/adns/src/general.c trunk/reactos/lib/3rdparty/adns/src/internal.h trunk/reactos/lib/3rdparty/adns/src/parse.c trunk/reactos/lib/3rdparty/adns/src/setup.c trunk/reactos/lib/3rdparty/adns/src/transmit.c Modified: trunk/reactos/dll/win32/dnsapi/dnsapi/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/dnsapi/dnsapi/qu… ============================================================================== --- trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/dnsapi/dnsapi/query.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -64,7 +64,7 @@ switch(Type) { case DNS_TYPE_A: - adns_error = adns_init(&astate, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn | (Servers ? adns_if_noserver : 0), 0); + adns_error = adns_init(&astate, adns_if_noenv | adns_if_noerrprint | adns_if_noserverwarn, 0); if(adns_error != adns_s_ok) return DnsIntTranslateAdnsToDNS_STATUS(adns_error); Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -188,6 +188,8 @@ TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address file.\n")); break; } + + DGRemoveIRP(TranContext->Handle.AddressHandle, Irp); break; case TDI_RECEIVE_DATAGRAM: @@ -767,7 +769,7 @@ PTDI_REQUEST_KERNEL_RECEIVE ReceiveInfo; PTRANSPORT_CONTEXT TranContext; NTSTATUS Status; - ULONG BytesReceived; + ULONG BytesReceived = 0; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -839,7 +841,7 @@ PTRANSPORT_CONTEXT TranContext; TDI_REQUEST Request; NTSTATUS Status; - ULONG BytesReceived; + ULONG BytesReceived = 0; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); @@ -916,7 +918,7 @@ PTDI_REQUEST_KERNEL_SEND SendInfo; PTRANSPORT_CONTEXT TranContext; NTSTATUS Status; - ULONG BytesSent; + ULONG BytesSent = 0; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/README.TXT URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns_win… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/adns_win32/README.TXT [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/adns_win32/README.TXT [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -5,9 +5,9 @@ port provides a 100% native Windows DLL and linker library for the DLL - suitable for traditional compilers and linkers under Windows. The library itself is ported to -Microsot Visual C++ 6.0 SP 2. +Microsot Visual C++ 6.0. -The library is tested under Windows 2000, but should work +The library is tested under Windows 2000 and XP, but should work with all versions from Windows NT 4 and up, and Windows98 and up. Windows95 is not supported. @@ -37,3 +37,32 @@ For more information about this port, see http://adns.jgaa.com +/////////////////////////////////////////////////////// + +October 13th 2005 jgaa: adns-1.0-win32-05 + - Fixed a problem with the return-value from adns_inet_aton() + Thanks to Gerald Combs for reporting the problem. + +October 7th 2004 jgaa: adns-1.0-win32-03 + + - Fixed a problem with error-messages when the program + works off-line. + Thanks to Ulf Lamping for pointing ourt and solving the problem. + + +April 4th 2004 jgaa: adns-1.0-win32-03 + + - Fixed broken gettimeofday() function. + + - Fixed problem with TCP connections, where the librarry + failed to connect to DNS servers with TCP, and flooded + the servers with TCP connection attempts. + + - Made sure that errno was handled corrcetly after all network + (winsock) calls. + + - Fixed a few places where noblocking calls were not handled + EAGAIN and EWOULDBLOCK is not the same under Windows. + + + Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns_win… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/adns_win32/adns_unix_calls.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -1,3 +1,4 @@ + /* * adns_unix_calls.c * - Simple implementation of requiered UNIX system calls and @@ -29,20 +30,20 @@ #include "adns.h" -int adns_writev(SOCKET FileDescriptor, const struct iovec * iov, int iovCount) +int adns_writev(int FileDescriptor, const struct iovec * iov, int iovCount) { - int total_len = 0; + size_t total_len = 0; int i = 0, r = 0; char *buf = NULL, *p = NULL; for(; i < iovCount; i++) total_len += iov[i].iov_len; - p = buf = (char *)alloca( (size_t) total_len); + p = buf = (char *)alloca(total_len); for(; i < iovCount; i++) { - memcpy(p, iov[i].iov_base, (size_t) iov[i].iov_len); + memcpy(p, iov[i].iov_base, iov[i].iov_len); p += iov[i].iov_len; } @@ -54,8 +55,21 @@ int adns_inet_aton(const char *cp, struct in_addr *inp) { + if (!cp || !*cp || !inp) + { + errno = EINVAL; + return -1; + } + + if (!strcmp(cp, "255.255.255.255")) + { + // Special case + inp->s_addr = INADDR_NONE; + return 0; + } + inp->s_addr = inet_addr(cp); - return inp->s_addr != INADDR_ANY; + return (inp->s_addr == INADDR_NONE) ? -1 : 0; } int adns_getpid() @@ -63,35 +77,30 @@ return GetCurrentProcessId(); } -/* ReactOS: Fixed gettimeofday implementation. Was wrong by a factor of - * 10 */ int gettimeofday(struct timeval *tv, struct timezone *tz) { - static __int64 Adjustment; - __int64 Now = 0; + static __int64 Adjustment; + __int64 now = 0; + + if (!Adjustment) + { + SYSTEMTIME st = {1970,1,0,1,0,0,0}; + SystemTimeToFileTime(&st, (LPFILETIME)&Adjustment); + } + + if (tz) + { + errno = EINVAL; + return -1; + } + + GetSystemTimeAsFileTime((LPFILETIME)&now); + now -= Adjustment; + + tv->tv_sec = (long)(now / 10000000); + tv->tv_usec = (long)((now % 10000000) / 10); - - if (!Adjustment) - { - SYSTEMTIME st = {1970,1,3,0,0,0,0}; - - SystemTimeToFileTime(&st, ((LPFILETIME)(VOID *)&Adjustment)); - } - - if (tz) - { - return -1; - } - - GetSystemTimeAsFileTime(((LPFILETIME)(VOID *)&Now)); - Now -= Adjustment; - - /* 100 ns - .1 us - 10 * 1000000 */ - tv->tv_sec = (long)(Now / 10000000); - tv->tv_usec = (long)((Now / 10) % 1000000); - return 0; + return 0; } /* Memory allocated in the DLL must be freed in the dll, so Modified: trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/adns_win… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/adns_win32/adns_win32.h [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -105,6 +105,8 @@ #define EINPROGRESS WSAEINPROGRESS #define EMSGSIZE WSAEMSGSIZE #define ENOPROTOOPT WSAENOPROTOOPT +#define ECONNRESET WSAECONNRESET + //#define NONRETURNING //#define NONRETURNPRINTFFORMAT(si,tc) @@ -129,9 +131,9 @@ * Undef ADNS_MAP_UNIXAPI in the calling code to use natve calls */ ADNS_API int adns_gettimeofday(struct timeval *tv, struct timezone *tz); -ADNS_API int adns_writev (SOCKET FileDescriptor, const struct iovec * iov, int iovCount); +ADNS_API int adns_writev (int FileDescriptor, const struct iovec * iov, int iovCount); ADNS_API int adns_inet_aton(const char *cp, struct in_addr *inp); -ADNS_API int adns_getpid(void); +ADNS_API int adns_getpid(); #ifdef ADNS_DLL ADNS_API void *adns_malloc(const size_t bytes); @@ -155,7 +157,5 @@ } #endif /* __cplusplus */ -#include "timercmp.h" /* arty added: mingw headers don't seem to have it */ - #endif /* ADNS_WIN32_H_INCLUDED */ Modified: trunk/reactos/lib/3rdparty/adns/client/adh-main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/client/a… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/client/adh-main.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/client/adh-main.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -240,7 +240,7 @@ for (;;) { qu= ov_asynch ? 0 : outstanding.head ? outstanding.head->qu : 0; r= adns_check(ads,&qu,&answer,&qun_v); - if (r == EAGAIN) break; + if ((r == EAGAIN) || (r == EWOULDBLOCK)) break; if (r == ESRCH) { if (!ov_pipe) goto x_quit; else break; } assert(!r); query_done(qun_v,answer); @@ -259,7 +259,6 @@ r= select(maxfd, &readfds,&writefds,&exceptfds, tv); ADNS_CAPTURE_ERRNO; if (r == -1) { - ADNS_CAPTURE_ERRNO; if (errno == EINTR) continue; sysfail("select",errno); } Modified: trunk/reactos/lib/3rdparty/adns/client/adnslogres.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/client/a… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/client/adnslogres.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/client/adnslogres.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -29,9 +29,6 @@ * modified by Ian Jackson as it was incorporated into adns and * subsequently. */ - -static const char * const cvsid = - "$Id$"; #ifdef ADNS_JGAA_WIN32 # include "adns_win32.h" @@ -202,7 +199,7 @@ } else { err= adns_check(adns, &head->query, &answer, NULL); } - if (err == EAGAIN) break; + if ((err == EAGAIN) || (EWOULDBLOCK == err)) break; if (err) { fprintf(stderr, "%s: adns_wait/check: %s", progname, strerror(err)); exit(1); Modified: trunk/reactos/lib/3rdparty/adns/client/fanftest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/client/f… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/client/fanftest.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/client/fanftest.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -28,9 +28,6 @@ * This version was originally supplied by Tony Finch, but has been * modified by Ian Jackson as it was incorporated into adns. */ - -static const char * const cvsid = - "$Id$"; #ifdef ADNS_JGAA_WIN32 # include "adns_win32.h" Modified: trunk/reactos/lib/3rdparty/adns/src/adns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/adns… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/adns.h [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/adns.h [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -51,7 +51,6 @@ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * - * $Id$ */ #ifndef ADNS_H_INCLUDED @@ -95,8 +94,7 @@ adns_if_eintr= 0x0020, /* allow _wait and _synchronous to return EINTR */ adns_if_nosigpipe= 0x0040, /* applic has SIGPIPE set to SIG_IGN, do not protect */ adns_if_checkc_entex= 0x0100, /* do consistency checks on entry/exit to adns funcs */ - adns_if_checkc_freq= 0x0300, /* do consistency checks very frequently (slow!) */ - adns_if_noserver= 0x0800, /* do not get dns servers from the environment */ + adns_if_checkc_freq= 0x0300 /* do consistency checks very frequently (slow!) */ } adns_initflags; typedef enum { Modified: trunk/reactos/lib/3rdparty/adns/src/check.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/chec… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/check.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/check.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -101,8 +101,8 @@ static void checkc_global(adns_state ads) { int i; - - assert(ads->udpsocket != INVALID_SOCKET); + + assert(ads->udpsocket >= 0); for (i=0; i<ads->nsortlist; i++) assert(!(ads->sortlist[i].base.s_addr & ~ads->sortlist[i].mask.s_addr)); @@ -111,16 +111,16 @@ switch (ads->tcpstate) { case server_connecting: - assert(ads->tcpsocket != INVALID_SOCKET); + assert(ads->tcpsocket >= 0); checkc_notcpbuf(ads); break; case server_disconnected: case server_broken: - assert(ads->tcpsocket == INVALID_SOCKET); + assert(ads->tcpsocket == -1); checkc_notcpbuf(ads); break; case server_ok: - assert(ads->tcpsocket != INVALID_SOCKET); + assert(ads->tcpsocket >= 0); assert(ads->tcprecv_skip <= ads->tcprecv.used); break; default: Modified: trunk/reactos/lib/3rdparty/adns/src/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/even… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/event.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -28,10 +28,10 @@ */ #include <errno.h> +#include <stdlib.h> + +#ifdef ADNS_JGAA_WIN32 # include "adns_win32.h" -#include <stdlib.h> - -#ifdef ADNS_JGAA_WIN32 #else # include <unistd.h> # include <sys/types.h> @@ -52,7 +52,7 @@ serv= ads->tcpserver; adns_socket_close(ads->tcpsocket); - ads->tcpsocket= INVALID_SOCKET; + ads->tcpsocket= -1; ads->tcprecv.used= ads->tcprecv_skip= ads->tcpsend.used= 0; } @@ -114,7 +114,7 @@ ADNS_CLEAR_ERRNO fd= socket(AF_INET,SOCK_STREAM,proto->p_proto); ADNS_CAPTURE_ERRNO; - if (fd == INVALID_SOCKET) { + if (fd<0) { adns__diag(ads,-1,0,"cannot create TCP socket: %s",strerror(errno)); return; } @@ -128,7 +128,9 @@ addr.sin_family= AF_INET; addr.sin_port= htons(DNS_PORT); addr.sin_addr= ads->servers[ads->tcpserver].addr; + ADNS_CLEAR_ERRNO; r= connect(fd,(const struct sockaddr*)&addr,sizeof(addr)); + ADNS_CAPTURE_ERRNO; ads->tcpsocket= fd; ads->tcpstate= server_connecting; if (r==0) { tcp_connected(ads,now); return; } @@ -398,10 +400,10 @@ (struct sockaddr*)&udpaddr,&udpaddrlen); ADNS_CAPTURE_ERRNO; if (r<0) { - if (errno == EAGAIN || errno == EWOULDBLOCK) { r= 0; goto xit; } + if (errno == EAGAIN || errno == EWOULDBLOCK || errno == ECONNRESET) { r= 0; goto xit; } if (errno == EINTR) continue; if (errno_resources(errno)) { r= errno; goto xit; } - adns__warn(ads,-1,0,"datagram receive error: %s",strerror(errno)); + adns__warn(ads,-1,0,"datagram receive error: %s (%d)",strerror(errno), errno); r= 0; goto xit; } if (udpaddrlen != sizeof(udpaddr)) { Modified: trunk/reactos/lib/3rdparty/adns/src/general.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/gene… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/general.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/general.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -254,7 +254,7 @@ SINFO( nodata, "No such data" ) }; -static int __cdecl si_compar(const void *key, const void *elem) { +static int si_compar(const void *key, const void *elem) { const adns_status *st= key; const struct sinfo *si= elem; @@ -295,7 +295,7 @@ STINFO( permfail ) }; -static int __cdecl sti_compar(const void *key, const void *elem) { +static int sti_compar(const void *key, const void *elem) { const adns_status *st= key; const struct stinfo *sti= elem; 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] Wed Nov 12 19:07:17 2008 @@ -31,7 +31,7 @@ #define ADNS_INTERNAL_H_INCLUDED #include "config.h" -/*typedef unsigned char byte;*/ /* FIXME: horrible kludge to avoid conflicts with an SDK type */ +typedef unsigned char byte; #include <stdarg.h> #include <assert.h> @@ -575,7 +575,7 @@ } parsedomain_flags; adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu, - vbuf *vb, parsedomain_flags flags, + vbuf *vb, adns_queryflags flags, const byte *dgram, int dglen, int *cbyte_io, int max); /* vb must already have been initialised; it will be reset if necessary. * If there is truncation, vb->used will be set to 0; otherwise @@ -690,17 +690,17 @@ /* Useful static inline functions: */ -static __inline int ctype_whitespace(int c) { return c==' ' || c=='\n' || c=='\t'; } -static __inline int ctype_digit(int c) { return c>='0' && c<='9'; } -static __inline int ctype_alpha(int c) { +static inline int ctype_whitespace(int c) { return c==' ' || c=='\n' || c=='\t'; } +static inline int ctype_digit(int c) { return c>='0' && c<='9'; } +static inline int ctype_alpha(int c) { return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); } -static __inline int ctype_822special(int c) { return strchr("()<>@,;:\\\".[]",c) != 0; } -static __inline int ctype_domainunquoted(int c) { +static inline int ctype_822special(int c) { return strchr("()<>@,;:\\\".[]",c) != 0; } +static inline int ctype_domainunquoted(int c) { return ctype_alpha(c) || ctype_digit(c) || (strchr("-_/+",c) != 0); } -static __inline int errno_resources(int e) { return e==ENOMEM || e==ENOBUFS; } +static inline int errno_resources(int e) { return e==ENOMEM || e==ENOBUFS; } /* Useful macros */ Modified: trunk/reactos/lib/3rdparty/adns/src/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/pars… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/parse.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/parse.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -115,7 +115,7 @@ } adns_status adns__parse_domain(adns_state ads, int serv, adns_query qu, - vbuf *vb, parsedomain_flags flags, + vbuf *vb, adns_queryflags flags, const byte *dgram, int dglen, int *cbyte_io, int max) { findlabel_state fls; Modified: trunk/reactos/lib/3rdparty/adns/src/setup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/setu… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/setup.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/setup.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -131,13 +131,13 @@ while (nextword(&bufp,&word,&l)) { count++; tl += l+1; } newptrs= malloc(sizeof(char*)*count); if (!newptrs) { saveerr(ads,errno); return; } - newchars= malloc((size_t) tl); if (!newchars) { saveerr(ads,errno); free(newptrs); return; } + newchars= malloc(tl); if (!newchars) { saveerr(ads,errno); free(newptrs); return; } bufp= buf; pp= newptrs; while (nextword(&bufp,&word,&l)) { *pp++= newchars; - memcpy(newchars,word,(size_t) l); + memcpy(newchars,word,l); newchars += l; *newchars++ = 0; } @@ -163,12 +163,12 @@ return; } - if (l >= (int)sizeof(tbuf)) { + if (l >= sizeof(tbuf)) { configparseerr(ads,fn,lno,"sortlist entry `%.*s' too long",l,word); continue; } - memcpy(tbuf,word, (size_t) l); tbuf[l]= 0; + memcpy(tbuf,word,l); tbuf[l]= 0; slash= strchr(tbuf,'/'); if (slash) *slash++= 0; @@ -351,7 +351,7 @@ return -2; } - memcpy(buf,cp, (size_t) l); + memcpy(buf,cp,l); buf[l]= 0; return l; } @@ -382,7 +382,7 @@ while (*q && !ctype_whitespace(*q)) q++; dirl= q-p; for (ccip=configcommandinfos; - ccip->name && !((int)strlen(ccip->name)==dirl && !memcmp(ccip->name,p,(size_t) (q-p))); + ccip->name && !((int)strlen(ccip->name)==dirl && !memcmp(ccip->name,p,q-p)); ccip++); if (!ccip->name) { adns__diag(ads,-1,0,"%s:%d: unknown configuration directive `%.*s'", @@ -457,7 +457,7 @@ int adns__setnonblock(adns_state ads, ADNS_SOCKET fd) { #ifdef ADNS_JGAA_WIN32 unsigned long Val = 1; - return (ioctlsocket (fd, (long) FIONBIO, &Val) == 0) ? 0 : -1; + return (ioctlsocket (fd, FIONBIO, &Val) == 0) ? 0 : -1; #else int r; @@ -488,7 +488,7 @@ LIST_INIT(ads->output); ads->forallnext= 0; ads->nextid= 0x311f; - ads->udpsocket= ads->tcpsocket= ((unsigned) -1); + ads->udpsocket= ads->tcpsocket= -1; adns__vbuf_init(&ads->tcpsend); adns__vbuf_init(&ads->tcprecv); ads->tcprecv_skip= 0; @@ -525,7 +525,7 @@ struct protoent *proto; int r; - if (!ads->nservers && !(ads->iflags & adns_if_noserver)) { + if (!ads->nservers) { if (ads->diagfile && ads->iflags & adns_if_debug) fprintf(ads->diagfile,"adns: no nameservers, using localhost\n"); ia.s_addr= htonl(INADDR_LOOPBACK); @@ -536,7 +536,7 @@ ADNS_CLEAR_ERRNO; ads->udpsocket= socket(AF_INET,SOCK_DGRAM,proto->p_proto); ADNS_CAPTURE_ERRNO; - if (ads->udpsocket == INVALID_SOCKET) { r= errno; goto x_free; } + if (ads->udpsocket<0) { r= errno; goto x_free; } r= adns__setnonblock(ads,ads->udpsocket); if (r) { r= errno; goto x_closeudp; } @@ -589,35 +589,33 @@ ccf_options(ads,"ADNS_RES_OPTIONS",-1,adns_res_options); #ifdef ADNS_JGAA_WIN32 - if (!(flags & adns_if_noserver)) { - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\resolv.conf"); - readconfig(ads,PathBuf,1); - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\resolv-adns.conf"); - readconfig(ads,PathBuf,0); - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv.conf"); - readconfig(ads,PathBuf,1); - GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); - strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv-adns.conf"); - readconfig(ads,PathBuf,0); - network_info_result = GetNetworkParams(network_info, &network_info_blen); - if (network_info_result != ERROR_SUCCESS){ - switch(network_info_result) { - case ERROR_BUFFER_OVERFLOW: network_err_str = "ERROR_BUFFER_OVERFLOW"; break; - case ERROR_INVALID_PARAMETER: network_err_str = "ERROR_INVALID_PARAMETER"; break; - case ERROR_NO_DATA: network_err_str = "ERROR_NO_DATA"; break; - case ERROR_NOT_SUPPORTED: network_err_str = "ERROR_NOT_SUPPORTED"; break;} - adns__diag(ads,-1,0,"GetNetworkParams() failed with error [%d] %s", - network_info_result,network_err_str); - } - else { - for(pip = &(network_info->DnsServerList); pip; pip = pip->Next) { - addr.s_addr = inet_addr(pip->IpAddress.String); - if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) - addserver(ads, addr); - } + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\resolv.conf"); + readconfig(ads,PathBuf,1); + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\resolv-adns.conf"); + readconfig(ads,PathBuf,0); + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv.conf"); + readconfig(ads,PathBuf,1); + GetWindowsDirectory(PathBuf, SECURE_PATH_LEN); + strcat(PathBuf,"\\System32\\Drivers\\etc\\resolv-adns.conf"); + readconfig(ads,PathBuf,0); + network_info_result = GetNetworkParams(network_info, &network_info_blen); + if (network_info_result != ERROR_SUCCESS){ + switch(network_info_result) { + case ERROR_BUFFER_OVERFLOW: network_err_str = "ERROR_BUFFER_OVERFLOW"; break; + case ERROR_INVALID_PARAMETER: network_err_str = "ERROR_INVALID_PARAMETER"; break; + case ERROR_NO_DATA: network_err_str = "ERROR_NO_DATA"; break; + case ERROR_NOT_SUPPORTED: network_err_str = "ERROR_NOT_SUPPORTED"; break;} + adns__diag(ads,-1,0,"GetNetworkParams() failed with error [%d] %s", + network_info_result,network_err_str); + } + else { + for(pip = &(network_info->DnsServerList); pip; pip = pip->Next) { + addr.s_addr = inet_addr(pip->IpAddress.String); + if ((addr.s_addr != INADDR_ANY) && (addr.s_addr != INADDR_NONE)) + addserver(ads, addr); } } #else @@ -682,7 +680,7 @@ else break; } adns_socket_close(ads->udpsocket); - if (ads->tcpsocket != INVALID_SOCKET) adns_socket_close(ads->tcpsocket); + if (ads->tcpsocket >= 0) adns_socket_close(ads->tcpsocket); adns__vbuf_free(&ads->tcpsend); adns__vbuf_free(&ads->tcprecv); freesearchlist(ads); Modified: trunk/reactos/lib/3rdparty/adns/src/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/adns/src/tran… ============================================================================== --- trunk/reactos/lib/3rdparty/adns/src/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/adns/src/transmit.c [iso-8859-1] Wed Nov 12 19:07:17 2008 @@ -194,10 +194,13 @@ iov[1].iov_base= (char*)qu->query_dgram; iov[1].iov_len= qu->query_dglen; adns__sigpipe_protect(qu->ads); + + ADNS_CLEAR_ERRNO; wr= writev(qu->ads->tcpsocket,iov,2); + ADNS_CAPTURE_ERRNO; adns__sigpipe_unprotect(qu->ads); if (wr < 0) { - if (!(errno == EAGAIN || errno == EINTR || errno == ENOSPC || + if (!(errno == EAGAIN || EWOULDBLOCK || errno == EINTR || errno == ENOSPC || errno == ENOBUFS || errno == ENOMEM)) { adns__tcp_broken(ads,"write",strerror(errno)); return; @@ -255,7 +258,7 @@ (const struct sockaddr*)&servaddr,sizeof(servaddr)); ADNS_CAPTURE_ERRNO; if (r<0 && errno == EMSGSIZE) { qu->retries= 0; query_usetcp(qu,now); return; } - if (r<0 && errno != EAGAIN) adns__warn(ads,serv,0,"sendto failed: %s (%d)",strerror(errno), errno); + if (r<0 && ((errno != EAGAIN) && (errno != EWOULDBLOCK))) adns__warn(ads,serv,0,"sendto failed: %s (%d)",strerror(errno), errno); qu->timeout= now; timevaladd(&qu->timeout,UDPRETRYMS);

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