Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 37237: - Properly free the connection endpoint
by cgutman＠svn.reactos.org 07 Nov '08

07 Nov '08

Author: cgutman Date: Thu Nov 6 20:53:46 2008 New Revision: 37237 URL: http://svn.reactos.org/svn/reactos?rev=37237&view=rev Log: - Properly free the connection endpoint Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Nov 6 20:53:46 2008 @@ -220,7 +220,7 @@ RemoveEntryList(&Connection->ListEntry); TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql); - ExFreePool(Connection); + TCPFreeConnectionEndpoint(Connection); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); } @@ -488,20 +488,18 @@ PTDI_REQUEST Request) { PCONNECTION_ENDPOINT Connection; - NTSTATUS Status = STATUS_SUCCESS; TI_DbgPrint(MID_TRACE, ("Called.\n")); Connection = Request->Handle.ConnectionContext; TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - TCPClose(Connection); DeleteConnectionEndpoint(Connection); TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - return Status; + return STATUS_SUCCESS; }

1 0

[tkreuzer] 37236: Add DWARF debug sections to ntoskrnl linker script
by tkreuzer＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: tkreuzer Date: Thu Nov 6 17:05:42 2008 New Revision: 37236 URL: http://svn.reactos.org/svn/reactos?rev=37236&view=rev Log: Add DWARF debug sections to ntoskrnl linker script Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.lnk [iso-8859-1] Thu Nov 6 17:05:42 2008 @@ -101,5 +101,69 @@ { [ .stabstr ] } + /* DWARF debug sections. + Symbols in the DWARF debugging sections are relative to the beginning + of the section. Unlike other targets that fake this by putting the + section VMA at 0, the PE format will not allow it. */ + /* DWARF 1.1 and DWARF 2. */ + .debug_aranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_aranges) + } + .debug_pubnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_pubnames) + } + /* DWARF 2. */ + .debug_info BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_info) *(.gnu.linkonce.wi.*) + } + .debug_abbrev BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_abbrev) + } + .debug_line BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_line) + } + .debug_frame BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_frame) + } + .debug_str BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_str) + } + .debug_loc BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_loc) + } + .debug_macinfo BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_macinfo) + } + /* SGI/MIPS DWARF 2 extensions. */ + .debug_weaknames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_weaknames) + } + .debug_funcnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_funcnames) + } + .debug_typenames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_typenames) + } + .debug_varnames BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_varnames) + } + /* DWARF 3. */ + .debug_ranges BLOCK(__section_alignment__) (NOLOAD) : + { + *(.debug_ranges) + } }

1 0

[tkreuzer] 37235: Don't strip symbolic information from files. In the near future rsym will convert it into Windows compatible unwind info.
by tkreuzer＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: tkreuzer Date: Thu Nov 6 16:55:04 2008 New Revision: 37235 URL: http://svn.reactos.org/svn/reactos?rev=37235&view=rev Log: Don't strip symbolic information from files. In the near future rsym will convert it into Windows compatible unwind info. Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild Modified: branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/React… ============================================================================== --- branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ReactOS-amd64.rbuild [iso-8859-1] Thu Nov 6 16:55:04 2008 @@ -46,7 +46,6 @@ <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-uninitialized</compilerflag> <linkerflag>-enable-stdcall-fixup</linkerflag> - <linkerflag>-s</linkerflag> <linkerflag>-static</linkerflag>

1 0

[tkreuzer] 37234: Fix scsiport, by using pspec again.
by tkreuzer＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: tkreuzer Date: Thu Nov 6 16:50:47 2008 New Revision: 37234 URL: http://svn.reactos.org/svn/reactos?rev=37234&view=rev Log: Fix scsiport, by using pspec again. Added: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec - copied unchanged from r36923, branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.pspec branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c - copied unchanged from r36923, branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/stubs.c Removed: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.rbuild [iso-8859-1] Thu Nov 6 16:50:47 2008 @@ -3,11 +3,12 @@ <module name="scsiport" type="kernelmodedriver" installbase="system32/drivers" installname="scsiport.sys"> <bootstrap installbase="$(CDOUTPUT)" /> <define name="_SCSIPORT_" /> - <importlibrary definition="scsiport.spec" /> + <importlibrary definition="scsiport.pspec" /> <include base="scsiport">.</include> <library>ntoskrnl</library> <library>hal</library> <file>scsiport.c</file> + <file>stubs.c</file> <file>scsiport.rc</file> - <file>scsiport.spec</file> + <file>scsiport.pspec</file> </module> Removed: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.spec (removed) @@ -1,45 +1,0 @@ -@ cdecl ScsiDebugPrint() -@ stdcall ScsiPortCompleteRequest(ptr long long long long) -@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall ScsiPortConvertUlongToPhysicalAddress(long) NTOSKRNL.RtlConvertUlongToLargeInteger -@ stdcall ScsiPortFlushDma(ptr) -@ stdcall ScsiPortFreeDeviceBase(ptr ptr) -@ stdcall ScsiPortGetBusData(ptr long long long ptr long) -@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long) -@ stdcall ScsiPortGetLogicalUnit(ptr long long long) -@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long) -@ stdcall ScsiPortGetSrb(ptr long long long long) -@ stdcall ScsiPortGetUncachedExtension(ptr ptr long) -@ stdcall ScsiPortGetVirtualAddress(ptr long long) -@ stdcall ScsiPortInitialize(ptr ptr ptr ptr) -@ stdcall ScsiPortIoMapTransfer(ptr ptr long long) -@ stdcall ScsiPortLogError(ptr ptr long long long long long) -@ stdcall ScsiPortMoveMemory(ptr ptr long) -@ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) HAL.READ_PORT_BUFFER_UCHAR -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) HAL.READ_PORT_BUFFER_USHORT -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) HAL.READ_PORT_BUFFER_ULONG -@ stdcall ScsiPortReadPortUchar(ptr) HAL.READ_PORT_UCHAR -@ stdcall ScsiPortReadPortUshort(ptr) HAL.READ_PORT_USHORT -@ stdcall ScsiPortReadPortUlong(ptr) HAL.READ_PORT_ULONG -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_UCHAR -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_USHORT -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) NTOSKRNL.READ_REGISTER_BUFFER_ULONG -@ stdcall ScsiPortReadRegisterUchar(ptr) NTOSKRNL.READ_REGISTER_UCHAR -@ stdcall ScsiPortReadRegisterUshort(ptr) NTOSKRNL.READ_REGISTER_USHORT -@ stdcall ScsiPortReadRegisterUlong(ptr) NTOSKRNL.READ_REGISTER_ULONG -@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) -@ stdcall ScsiPortStallExecution(long) HAL.KeStallExecutionProcessor -@ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) HAL.WRITE_PORT_BUFFER_UCHAR -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) HAL.WRITE_PORT_BUFFER_USHORT -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) HAL.WRITE_PORT_BUFFER_ULONG -@ stdcall ScsiPortWritePortUchar(ptr long) HAL.WRITE_PORT_UCHAR -@ stdcall ScsiPortWritePortUshort(ptr long) HAL.WRITE_PORT_USHORT -@ stdcall ScsiPortWritePortUlong(ptr long) HAL.WRITE_PORT_ULONG -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_UCHAR -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_USHORT -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) NTOSKRNL.WRITE_REGISTER_BUFFER_ULONG -@ stdcall ScsiPortWriteRegisterUchar(ptr long) NTOSKRNL.WRITE_REGISTER_UCHAR -@ stdcall ScsiPortWriteRegisterUshort(ptr long) NTOSKRNL.WRITE_REGISTER_USHORT -@ stdcall ScsiPortWriteRegisterUlong(ptr long) NTOSKRNL.WRITE_REGISTER_ULONG

1 0

[dreimer] 37233: Hello to three new params on Powershell. Still six are left. Synched the others to the latest changes in the cmd files.
by dreimer＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: dreimer Date: Thu Nov 6 16:09:47 2008 New Revision: 37233 URL: http://svn.reactos.org/svn/reactos?rev=37233&view=rev Log: Hello to three new params on Powershell. Still six are left. Synched the others to the latest changes in the cmd files. Added: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 (with props) trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 (with props) Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/MinGW.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -21,8 +21,8 @@ $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "MinGW" $global:_ROSBE_ORIGINALPATH = "$ENV:PATH" -$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" "" "" Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -30,8 +30,8 @@ $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 -$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" -$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\i386" $global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" $global:_ROSBE_OBJPATH = $null $global:_ROSBE_OUTPATH = $null Added: 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 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -1,0 +1,60 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/charch.ps1 +# PURPOSE: Tool to change the current Arch to build ROS for in RosBE. +# COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> +# + +$host.ui.RawUI.WindowTitle = "Change the Architecture to build for..." + +# +# Parse the command line arguments. +# ROSBE_ARCH: Default is i386, can be set to amd64, ppc or arm. +# + +# +# Refresh all needed Params by recalling the main Path setting CMD File. +# +function SYSPARAM { + IEX "& '$_ROSBE_BASEDIR\rosbe-gcc-env.ps1'" +} +if ($args[0] -eq $null) { + # + # If Parameters were set, parse them, if not, ask the user to add them. + # + $_1 = Read-Host "Please enter a Architecture you want to build ReactOS for: " + if ($_1 -eq $null) { + "ERROR: You must enter a Architecture." + } +} else { + $_1 = $args +} +if ($_1 -eq "i386") { + $_ROSBE_ARCH = $null + SYSPARAM +} +elseif ($_1 -eq "arm") { + $_ROSBE_ARCH = 1 + SYSPARAM +} +elseif ($_1 -eq "ppc") { + $_ROSBE_ARCH = 2 + SYSPARAM +} +elseif ($_1 -eq "amd64") { + $_ROSBE_ARCH = 3 + SYSPARAM +} +elseif ($_1 -eq $null) { + "Unknown parameter specified. Try 'help [COMMAND]'." +} + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$_1 = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/charch.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -1,0 +1,46 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/chdefdir.cmd +# PURPOSE: Tool to change the current working ReactOS source directory +# in RosBE. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# Peter Ward <dralnix(a)gmail.com> +# +# + +$host.ui.RawUI.WindowTitle = "Change the current working ReactOS source directory..." + +# +# Parse the command line arguments. +# +if ($args[0] -eq $null) { + # + # If Parameters were set, parse them, if not, ask the user to add them. + # + $_1 = Read-Host "Please enter a ReactOS source directory, or 'previous': " + if ($_1 -eq $null) { + "ERROR: You must enter a ReactOS source directory, or 'previous'." + } +} else { + $_1 = $args +} +if ($_1 -eq "previous") { + popd +} else { + if (!(Test-Path "$_1\.")) { + "ERROR: The path specified doesn't seem to exist." + + } + pushd "$_1" +} +$global:_ROSBE_ROSSOURCEDIR = "$pwd" + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} + +# +# Unload all used Vars. +# +$_1 = $null Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/chdefdir.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 (added) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -1,0 +1,28 @@ +# +# PROJECT: RosBE - ReactOS Build Environment for Windows +# LICENSE: GNU General Public License v2. (see LICENSE.txt) +# FILE: Root/options.cmd +# PURPOSE: Starts options.exe and restarts RosBE afterwards. +# COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> +# +# + +$host.ui.RawUI.WindowTitle = "Options" + +# +# Run options.exe +# +if (Test-Path "$_ROSBE_BASEDIR\Tools\options.exe") { + pushd "$_ROSBE_BASEDIR" + & "$_ROSBE_BASEDIR\Tools\options.exe" + popd + if (Test-Path "$ENV:APPDATA\RosBE\rosbe-options.cmd") { + & "$ENV:APPDATA\RosBE\rosbe-options.cmd" + } +} else { + "ERROR: options.exe was not found." +} + +if ($_ROSBE_VERSION -ne $null) { + $host.ui.RawUI.WindowTitle = "ReactOS Build Environment $_ROSBE_VERSION" +} Propchange: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/rosbe-gcc-env.ps1 [iso-8859-1] Thu Nov 6 16:09:47 2008 @@ -28,17 +28,17 @@ if ($_ROSBE_ARCH -eq 1) { $ENV:ROS_ARCH = "arm" $ENV:ROS_PREFIX = "arm-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\arm" } if ($_ROSBE_ARCH -eq 2) { $ENV:ROS_ARCH = "ppc" $ENV:ROS_PREFIX = "ppc-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\ppc" } if ($_ROSBE_ARCH -eq 3) { $ENV:ROS_ARCH = "amd64" $ENV:ROS_PREFIX = "x86_64-pc-mingw32" - $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\x86_64" } #

1 0

[dreimer] 37232: OK, finally found the reason for some strange errors. Thx to d0g and Colin Finck for finding the reason.
by dreimer＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: dreimer Date: Thu Nov 6 15:13:20 2008 New Revision: 37232 URL: http://svn.reactos.org/svn/reactos?rev=37232&view=rev Log: OK, finally found the reason for some strange errors. Thx to d0g and Colin Finck for finding the reason. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd trunk/tools/RosBE/RosBE-Windows/Root/update.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -62,9 +62,7 @@ set HOST_CC=ccache gcc set HOST_CPP=ccache g++ - :: - ::Target defaults to host(i386) - :: + REM Target defaults to host(i386) set TARGET_CC=ccache gcc set TARGET_CPP=ccache g++ @@ -84,9 +82,7 @@ set HOST_CC=gcc set HOST_CPP=g++ - :: - ::Target defaults to host(i386) - :: + REM Target defaults to host(i386) set TARGET_CC=gcc set TARGET_CPP=g++ @@ -162,51 +158,56 @@ goto :EOC :BUILD - if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* - ) - ) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" %* - ) - ) + +if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" %* + ) +) else ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" %* 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" %* + ) +) goto :EOF +:: +:: Get the number of CPUs in the system so we know how many jobs to execute. +:: To modify the number used alter the options used with cpucount: +:: No Option - Number of CPUs. +:: -x1 - Number of CPUs, plus 1. +:: -x2 - Number of CPUs, doubled. +:: -a - Determine the cpu count based on the inherited process affinity mask. +:: + :BUILDMULTI - :: - :: Get the number of CPUs in the system so we know how many jobs to execute. - :: To modify the number used alter the options used with cpucount: - :: No Option - Number of CPUs. - :: -x1 - Number of CPUs, plus 1. - :: -x2 - Number of CPUs, doubled. - :: -a - Determine the cpu count based on the inherited process affinity mask. - :: - for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i - - if %_ROSBE_SHOWTIME% == 1 ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) - ) else ( - if %_ROSBE_WRITELOG% == 1 ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" - ) else ( - "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 - ) - ) + +for /f "usebackq" %%i in (`"%_ROSBE_BASEDIR%\Tools\cpucount.exe" -x1`) do set CPUCOUNT=%%i + +if %_ROSBE_SHOWTIME% == 1 ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_BASEDIR%\Tools\buildtime.exe" "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) +) else ( + if %_ROSBE_WRITELOG% == 1 ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 2>&1 | "%_ROSBE_BASEDIR%\Tools\tee.exe" "%_ROSBE_LOGDIR%\BuildLog-%_ROSBE_GCCVERSION%-%DATENAME%-%TIMENAME%.txt" + ) else ( + "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 + ) +) goto :EOF +:: +:: Highlight the fact that building has ended. +:: + :EOC -:: -:: Highlight the fact that building has ended. -:: + "%_ROSBE_BASEDIR%\Tools\flash.exe" if defined _ROSBE_VERSION ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -33,10 +33,12 @@ goto :EOC ) -:LOG :: :: Check if we have any logs to clean, if so, clean them. :: + +:LOG + if exist "%_ROSBE_LOGDIR%\*.txt" ( echo Cleaning build logs... del /f "%_ROSBE_LOGDIR%\*.txt" 1> NUL 2> NUL @@ -46,17 +48,15 @@ ) goto :EOF +:: +:: Check if we have something to clean, if so, clean it. +:: + :DEL if .%ROS_ARCH%. == .arm. ( - :: - :: Check if we have something to clean, if so, clean it. - :: if exist "obj-arm\." ( echo Cleaning ReactOS ARM source directory... - :: - : Remove directories created by the build. - :: if exist "obj-arm\." ( rd /s /q "obj-arm" 1> NUL 2> NUL ) @@ -73,14 +73,8 @@ goto :ROS ) if .%ROS_ARCH%. == .ppc. ( - :: - :: Check if we have something to clean, if so, clean it. - :: if exist "obj-ppc\." ( echo Cleaning ReactOS PPC source directory... - :: - : Remove directories created by the build. - :: if exist "obj-ppc\." ( rd /s /q "obj-ppc" 1> NUL 2> NUL ) @@ -97,14 +91,8 @@ goto :ROS ) if .%ROS_ARCH%. == .amd64. ( - :: - :: Check if we have something to clean, if so, clean it. - :: if exist "obj-amd64\." ( echo Cleaning ReactOS X86_64 source directory... - :: - : Remove directories created by the build. - :: if exist "obj-amd64\." ( rd /s /q "obj-amd64" 1> NUL 2> NUL ) @@ -121,14 +109,8 @@ goto :ROS ) -:: -:: Check if we have something to clean, if so, clean it. -:: if exist "obj-i386\." ( echo Cleaning ReactOS i386 source directory... - :: - : Remove directories created by the build. - :: if exist "obj-i386\." ( rd /s /q "obj-i386" 1> NUL 2> NUL ) @@ -144,13 +126,14 @@ ) :ROS + if exist "reactos\." ( rd /s /q "reactos" 1> NUL 2> NUL ) - goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) 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 6 15:13:20 2008 @@ -26,6 +26,7 @@ goto :NOK :CONT + if exist "config.rbuild" ( del "config.rbuild" echo Main Configuration File was found and deleted. @@ -47,7 +48,9 @@ set /p YESNO="(yes), (no)" if /i "%YESNO%"=="yes" goto :CONT2 if /i "%YESNO%"=="no" goto :NOK + :CONT2 + del "%_ROSBE_BASEDIR%\*.rbuild" del "config.rbuild" copy "config.template.rbuild" "%APPDATA%\RosBE\config.rbuild" @@ -248,6 +251,7 @@ goto :NOK :NOK + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -254,6 +254,7 @@ ) :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -92,12 +92,13 @@ cls call :RosBE4 -:EndCommandParse - :: :: Load the base directory from srclist.txt and set it as the :: new source directory. :: + +:EndCommandParse + if exist "%_ROSBE_BASEDIR%\scut.cmd" ( call "%_ROSBE_BASEDIR%\scut.cmd" ) @@ -134,36 +135,41 @@ :: Display the banner and set up the environment for the GCC 4.x.x build :: environment. :: + :RosBE4 - echo ******************************************************************************* - echo * * - echo * ReactOS Build Environment %_ROSBE_VERSION% * - echo * * - echo ******************************************************************************* - echo. - echo. - ver - :: - :: Set the correct path for the build tools and set the MinGW make. - :: - call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" + +echo ******************************************************************************* +echo * * +echo * ReactOS Build Environment %_ROSBE_VERSION% * +echo * * +echo ******************************************************************************* +echo. +echo. +ver + +:: +:: Set the correct path for the build tools and set the MinGW make. +:: +call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOF :: :: Load the doskey macros and delete any macros for components :: that are not actually present. :: + :LOADDOSKEYMACROS - doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" - if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= ) - if not exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( doskey CHDEFGCC= ) - if not exist "%_ROSBE_BASEDIR%\charch.cmd" ( doskey CHARCH= ) - if not exist "%_ROSBE_BASEDIR%\Config.cmd" ( doskey CONFIG= ) - if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= ) - if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) - if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= ) - if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) - if not exist "%_ROSBE_BASEDIR%\update.cmd" ( doskey UPDATE= ) - if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) +doskey /macrofile="%_ROSBE_BASEDIR%\RosBE.mac" + +if not exist "%_ROSBE_BASEDIR%\chdefdir.cmd" ( doskey CHDEFDIR= ) +if not exist "%_ROSBE_BASEDIR%\chdefgcc.cmd" ( doskey CHDEFGCC= ) +if not exist "%_ROSBE_BASEDIR%\charch.cmd" ( doskey CHARCH= ) +if not exist "%_ROSBE_BASEDIR%\Config.cmd" ( doskey CONFIG= ) +if not exist "%_ROSBE_BASEDIR%\reladdr2line.cmd" ( doskey RADDR2LINE= ) +if not exist "%_ROSBE_BASEDIR%\scut.cmd" ( doskey SCUT= ) +if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SSVN= ) +if not exist "%_ROSBE_BASEDIR%\sSVN.cmd" ( doskey SVN= ) +if not exist "%_ROSBE_BASEDIR%\update.cmd" ( doskey UPDATE= ) +if not exist "%_ROSBE_BASEDIR%\options.cmd" ( doskey OPTIONS= ) goto :EOF Modified: trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/charch.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -44,26 +44,31 @@ goto :EOC ) -:EOA - :: :: Refresh all needed Params by recalling the main Path setting CMD File. :: + +:EOA + call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" goto :EOC + :: :: If Parameters were set, parse them, if not, ask the user to add them. :: + :INTERACTIVE - set /p _1="Please enter a Architecture you want to build ReactOS for: " - if "%_1%" == "" ( - echo ERROR: You must enter a Architecture. - goto :EOC - ) + +set /p _1="Please enter a Architecture you want to build ReactOS for: " +if "%_1%" == "" ( + echo ERROR: You must enter a Architecture. + goto :EOC +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -39,15 +39,18 @@ :: :: If Parameters were set, parse them, if not, ask the user to add them. :: + :INTERACTIVE - set /p _1="Please enter a ReactOS source directory, or 'previous': " - if "%_1%" == "" ( - echo ERROR: You must enter a ReactOS source directory, or 'previous'. - goto :EOC - ) + +set /p _1="Please enter a ReactOS source directory, or 'previous': " +if "%_1%" == "" ( + echo ERROR: You must enter a ReactOS source directory, or 'previous'. + goto :EOC +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -55,23 +55,26 @@ ) :EOA + call "%_ROSBE_BASEDIR%\rosbe-gcc-env.cmd" chdefgcc goto :EOC :INTERACTIVE - set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " - if "%_1%" == "" ( - echo ERROR: You must enter a MinGW/GCC directory. - goto :EOC - ) - set /p _2="Please specify, if this will be the Target or Host GCC: " - if "%_2%" == "" ( - echo ERROR: You must enter "target" or "host". - goto :EOC - ) + +set /p _1="Please enter a MinGW/GCC directory (don't use quotes): " +if "%_1%" == "" ( + echo ERROR: You must enter a MinGW/GCC directory. + goto :EOC +) +set /p _2="Please specify, if this will be the Target or Host GCC: " +if "%_2%" == "" ( + echo ERROR: You must enter "target" or "host". + goto :EOC +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) 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 6 15:13:20 2008 @@ -38,37 +38,41 @@ :: 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. - goto :EOC - ) - if "%_2%" == "" ( - echo ERROR: You must specify a address to analyze. - goto :EOC - ) - echo %_1% - for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i - if %%i lss %_2% ( - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" - ) else ( - set /a baseaddr+=0x%_2% - for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i - "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" - ) + +if "%_1%" == "" ( + echo ERROR: You must specify a path/file to examine. + goto :EOC +) +if "%_2%" == "" ( + echo ERROR: You must specify a address to analyze. + goto :EOC +) +echo %_1% +for /f "tokens=2" %%i in ('"objdump -p %_1% 2>NUL | findstr ImageBase"') do set baseaddr=0x%%i +if %%i lss %_2% ( + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%_2%" +) else ( + set /a baseaddr+=0x%_2% + for /f %%i in ('""%_ROSBE_BASEDIR%\Tools\echoh.exe" %baseaddr%"') do set relbase=%%i + "%_ROSBE_BASEDIR%\Tools\raddr2line.exe" "%_1%" "%relbase%" +) goto :EOC :: :: If Parameters were set, parse them, if not, ask the user to add them. :: + :INTERACTIVE - if "%_1%" == "" ( - set /p _1="Please enter the path/file to be examined: " - call :CHECKPATH - ) - if "%_2%" == "" ( - set /p _2="Please enter the address you would like to analyze: " - ) + +if "%_1%" == "" ( + set /p _1="Please enter the path/file to be examined: " + call :CHECKPATH +) +if "%_2%" == "" ( + set /p _2="Please enter the address you would like to analyze: " +) goto :EOF :: @@ -76,14 +80,17 @@ :: the specified file in the current directory and any :: sub-directories. :: + :CHECKPATH - "%_ROSBE_BASEDIR%\Tools\chkslash.exe" %_1% - if errorlevel 2 ( - for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i - ) + +"%_ROSBE_BASEDIR%\Tools\chkslash.exe" %_1% +if errorlevel 2 ( + for /f "usebackq" %%i in (`"dir /a:-d /s /b %_1% 2>NUL | findstr "%_1%""`) do set _1=%%i +) goto :EOF :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -26,7 +26,6 @@ :: :: Set the Arch Variables :: - set ROS_ARCH= set ROS_PREFIX= @@ -50,11 +49,12 @@ set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\x86_64 ) -:main - :: :: Set up the GCC 4.x.x build environment. :: + +:main + set PATH=%_ROSBE_HOST_MINGWPATH%\bin;%_ROSBE_TARGET_MINGWPATH%\bin;%_ROSBE_ORIGINALPATH% set _ROSBE_MINGWMAKE=%_ROSBE_HOST_MINGWPATH%\bin\mingw32-make.exe Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -19,6 +19,7 @@ echo No parameter specified. Try 'help [COMMAND]'. goto :EOC ) + :: :: These two are directly parsed to svn. :: @@ -40,10 +41,10 @@ "%_ROSBE_BASEDIR%\Tools\svn.exe" cleanup goto :EOC ) + :: :: Check if the folder is empty. If not, output an error. :: - if /i "%1" == "create" ( title SVN Creating... if exist ".svn\." ( @@ -58,6 +59,7 @@ ) goto :EOC ) + :: :: Output the revision of the local and online trees and tell the user if :: its up to date or not. @@ -78,6 +80,7 @@ ) :UP + echo Local Revision: %OFFSVN% echo Online HEAD Revision: %ONSVN% echo. @@ -91,11 +94,13 @@ ) :UP2 + set /p UP="Please enter 'yes' or 'no': " if /i "%UP%"=="yes" "%_ROSBE_BASEDIR%\ssvn" update if /i "%UP%"=="no" goto :EOC :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -35,9 +35,11 @@ goto :EOC :paramcall + call "%_ROSBE_BASEDIR%\Tools\scut.exe" "%1" %2 %3 :EOC + if defined _ROSBE_VERSION ( title ReactOS Build Environment %_ROSBE_VERSION% ) Modified: trunk/tools/RosBE/RosBE-Windows/Root/update.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/upd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/update.cmd [iso-8859-1] Thu Nov 6 15:13:20 2008 @@ -16,6 +16,7 @@ if %_ROSBE_DEBUG% == 1 ( @echo on ) + :: :: Set Title :: @@ -110,9 +111,9 @@ cd /d "%_ROSBE_BASEDIR%" if %_ROSBE_CMDS% == yes ( - :: - :: First check for a new Updater - :: + + REM First check for a new Updater + for %%F in (update.cmd) do set _ROSBE_UPDDATE=%%~tF "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/update.cmd for %%F in (update.cmd) do set _ROSBE_UPDDATE2=%%~tF @@ -122,9 +123,9 @@ echo Updater got updated and needs to be restarted. goto :EOU ) - :: - :: PS1 Files. - :: + + REM PS1 Files. + if exist "Build.ps1" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.ps1 ) @@ -144,37 +145,32 @@ "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/rosbe-gcc-env.ps1 ) - :: - :: Options Files. - :: + REM Options Files. + if exist "options.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/options.cmd ) - :: - :: SVN Files. - :: + REM SVN Files. + if exist "sSVN.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/sSVN.cmd ) - :: - :: SCut Files. - :: + REM SCut Files. + if exist "scut.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/scut.cmd ) - :: - :: RelAddr2Line Files. - :: + REM RelAddr2Line Files. + if exist "reladdr2line.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/reladdr2line.cmd ) - :: - :: Other Tools Files. - :: + REM Other Tools Files. + if exist "Config.cmd" ( "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Config.cmd ) @@ -182,9 +178,8 @@ "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefdir.cmd ) - :: - :: Default Files. - :: + REM Default Files. + "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Build.cmd "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/ChangeLog.txt "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/chdefgcc.cmd @@ -203,47 +198,44 @@ ) if %_ROSBE_GCC% == yes ( - :: - :: Add Dates into Vars and load GCC packages if needed. - :: + + REM Add Dates into Vars and load GCC packages if needed. + if exist GCC.7z ( for %%F in (GCC.7z) do set _ROSBE_GCCDATE=%%~tF ) "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/GCC.7z - :: - :: Add the maybe Updated Dates to another Var. - :: + REM Add the maybe Updated Dates to another Var. + for %%F in (GCC.7z) do set _ROSBE_GCCDATE2=%%~tF - :: - :: Extract GCC. - :: + REM Extract GCC. + if !_ROSBE_GCCDATE! NEQ !_ROSBE_GCCDATE2! ( "Tools\7z.exe" x GCC.7z "%_ROSBE_BASEDIR%\i386" ) ) if %_ROSBE_TOOLS% == yes ( - :: - :: Add Dates into Vars and load Tool SRC packages if needed. - :: + + REM Add Dates into Vars and load Tool SRC packages if needed. + if exist Tools.7z ( for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE=%%~tF ) "Tools\wget.exe" -N --ignore-length --no-verbose %_ROSBE_URL%/Tools.7z - :: - :: Add the maybe Updated Dates to another Var. - :: + REM Add the maybe Updated Dates to another Var. + for %%F in (Tools.7z) do set _ROSBE_TOOLSDATE2=%%~tF if !_ROSBE_TOOLSDATE! NEQ !_ROSBE_TOOLSDATE2! ( "Tools\7z.exe" x Tools.7z "%TEMP%" - :: - :: Build the tools - :: + + REM Build the tools + make -f %TEMP%\makefile copy %TEMP%\*.exe "%_ROSBE_BASEDIR%\Tools" ) @@ -252,6 +244,10 @@ :EOU cd /d "%_ROSBE_OPATH%" + +if defined _ROSBE_VERSION ( + title ReactOS Build Environment %_ROSBE_VERSION% +) :: :: Unload Vars. @@ -267,8 +263,3 @@ set _ROSBE_OPATH= set _ROSBE_UPDDATE= set _ROSBE_UPDDATE2= - - -if defined _ROSBE_VERSION ( - title ReactOS Build Environment %_ROSBE_VERSION% -)

1 0

[fireball] 37231: - Sync rpcrt4_winetest too.
by fireball＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: fireball Date: Thu Nov 6 14:12:22 2008 New Revision: 37231 URL: http://svn.reactos.org/svn/reactos?rev=37231&view=rev Log: - Sync rpcrt4_winetest too. Modified: trunk/rostests/winetests/rpcrt4/cstub.c trunk/rostests/winetests/rpcrt4/ndr_marshall.c trunk/rostests/winetests/rpcrt4/rpc.c trunk/rostests/winetests/rpcrt4/server.c trunk/rostests/winetests/rpcrt4/server.idl Modified: trunk/rostests/winetests/rpcrt4/cstub.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/cstub.c?… ============================================================================== --- trunk/rostests/winetests/rpcrt4/cstub.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/cstub.c [iso-8859-1] Thu Nov 6 14:12:22 2008 @@ -432,6 +432,7 @@ { IPSFactoryBuffer *ppsf = NULL; const CLSID PSDispatch = {0x20420, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, 0x46}}; + const CLSID CLSID_Unknown = {0x45678, 0x1234, 0x6666, {0xff, 0x67, 0x45, 0x98, 0x76, 0x12, 0x34, 0x56}}; HRESULT r; HMODULE hmod = LoadLibraryA("rpcrt4.dll"); void *CStd_QueryInterface = GetProcAddress(hmod, "CStdStubBuffer_QueryInterface"); @@ -444,6 +445,11 @@ void *CStd_CountRefs = GetProcAddress(hmod, "CStdStubBuffer_CountRefs"); void *CStd_DebugServerQueryInterface = GetProcAddress(hmod, "CStdStubBuffer_DebugServerQueryInterface"); void *CStd_DebugServerRelease = GetProcAddress(hmod, "CStdStubBuffer_DebugServerRelease"); + + r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + &CLSID_Unknown, &PSFactoryBuffer); + ok(r == CLASS_E_CLASSNOTAVAILABLE, "NdrDllGetClassObject with unknown clsid should have returned CLASS_E_CLASSNOTAVAILABLE instead of 0x%x\n", r); + ok(ppsf == NULL, "NdrDllGetClassObject should have set ppsf to NULL on failure\n"); r = NdrDllGetClassObject(&PSDispatch, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, &PSDispatch, &PSFactoryBuffer); @@ -518,6 +524,13 @@ #undef VTBL_TEST_ZERO ok(PSFactoryBuffer.RefCount == 1, "ref count %d\n", PSFactoryBuffer.RefCount); + IPSFactoryBuffer_Release(ppsf); + + r = NdrDllGetClassObject(&IID_if3, &IID_IPSFactoryBuffer, (void**)&ppsf, proxy_file_list, + NULL, &PSFactoryBuffer); + ok(r == S_OK, "ret %08x\n", r); + ok(ppsf != NULL, "ppsf == NULL\n"); + return ppsf; } Modified: trunk/rostests/winetests/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/ndr_mars… ============================================================================== --- trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/ndr_marshall.c [iso-8859-1] Thu Nov 6 14:12:22 2008 @@ -1191,11 +1191,17 @@ TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); TEST_ZERO(fIsIn, "%d"); - TEST_ZERO(fIsOut, "%d"); + ok(stubMsg.fIsOut == 0 || + stubMsg.fIsOut == -1, /* XP-SP3 */ + "fIsOut should have been set to 0 or -1 instead of %d\n", stubMsg.fIsOut); TEST_ZERO(fIsOicf, "%d"); TEST_ZERO(fBufferValid, "%d"); - TEST_ZERO(fHasMemoryValidateCallback, "%d"); - TEST_ZERO(fInFree, "%d"); + ok(stubMsg.fHasMemoryValidateCallback == 0 || + stubMsg.fHasMemoryValidateCallback == -1, /* XP-SP3 */ + "fHasMemoryValidateCallback should have been set to 0 or -1 instead of %d\n", stubMsg.fHasMemoryValidateCallback); + ok(stubMsg.fInFree == 0 || + stubMsg.fInFree == -1, /* XP-SP3 */ + "fInFree should have been set to 0 or -1 instead of %d\n", stubMsg.fInFree); TEST_ZERO(fNeedMCCP, "%d"); ok(stubMsg.fUnused == 0 || stubMsg.fUnused == -2, /* Vista */ @@ -1302,11 +1308,17 @@ TEST_ZERO(fHasExtensions, "%d"); TEST_ZERO(fHasNewCorrDesc, "%d"); TEST_ZERO(fIsIn, "%d"); - TEST_ZERO(fIsOut, "%d"); + ok(stubMsg.fIsOut == 0 || + stubMsg.fIsOut == -1, /* XP-SP3 */ + "fIsOut should have been set to 0 or -1 instead of %d\n", stubMsg.fIsOut); TEST_ZERO(fIsOicf, "%d"); trace("fBufferValid = %d\n", stubMsg.fBufferValid); - TEST_ZERO(fHasMemoryValidateCallback, "%d"); - TEST_ZERO(fInFree, "%d"); + ok(stubMsg.fHasMemoryValidateCallback == 0 || + stubMsg.fHasMemoryValidateCallback == -1, /* XP-SP3 */ + "fHasMemoryValidateCallback should have been set to 0 or -1 instead of %d\n", stubMsg.fHasMemoryValidateCallback); + ok(stubMsg.fInFree == 0 || + stubMsg.fInFree == -1, /* XP-SP3 */ + "fInFree should have been set to 0 or -1 instead of %d\n", stubMsg.fInFree); TEST_ZERO(fNeedMCCP, "%d"); ok(stubMsg.fUnused == 0 || stubMsg.fUnused == -2, /* Vista */ Modified: trunk/rostests/winetests/rpcrt4/rpc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/rpc.c?re… ============================================================================== --- trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/rpc.c [iso-8859-1] Thu Nov 6 14:12:22 2008 @@ -385,7 +385,9 @@ ok(ret == RPC_S_OK, "TowerConstruct failed with error %ld\n", ret); ret = TowerExplode(tower, NULL, NULL, NULL, NULL, &address); ok(ret == RPC_S_OK, "TowerExplode failed with error %ld\n", ret); - ok(!strcmp(address, "0.0.0.0"), "address was \"%s\" instead of \"0.0.0.0\"\n", address); + ok(!strcmp(address, "0.0.0.0") || + broken(!strcmp(address, "255.255.255.255")), + "address was \"%s\" instead of \"0.0.0.0\"\n", address); I_RpcFree(address); I_RpcFree(tower); @@ -666,6 +668,7 @@ ok(retval == EXCEPTION_CONTINUE_SEARCH, "I_RpcExceptionFilter(0x%x) should have returned %d instead of %d\n", exception, EXCEPTION_CONTINUE_SEARCH, retval); break; + case STATUS_GUARD_PAGE_VIOLATION: case STATUS_IN_PAGE_ERROR: case STATUS_HANDLE_NOT_CLOSABLE: trace("I_RpcExceptionFilter(0x%x) returned %d\n", exception, retval); @@ -757,6 +760,74 @@ status = RpcBindingFree(&handle); ok(status == RPC_S_OK, "RpcBindingFree failed with error %lu\n", status); +} + +static char *printGuid(char *buf, const UUID *guid) +{ + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}\n", + guid->Data1, guid->Data2, guid->Data3, guid->Data4[0], guid->Data4[1], + guid->Data4[2], guid->Data4[3], guid->Data4[4], guid->Data4[5], + guid->Data4[6], guid->Data4[7]); + return buf; +} + +static void test_UuidCreate(void) +{ + UUID guid; + BYTE version; + + UuidCreate(&guid); + version = (guid.Data3 & 0xf000) >> 12; + todo_wine + ok(version == 4 || broken(version == 1), "unexpected version %d\n", + version); + if (version == 4) + { + static UUID v4and = { 0, 0, 0x4000, { 0x80,0,0,0,0,0,0,0 } }; + static UUID v4or = { 0xffffffff, 0xffff, 0x4fff, + { 0xbf,0xff,0xff,0xff,0xff,0xff,0xff,0xff } }; + UUID and, or; + RPC_STATUS rslt; + int i; + char buf[39]; + + memcpy(&and, &guid, sizeof(guid)); + memcpy(&or, &guid, sizeof(guid)); + /* Generate a bunch of UUIDs and mask them. By the end, we expect + * every randomly generated bit to have been zero at least once, + * resulting in no bits set in the and mask except those which are not + * randomly generated: the version number and the topmost bits of the + * Data4 field (treated as big-endian.) Similarly, we expect only + * the bits which are not randomly set to be cleared in the or mask. + */ + for (i = 0; i < 1000; i++) + { + LPBYTE src, dst; + + UuidCreate(&guid); + for (src = (LPBYTE)&guid, dst = (LPBYTE)&and; + src - (LPBYTE)&guid < sizeof(guid); src++, dst++) + *dst &= *src; + for (src = (LPBYTE)&guid, dst = (LPBYTE)&or; + src - (LPBYTE)&guid < sizeof(guid); src++, dst++) + *dst |= *src; + } + ok(UuidEqual(&and, &v4and, &rslt), + "unexpected bits set in V4 UUID: %s\n", printGuid(buf, &and)); + ok(UuidEqual(&or, &v4or, &rslt), + "unexpected bits set in V4 UUID: %s\n", printGuid(buf, &or)); + } + else + { + /* Older versions of Windows generate V1 UUIDs. For these, there are + * many stable bits, including at least the MAC address if one is + * present. Just check that Data4[0]'s most significant bits are + * set as expected. + */ + todo_wine + ok((guid.Data4[0] & 0xc0) == 0x80, + "unexpected value in Data4[0]: %02x\n", guid.Data4[0] & 0xc0); + } } START_TEST( rpc ) @@ -777,4 +848,5 @@ test_endpoint_mapper(ncacn_np, np_address, np_endpoint); test_endpoint_mapper(ncalrpc, NULL, lrpc_endpoint); test_RpcStringBindingFromBinding(); -} + test_UuidCreate(); +} Modified: trunk/rostests/winetests/rpcrt4/server.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.c… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.c [iso-8859-1] Thu Nov 6 14:12:22 2008 @@ -990,27 +990,27 @@ ULONG __RPC_USER bstr_t_UserSize(ULONG *flags, ULONG start, bstr_t *b) { - return start + FIELD_OFFSET(wire_bstr_t, data[(*b)[-1]]); + return start + FIELD_OFFSET(user_bstr_t, data[(*b)[-1]]); } unsigned char * __RPC_USER bstr_t_UserMarshal(ULONG *flags, unsigned char *buffer, bstr_t *b) { - wire_bstr_t *wb = (wire_bstr_t *) buffer; + wire_bstr_t wb = (wire_bstr_t) buffer; wb->n = (*b)[-1]; memcpy(&wb->data, *b, wb->n * sizeof wb->data[0]); - return buffer + FIELD_OFFSET(wire_bstr_t, data[wb->n]); + return buffer + FIELD_OFFSET(user_bstr_t, data[wb->n]); } unsigned char * __RPC_USER bstr_t_UserUnmarshal(ULONG *flags, unsigned char *buffer, bstr_t *b) { - wire_bstr_t *wb = (wire_bstr_t *) buffer; + wire_bstr_t wb = (wire_bstr_t) buffer; short *data = HeapAlloc(GetProcessHeap(), 0, (wb->n + 1) * sizeof *data); data[0] = wb->n; memcpy(&data[1], wb->data, wb->n * sizeof data[1]); *b = &data[1]; - return buffer + FIELD_OFFSET(wire_bstr_t, data[wb->n]); + return buffer + FIELD_OFFSET(user_bstr_t, data[wb->n]); } void __RPC_USER Modified: trunk/rostests/winetests/rpcrt4/server.idl URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/rpcrt4/server.i… ============================================================================== --- trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] (original) +++ trunk/rostests/winetests/rpcrt4/server.idl [iso-8859-1] Thu Nov 6 14:12:22 2008 @@ -299,8 +299,9 @@ { short n; [size_is(n)] short data[]; - } wire_bstr_t; - + } user_bstr_t; + + typedef [unique] user_bstr_t *wire_bstr_t; typedef [wire_marshal(wire_bstr_t)] short *bstr_t; unsigned hash_bstr(bstr_t s);

1 0

[sginsberg] 37230: - ASSERTify a hacky workaround -- this shouldn't happen anymore in ros
by sginsberg＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: sginsberg Date: Thu Nov 6 13:21:46 2008 New Revision: 37230 URL: http://svn.reactos.org/svn/reactos?rev=37230&view=rev Log: - ASSERTify a hacky workaround -- this shouldn't happen anymore in ros Modified: trunk/reactos/ntoskrnl/ob/obref.c Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=37… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] Thu Nov 6 13:21:46 2008 @@ -299,11 +299,7 @@ if (!OldCount) { /* Sanity check */ - if (Header->HandleCount) - { - DPRINT1("Misbehaving object: %wZ\n", &Header->Type->Name); - return Header->PointerCount; - } + ASSERT(Header->HandleCount == 0); /* Check if APCs are still active */ if (!KeAreAllApcsDisabled())

1 0

[fireball] 37229: - Update the _ros.diff. Usual changes are there (unfortunately incompatibilites in Wine still exist, RpcMgmtWaitForServerListen is still not implemented there, and their dependency on unix sockets is totally out of place). On the good side I could get rid of disabling unix-sockets stuff in source code by slightly improving unix_func.
by fireball＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: fireball Date: Thu Nov 6 13:10:03 2008 New Revision: 37229 URL: http://svn.reactos.org/svn/reactos?rev=37229&view=rev Log: - Update the _ros.diff. Usual changes are there (unfortunately incompatibilites in Wine still exist, RpcMgmtWaitForServerListen is still not implemented there, and their dependency on unix sockets is totally out of place). On the good side I could get rid of disabling unix-sockets stuff in source code by slightly improving unix_func. Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4_ro… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4_ros.diff [iso-8859-1] Thu Nov 6 13:10:03 2008 @@ -1,8 +1,42 @@ +Index: epm_towers.h +=================================================================== +--- epm_towers.h (working copy) ++++ epm_towers.h (working copy) +@@ -17,11 +17,11 @@ + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * + */ + +-#include "epm.h" ++#include "epm_c.h" + + #define EPM_PROTOCOL_DNET_NSP 0x04 + #define EPM_PROTOCOL_OSI_TP4 0x05 + #define EPM_PROTOCOL_OSI_CLNS 0x06 + #define EPM_PROTOCOL_TCP 0x07 +Index: rpc_epmap.c +=================================================================== +--- rpc_epmap.c (working copy) ++++ rpc_epmap.c (working copy) +@@ -30,11 +30,11 @@ + + #include "wine/debug.h" + #include "wine/exception.h" + + #include "rpc_binding.h" +-#include "epm.h" ++#include "epm_c.h" + #include "epm_towers.h" + + WINE_DEFAULT_DEBUG_CHANNEL(ole); + + /* The "real" RPC portmapper endpoints that I know of are: Index: rpc_server.c =================================================================== --- rpc_server.c (working copy) +++ rpc_server.c (working copy) -@@ -1017,22 +1017,30 @@ +@@ -1040,22 +1040,28 @@ /*********************************************************************** * RpcMgmtServerWaitListen (RPCRT4.@) */ @@ -18,14 +52,12 @@ return RPC_S_NOT_LISTENING; } -+ do -+ { ++ do { LeaveCriticalSection(&listen_cs); ++ LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) ++ WaitForSingleObject(cps->server_ready_event, INFINITE); - FIXME("not waiting for server calls to finish\n"); -+ LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) -+ WaitForSingleObject(cps->server_ready_event, INFINITE); -+ + EnterCriticalSection(&listen_cs); + } while (!std_listen); + @@ -39,11 +71,11 @@ =================================================================== --- rpc_transport.c (working copy) +++ rpc_transport.c (working copy) -@@ -54,10 +54,13 @@ - #endif - #ifdef HAVE_SYS_POLL_H - #include <sys/poll.h> - #endif +@@ -65,10 +65,13 @@ + # include <sys/poll.h> + # endif + # define closesocket close + #endif /* defined(__MINGW32__) || defined (_MSC_VER) */ +#include <winsock2.h> +#include <ws2tcpip.h> @@ -53,7 +85,7 @@ #include "winnls.h" #include "winerror.h" #include "winternl.h" -@@ -71,10 +74,12 @@ +@@ -82,10 +85,12 @@ #include "rpc_binding.h" #include "rpc_message.h" #include "rpc_server.h" @@ -66,7 +98,7 @@ #endif WINE_DEFAULT_DEBUG_CHANNEL(rpc); -@@ -83,11 +88,11 @@ +@@ -94,11 +99,11 @@ typedef struct _RpcConnection_np { @@ -79,25 +111,27 @@ static RpcConnection *rpcrt4_conn_np_alloc(void) { -@@ -105,15 +110,15 @@ - { - if (npc->listening) +@@ -118,17 +123,17 @@ return RPC_S_OK; npc->listening = TRUE; -- if (ConnectNamedPipe(npc->pipe, &npc->ovl)) -+ if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) - return RPC_S_OK; - - if (GetLastError() == ERROR_PIPE_CONNECTED) { -- SetEvent(npc->ovl.hEvent); -+ SetEvent(npc->ovl[0].hEvent); - return RPC_S_OK; - } - if (GetLastError() == ERROR_IO_PENDING) { - /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ - return RPC_S_OK; -@@ -126,11 +131,11 @@ + for (;;) + { +- if (ConnectNamedPipe(npc->pipe, &npc->ovl)) ++ if (ConnectNamedPipe(npc->pipe, &npc->ovl[0])) + return RPC_S_OK; + + switch(GetLastError()) + { + case ERROR_PIPE_CONNECTED: +- SetEvent(npc->ovl.hEvent); ++ SetEvent(npc->ovl[0].hEvent); + return RPC_S_OK; + case ERROR_IO_PENDING: + /* will be completed in rpcrt4_protseq_np_wait_for_new_connection */ + return RPC_S_OK; + case ERROR_NO_DATA_DETECTED: +@@ -146,11 +151,11 @@ static RPC_STATUS rpcrt4_conn_create_pipe(RpcConnection *Connection, LPCSTR pname) { RpcConnection_np *npc = (RpcConnection_np *) Connection; @@ -110,7 +144,7 @@ RPC_MAX_PACKET_SIZE, RPC_MAX_PACKET_SIZE, 5000, NULL); if (npc->pipe == INVALID_HANDLE_VALUE) { WARN("CreateNamedPipe failed with error %d\n", GetLastError()); -@@ -139,11 +144,12 @@ +@@ -159,11 +164,12 @@ else return RPC_S_CANT_CREATE_ENDPOINT; } @@ -124,7 +158,7 @@ * server thread as the thread must be alertable */ return RPC_S_OK; } -@@ -202,11 +208,13 @@ +@@ -220,11 +226,12 @@ /* success */ memset(&npc->ovl, 0, sizeof(npc->ovl)); /* pipe is connected; change to message-read mode. */ @@ -133,13 +167,12 @@ - npc->ovl.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[0].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + npc->ovl[1].hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); -+ npc->pipe = pipe; return RPC_S_OK; } -@@ -308,11 +316,12 @@ +@@ -326,11 +333,12 @@ { /* because of the way named pipes work, we'll transfer the connected pipe * to the child, then reopen the server binding to continue listening */ @@ -153,7 +186,7 @@ old_npc->listening = FALSE; } -@@ -359,13 +368,18 @@ +@@ -377,13 +385,18 @@ unsigned int bytes_left = count; while (bytes_left) @@ -163,39 +196,39 @@ - if (!ret || !bytes_read) + ret = ReadFile(npc->pipe, buf, bytes_left, &bytes_read, &npc->ovl[0]); + if ((!ret || !bytes_read) && (GetLastError() != ERROR_IO_PENDING)) ++ break; ++ ++ ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); ++ if (!ret && (GetLastError() != ERROR_MORE_DATA)) break; -+ -+ ret = GetOverlappedResult(npc->pipe, &npc->ovl[0], &bytes_read, TRUE); -+ if (!ret && GetLastError() != ERROR_MORE_DATA) -+ break; + bytes_left -= bytes_read; buf += bytes_read; } return ret ? count : -1; } -@@ -379,13 +393,18 @@ +@@ -397,13 +410,18 @@ unsigned int bytes_left = count; while (bytes_left) { DWORD bytes_written; -- ret = WriteFile(npc->pipe, buf, count, &bytes_written, NULL); +- ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, NULL); - if (!ret || !bytes_written) -+ ret = WriteFile(npc->pipe, buf, count, &bytes_written, &npc->ovl[1]); ++ ret = WriteFile(npc->pipe, buf, bytes_left, &bytes_written, &npc->ovl[1]); + if ((!ret || !bytes_written) && (GetLastError() != ERROR_IO_PENDING)) ++ break; ++ ++ ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); ++ if (!ret && (GetLastError() != ERROR_MORE_DATA)) break; -+ -+ ret = GetOverlappedResult(npc->pipe, &npc->ovl[1], &bytes_written, TRUE); -+ if (!ret && GetLastError() != ERROR_MORE_DATA) -+ break; + bytes_left -= bytes_written; buf += bytes_written; } return ret ? count : -1; } -@@ -396,14 +415,19 @@ +@@ -414,13 +432,17 @@ if (npc->pipe) { FlushFileBuffers(npc->pipe); CloseHandle(npc->pipe); @@ -212,13 +245,11 @@ + CloseHandle(npc->ovl[1].hEvent); + npc->ovl[1].hEvent = 0; } -+ return 0; } static void rpcrt4_conn_np_cancel_call(RpcConnection *Connection) - { -@@ -547,11 +571,11 @@ +@@ -579,11 +601,11 @@ /* open and count connections */ *count = 1; conn = CONTAINING_RECORD(protseq->conn, RpcConnection_np, common); @@ -231,7 +262,7 @@ } /* make array of connections */ -@@ -568,11 +592,11 @@ +@@ -600,11 +622,11 @@ objs[0] = npps->mgr_event; *count = 1; @@ -244,7 +275,7 @@ } LeaveCriticalSection(&protseq->cs); return objs; -@@ -615,11 +639,11 @@ +@@ -647,11 +669,11 @@ b_handle = objs[res - WAIT_OBJECT_0]; /* find which connection got a RPC */ EnterCriticalSection(&protseq->cs); @@ -257,120 +288,3 @@ cconn = NULL; if (conn) RPCRT4_SpawnConnection(&cconn, &conn->common); -@@ -713,16 +737,18 @@ - RpcConnection_tcp *tcpc; - tcpc = HeapAlloc(GetProcessHeap(), 0, sizeof(RpcConnection_tcp)); - if (tcpc == NULL) - return NULL; - tcpc->sock = -1; -+#ifndef __REACTOS__ - if (socketpair(PF_UNIX, SOCK_STREAM, 0, tcpc->cancel_fds) < 0) - { - ERR("socketpair() failed: %s\n", strerror(errno)); - HeapFree(GetProcessHeap(), 0, tcpc); - return NULL; - } -+#endif - return &tcpc->common; - } - - static RPC_STATUS rpcrt4_ncacn_ip_tcp_open(RpcConnection* Connection) - { -@@ -783,12 +809,11 @@ - continue; - } - - /* RPC depends on having minimal latency so disable the Nagle algorithm */ - val = 1; -- setsockopt(sock, SOL_TCP, TCP_NODELAY, &val, sizeof(val)); -- fcntl(sock, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ -+ setsockopt(sock, SOL_TCP, TCP_NODELAY, (char *)&val, sizeof(val)); - - tcpc->sock = sock; - - freeaddrinfo(ai); - TRACE("connected\n"); -@@ -806,10 +831,11 @@ - int sock; - int ret; - struct addrinfo *ai; - struct addrinfo *ai_cur; - struct addrinfo hints; -+ u_long blocking; - RpcConnection *first_connection = NULL; - - TRACE("(%p, %s)\n", protseq, endpoint); - - hints.ai_flags = AI_PASSIVE /* for non-localhost addresses */; -@@ -857,11 +883,11 @@ - ret = bind(sock, ai_cur->ai_addr, ai_cur->ai_addrlen); - if (ret < 0) - { - WARN("bind failed: %s\n", strerror(errno)); - close(sock); -- if (errno == EADDRINUSE) -+ if (errno == WSAEADDRINUSE) - status = RPC_S_DUPLICATE_ENDPOINT; - else - status = RPC_S_CANT_CREATE_ENDPOINT; - continue; - } -@@ -886,11 +912,12 @@ - } - /* need a non-blocking socket, otherwise accept() has a potential - * race-condition (poll() says it is readable, connection drops, - * and accept() blocks until the next connection comes...) - */ -- ret = fcntl(sock, F_SETFL, O_NONBLOCK); -+ blocking = 1; -+ ret = ioctlsocket(sock, FIONBIO, &blocking); - if (ret < 0) - { - WARN("couldn't make socket non-blocking, error %d\n", ret); - RPCRT4_DestroyConnection(&tcpc->common); - status = RPC_S_OUT_OF_RESOURCES; -@@ -929,10 +956,11 @@ - static RPC_STATUS rpcrt4_conn_tcp_handoff(RpcConnection *old_conn, RpcConnection *new_conn) - { - int ret; - struct sockaddr_in address; - socklen_t addrsize; -+ u_long blocking; - RpcConnection_tcp *server = (RpcConnection_tcp*) old_conn; - RpcConnection_tcp *client = (RpcConnection_tcp*) new_conn; - - addrsize = sizeof(address); - ret = accept(server->sock, (struct sockaddr*) &address, &addrsize); -@@ -940,11 +968,12 @@ - { - ERR("Failed to accept a TCP connection: error %d\n", ret); - return RPC_S_OUT_OF_RESOURCES; - } - /* reset to blocking behaviour */ -- fcntl(ret, F_SETFL, 0); -+ blocking = 0; -+ ret = ioctlsocket(ret, FIONBIO, &blocking); - client->sock = ret; - TRACE("Accepted a new TCP connection\n"); - return RPC_S_OK; - } - -@@ -1187,14 +1216,16 @@ - { - RpcServerProtseq_sock *ps = HeapAlloc(GetProcessHeap(), 0, sizeof(*ps)); - if (ps) - { - int fds[2]; -+ u_long blocking; - if (!socketpair(PF_UNIX, SOCK_DGRAM, 0, fds)) - { -- fcntl(fds[0], F_SETFL, O_NONBLOCK); -- fcntl(fds[1], F_SETFL, O_NONBLOCK); -+ blocking = 1; -+ ioctlsocket(fds[0], FIONBIO, &blocking); -+ ioctlsocket(fds[1], FIONBIO, &blocking); - ps->mgr_event_rcv = fds[0]; - ps->mgr_event_snd = fds[1]; - } - else - {

1 0

[sginsberg] 37228: - Comment out unused, static PaintUnderLappers
by sginsberg＠svn.reactos.org 06 Nov '08

06 Nov '08

Author: sginsberg Date: Thu Nov 6 12:38:21 2008 New Revision: 37228 URL: http://svn.reactos.org/svn/reactos?rev=37228&view=rev Log: - Comment out unused, static PaintUnderLappers Modified: trunk/rosapps/dflat32/normal.c Modified: trunk/rosapps/dflat32/normal.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/dflat32/normal.c?rev=37228… ============================================================================== --- trunk/rosapps/dflat32/normal.c [iso-8859-1] (original) +++ trunk/rosapps/dflat32/normal.c [iso-8859-1] Thu Nov 6 12:38:21 2008 @@ -4,7 +4,7 @@ #ifdef INCLUDE_MULTI_WINDOWS static void PaintOverLappers(DFWINDOW wnd); -static void PaintUnderLappers(DFWINDOW wnd); +//static void PaintUnderLappers(DFWINDOW wnd); #endif static BOOL InsideWindow(DFWINDOW, int, int); @@ -915,6 +915,8 @@ HiddenWindow = wnd; PaintOverParents(wnd); } + +#if 0 /* --- paint those parts of a window that are overlapped --- */ static void PaintUnderLappers(DFWINDOW wnd) { @@ -960,6 +962,7 @@ hwnd = DfNextWindow(hwnd); } } +#endif #endif /* #ifdef INCLUDE_MULTI_WINDOWS */ /* --- save video area to be used by dummy window border --- */

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