Ros-diffs October 2008

ros-diffs@reactos.org

25 participants
517 discussions

[sginsberg] 36971: - Don't typedef ULONG_PTR to a 32-bit value

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 25 17:48:28 2008 New Revision: 36971 URL: http://svn.reactos.org/svn/reactos?rev=36971&view=rev Log: - Don't typedef ULONG_PTR to a 32-bit value Modified: branches/ros-amd64-bringup/reactos/drivers/usb/nt4compat/usbdriver/usb.h Modified: branches/ros-amd64-bringup/reactos/drivers/usb/nt4compat/usbdriver/usb.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/usb/nt4compat/usbdriver/usb.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/usb/nt4compat/usbdriver/usb.h [iso-8859-1] Sat Oct 25 17:48:28 2008 @@ -3,8 +3,6 @@ /* * Some USB bandwidth allocation constants. */ - -typedef unsigned long ULONG_PTR, *PULONG_PTR; #define USB2_HOST_DELAY 5 /* nsec, guess */ #define BW_HOST_DELAY 1000L /* nanoseconds */

16 years, 2 months

[cgutman] 36970: - Check the status of OskitTCPBind

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 25 17:44:56 2008 New Revision: 36970 URL: http://svn.reactos.org/svn/reactos?rev=36970&view=rev Log: - Check the status of OskitTCPBind Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Oct 25 17:44:56 2008 @@ -87,13 +87,13 @@ TI_DbgPrint(DEBUG_TCP,("AddressToBind - %x:%x\n", AddressToBind.sin_addr, AddressToBind.sin_port)); - OskitTCPBind( Connection->SocketContext, - Connection, - &AddressToBind, - sizeof(AddressToBind) ); + Status = TCPTranslateError( OskitTCPBind( Connection->SocketContext, + Connection, + &AddressToBind, + sizeof(AddressToBind) ) ); - Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, - Backlog ) ); + if (NT_SUCCESS(Status)) + Status = TCPTranslateError( OskitTCPListen( Connection->SocketContext, Backlog ) ); TcpipRecursiveMutexLeave( &TCPLock ); Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 25 17:44:56 2008 @@ -577,21 +577,24 @@ AddressToConnect.sin_family = AF_INET; AddressToBind = AddressToConnect; - OskitTCPBind( Connection->SocketContext, + Status = TCPTranslateError + ( OskitTCPBind( Connection->SocketContext, Connection, &AddressToBind, - sizeof(AddressToBind) ); - - memcpy( &AddressToConnect.sin_addr, - &RemoteAddress.Address.IPv4Address, - sizeof(AddressToConnect.sin_addr) ); - AddressToConnect.sin_port = RemotePort; - - Status = TCPTranslateError - ( OskitTCPConnect( Connection->SocketContext, - Connection, - &AddressToConnect, - sizeof(AddressToConnect) ) ); + sizeof(AddressToBind) ) ); + + if (NT_SUCCESS(Status)) { + memcpy( &AddressToConnect.sin_addr, + &RemoteAddress.Address.IPv4Address, + sizeof(AddressToConnect.sin_addr) ); + AddressToConnect.sin_port = RemotePort; + + Status = TCPTranslateError + ( OskitTCPConnect( Connection->SocketContext, + Connection, + &AddressToConnect, + sizeof(AddressToConnect) ) ); + } TcpipRecursiveMutexLeave( &TCPLock );

16 years, 2 months

[sginsberg] 36969: - Make videoprt compile for 64-bit - Disable Int10 support as it uses x86 specific structures (is this support still available on amd64?) - Disable VideoPortEnable/DisableInterrupt -- HalEnable/DisableSystemInterrupt are not apparently present on NT AMD64, so need to figure out what else to use (and if these routine are still present on amd64 videoprt)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 25 17:33:55 2008 New Revision: 36969 URL: http://svn.reactos.org/svn/reactos?rev=36969&view=rev Log: - Make videoprt compile for 64-bit - Disable Int10 support as it uses x86 specific structures (is this support still available on amd64?) - Disable VideoPortEnable/DisableInterrupt -- HalEnable/DisableSystemInterrupt are not apparently present on NT AMD64, so need to figure out what else to use (and if these routine are still present on amd64 videoprt) Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/agp.c branches/ros-amd64-bringup/reactos/drivers/video/videoprt/int10.c branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c branches/ros-amd64-bringup/reactos/drivers/video/videoprt/resource.c branches/ros-amd64-bringup/reactos/drivers/video/videoprt/services.c branches/ros-amd64-bringup/reactos/drivers/video/videoprt/spinlock.c branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/agp.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/agp.c [iso-8859-1] Sat Oct 25 17:33:55 2008 @@ -275,7 +275,7 @@ else /* ProcessHandle != NULL */ { /* Release some virtual memory */ - ULONG Size = Pages * PAGE_SIZE; + SIZE_T Size = Pages * PAGE_SIZE; ULONG OffsetInBytes = Offset * PAGE_SIZE; BaseAddress = (PVOID)((ULONG_PTR)VirtualMapping->MappedAddress + OffsetInBytes); @@ -349,7 +349,7 @@ else /* ProcessHandle != NULL */ { /* Unmap the section view */ - ULONG Size = Pages * PAGE_SIZE; + SIZE_T Size = Pages * PAGE_SIZE; ULONG OffsetInBytes = Offset * PAGE_SIZE; BaseAddress = (PVOID)((ULONG_PTR)VirtualMapping->MappedAddress + OffsetInBytes); @@ -400,7 +400,7 @@ else /* ProcessHandle != NULL */ { /* Release the allocated virtual memory */ - ULONG Size = VirtualMapping->AgpMapping->NumberOfPages * PAGE_SIZE; + SIZE_T Size = VirtualMapping->AgpMapping->NumberOfPages * PAGE_SIZE; Status = ZwFreeVirtualMemory(VirtualMapping->ProcessHandle, &VirtualMapping->MappedAddress, &Size, MEM_RELEASE); @@ -452,7 +452,7 @@ else /* ProcessHandle != NULL */ { /* Reserve memory for usermode */ - ULONG Size = AgpMapping->NumberOfPages * PAGE_SIZE; + SIZE_T Size = AgpMapping->NumberOfPages * PAGE_SIZE; MappedAddress = NULL; Status = ZwAllocateVirtualMemory(ProcessHandle, &MappedAddress, 0, &Size, MEM_RESERVE, PAGE_NOACCESS); Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/int10.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/int10.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/int10.c [iso-8859-1] Sat Oct 25 17:33:55 2008 @@ -25,6 +25,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ +#if defined(_M_IX86) VP_STATUS NTAPI IntInt10AllocateBuffer( IN PVOID Context, @@ -190,6 +191,7 @@ IntDetachFromCSRSS(&CallingProcess, &ApcState); return Status; } +#endif /* PUBLIC FUNCTIONS ***********************************************************/ @@ -202,6 +204,7 @@ IN PVOID HwDeviceExtension, IN PVIDEO_X86_BIOS_ARGUMENTS BiosArguments) { +#if defined(_M_IX86) KV86M_REGISTERS Regs; NTSTATUS Status; PKPROCESS CallingProcess; @@ -243,4 +246,9 @@ IntDetachFromCSRSS(&CallingProcess, &ApcState); return Status; -} +#else + /* Not implemented for anything else than X86*/ + DPRINT1("Int10 not available on non-x86!\n"); + return ERROR_INVALID_FUNCTION; +#endif +} Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] Sat Oct 25 17:33:55 2008 @@ -111,6 +111,7 @@ VP_STATUS NTAPI VideoPortEnableInterrupt(IN PVOID HwDeviceExtension) { +#ifndef _M_AMD64 PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; BOOLEAN Status; @@ -124,6 +125,11 @@ DeviceExtension->InterruptLevel); return Status ? NO_ERROR : ERROR_INVALID_ACCESS; +#else + /* FIXME: Function still present? If so what to use instead of HalEnableSystemInterrupt? */ + UNIMPLEMENTED; + return ERROR_INVALID_ACCESS; +#endif } /* @@ -133,6 +139,7 @@ VP_STATUS NTAPI VideoPortDisableInterrupt(IN PVOID HwDeviceExtension) { +#ifndef _M_AMD64 PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; BOOLEAN Status; @@ -145,4 +152,9 @@ 0); return Status ? NO_ERROR : ERROR_INVALID_ACCESS; +#else + /* FIXME: Function still present? If so what to use instead of HalDisableSystemInterrupt? */ + UNIMPLEMENTED; + return ERROR_INVALID_ACCESS; +#endif } Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/resource.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/resource.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/resource.c [iso-8859-1] Sat Oct 25 17:33:55 2008 @@ -164,7 +164,7 @@ if (Status) *Status = NO_ERROR; - return (PVOID)TranslatedAddress.u.LowPart; + return (PVOID)(ULONG_PTR)TranslatedAddress.u.LowPart; } /* user space */ @@ -272,7 +272,7 @@ Status = ZwUnmapViewOfSection(NtCurrentProcess(), MappedAddress); if (!NT_SUCCESS(Status)) { - WARN_(VIDEOPRT, "Warning: Mapping for address 0x%x not found!\n", (ULONG)MappedAddress); + WARN_(VIDEOPRT, "Warning: Mapping for address 0x%p not found!\n", MappedAddress); } } Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/services.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/services.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/services.c [iso-8859-1] Sat Oct 25 17:33:55 2008 @@ -44,6 +44,7 @@ switch (ServicesType) { +#if defined(_M_IX86) case VideoPortServicesInt10: if (Interface->Version >= VIDEO_PORT_INT10_INTERFACE_VERSION_1 || Interface->Size >= sizeof(VIDEO_PORT_INT10_INTERFACE)) @@ -61,7 +62,7 @@ return NO_ERROR; } break; - +#endif case VideoPortServicesAGP: if ((Interface->Version == VIDEO_PORT_AGP_INTERFACE_VERSION_2 && Interface->Size >= sizeof(VIDEO_PORT_AGP_INTERFACE_2)) || Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/spinlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/spinlock.c [iso-8859-1] Sat Oct 25 17:33:55 2008 @@ -77,7 +77,7 @@ IN PSPIN_LOCK SpinLock) { TRACE_(VIDEOPRT, "VideoPortAcquireSpinLockAtDpcLevel\n"); - KefAcquireSpinLockAtDpcLevel((PKSPIN_LOCK)SpinLock); + KeAcquireSpinLockAtDpcLevel((PKSPIN_LOCK)SpinLock); } /* @@ -104,5 +104,5 @@ IN PSPIN_LOCK SpinLock) { TRACE_(VIDEOPRT, "VideoPortReleaseSpinLockFromDpcLevel\n"); - KefReleaseSpinLockFromDpcLevel((PKSPIN_LOCK)SpinLock); + KeReleaseSpinLockFromDpcLevel((PKSPIN_LOCK)SpinLock); } Modified: branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/videoprt/videoprt.c [iso-8859-1] Sat Oct 25 17:33:55 2008 @@ -332,7 +332,7 @@ { WCHAR DeviceVideoBuffer[20]; PVIDEO_PORT_DEVICE_EXTENSION DeviceExtension; - ULONG Size; + SIZE_T Size; NTSTATUS Status; VIDEO_PORT_CONFIG_INFO ConfigInfo; SYSTEM_BASIC_INFORMATION SystemBasicInfo; @@ -1045,12 +1045,12 @@ case VpHighPriority: OldIrql = KeGetCurrentIrql(); if (OldIrql < SYNCH_LEVEL) - OldIrql = KfRaiseIrql(SYNCH_LEVEL); + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); Ret = (*SynchronizeRoutine)(Context); if (OldIrql < SYNCH_LEVEL) - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); break; default:

16 years, 2 months

[dreimer] 36968: ok, Binutils and ccache reverted.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Oct 25 16:39:26 2008 New Revision: 36968 URL: http://svn.reactos.org/svn/reactos?rev=36968&view=rev Log: ok, Binutils and ccache reverted. Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/RosBE.nsi Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat Oct 25 16:39:26 2008 @@ -5,15 +5,12 @@ - Updated: NSIS to 2.40 (Daniel Reimer) - Updated: Subversion to 1.5.3 (Daniel Reimer) - Updated: GDB to 6.8-3 (Daniel Reimer) -- Updated: Binutils 2.18.50 Build 20080109. (Daniel Reimer) - Updated: MingW32 Make 3.81-3 (Daniel Reimer) - Updated: MingW32 Runtime DLL 3.15.1 (Daniel Reimer) - Other small Fixes here and there (Daniel Reimer) - Added: Basic PowerShell Version of RosBE (Daniel Reimer) - Added: YASM 0.72, which supports 64 bit asm too. (Daniel Reimer) - Added: Update command (Daniel Reimer) -- Added: A way to include rosapps and rostests into the build and ssvn script by modifying - one var. Add this var to options.exe (Maciej Bialas and slight changes by me) - Added: nostrip function (Christoph von Wittich) - Added: RosBE Debugging Feature which disables the @echo off. just set _ROSBE_DEBUG=1 (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/RosBE.nsi URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/RosBE.ns… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/RosBE.nsi [iso-8859-1] Sat Oct 25 16:39:26 2008 @@ -201,6 +201,7 @@ SetOutPath "$INSTDIR\4.1.3\bin" SetOverwrite try File /r Components\Tools\ccache.exe + File /r Components\Tools\cygwin1.dll SectionEnd Section "GDB - The GNU Project Debugger" SEC07

16 years, 2 months

[dreimer] 36967: Removed the disabling feature which caused more problems than help. Hope we are friends again guys.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Oct 25 15:53:14 2008 New Revision: 36967 URL: http://svn.reactos.org/svn/reactos?rev=36967&view=rev Log: Removed the disabling feature which caused more problems than help. Hope we are friends again guys. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/RosBE.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -6,68 +6,6 @@ # COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> # # - -function DELA { -! set /p ROSA_DEL="rosapps.bak exists! Delete it? [yes/no] " - if ($ROSA_DEL -eq "no") exit -! if ($ROSA_DEL -eq "yes") rd /q /s ".\modules\rosapps.bak" -} - -function DELB { -! set /p ROSB_DEL="rostests.bak exists! Delete it? [yes/no] " - if ($ROSB_DEL -eq "no") exit -! if ($ROSB_DEL -eq "yes") rd /q /s ".\modules\rostests.bak" -} - -if ($_ROSBE_MODULES -ne 1) { - if (Test-Path ".\modules\rosapps") { - if (Test-Path ".\modules\rosapps.bak") { - DELA - } - "Renaming rosapps to rosapps.bak..." -! ren ".\modules\rosapps" "rosapps.bak" -! if ($ENV:ROS_ARCH -eq $null) { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto - } else { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto - } - } - if (Test-Path ".\modules\rostests") { - if (Test-Path ".\modules\rostests.bak") { - DELB - } - "Renaming rostests to rostests.bak..." -! ren ".\modules\rostests" "rostests.bak" -! if ($ENV:ROS_ARCH -eq $null) { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto - } else { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto - } - } -} else { - if (Test-Path ".\modules\rosapps.bak") { - if !(Test-Path ".\modules\rosapps") { - "Renaming rosapps.bak to rosapps..." -! ren ".\modules\rosapps.bak" "rosapps" -! if ($ENV:ROS_ARCH -eq $null) { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto - } else { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto - } - } - } - if (Test-Path ".\modules\rostests.bak") { - if !(Test-Path ".\modules\rostests") { - "Renaming rostests.bak to rostests..." -! ren ".\modules\rostests.bak" "rostests" -! if ($ENV:ROS_ARCH -eq $null) { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto - } else { -! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto - } - } - } -} # # Check if config.template.rbuild is newer than config.rbuild, if it is then 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] Sat Oct 25 15:53:14 2008 @@ -30,7 +30,6 @@ $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 $global:_ROSBE_NOSTRIP = 0 -$global:_ROSBE_MODULES = 1 $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" $global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" 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] Sat Oct 25 15:53:14 2008 @@ -12,56 +12,6 @@ if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 if %_ROSBE_DEBUG% == 1 ( @echo on -) - -if "%_ROSBE_MODULES%" neq "1" ( - if exist "modules\rosapps" ( - if exist "modules\rosapps.bak" ( - call :DELA - ) - echo Renaming rosapps to rosapps.bak... - ren "modules\rosapps" "rosapps.bak" - if "%ROS_ARCH%" == "" ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile.auto - ) else ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto - ) - ) - if exist "modules\rostests" ( - if exist "modules\rostests.bak" ( - call :DELB - ) - echo Renaming rostests to rostests.bak... - ren "modules\rostests" "rostests.bak" - if "%ROS_ARCH%" == "" ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile.auto - ) else ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto - ) - ) -) else ( - if exist "modules\rosapps.bak" ( - if not exist "modules\rosapps" ( - echo Renaming rosapps.bak to rosapps... - ren "modules\rosapps.bak" "rosapps" - if "%ROS_ARCH%" == "" ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile.auto - ) else ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto - ) - ) - ) - if exist "modules\rostests.bak" ( - if not exist "modules\rostests" ( - echo Renaming rostests.bak to rostests... - ren "modules\rostests.bak" "rostests" - if "%ROS_ARCH%" == "" ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile.auto - ) else ( - if exist %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto del /F %_ROSBE_ROSSOURCEDIR%\makefile-%ROS_ARCH%.auto - ) - ) - ) ) :: @@ -251,19 +201,6 @@ "%_ROSBE_MINGWMAKE%" -j %CPUCOUNT% %2 %3 %4 %5 %6 %7 %8 %9 ) ) -goto :EOF - - -:DELA -set /p ROSA_DEL="rosapps.bak exists! Delete it? [yes/no] " - if /i "%ROSA_DEL%"=="no" goto :EOC - if /i "%ROSA_DEL%"=="yes" rd /q /s "modules\rosapps.bak" > rm1.txt -goto :EOF - -:DELB -set /p ROSB_DEL="rostests.bak exists! Delete it? [yes/no] " - if /i "%ROSB_DEL%"=="no" goto :EOC - if /i "%ROSB_DEL%"=="yes" rd /q /s "modules\rostests.bak" > rm2.txt goto :EOF :EOC 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] Sat Oct 25 15:53:14 2008 @@ -32,7 +32,6 @@ set _ROSBE_USECCACHE=0 set _ROSBE_STRIP=0 set _ROSBE_NOSTRIP=0 -set _ROSBE_MODULES=1 set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\4.1.3 set _ROSBE_LOGDIR=%CD%\RosBE-Logs 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] Sat Oct 25 15:53:14 2008 @@ -31,42 +31,6 @@ ) else ( "%_ROSBE_BASEDIR%\Tools\svn.exe" update ) - -:: check if we should update modules dir (rosapps and rostests) -if "%_ROSBE_MODULES%" == "1" ( -:: Check if we have .bak dir instead of rosapps - if so, rename it - if exist "modules\rostests.bak" ( - if not exist "modules\rostests" ( - echo Renaming rostests.bak to rostests... - ren "modules\rostests.bak" "rostests" - ) - ) - if exist "modules\rostests" ( - cd modules\rostests - "%_ROSBE_BASEDIR%\Tools\svn.exe" update - cd ..\.. - ) else ( - cd modules - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests rostests - cd .. - ) -:: Check if we have .bak dir instead of rosapps - if so, rename it - if exist "modules\rosapps.bak" ( - if not exist "modules\rosapps" ( - echo Renaming rosapps.bak to rosapps... - ren "modules\rosapps.bak" "rosapps" - ) - ) - if exist "modules\rosapps" ( - cd modules\rosapps - "%_ROSBE_BASEDIR%\Tools\svn.exe" update - cd ..\.. - ) else ( - cd modules - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps rosapps - cd .. - ) - ) goto :EOC ) @@ -90,15 +54,6 @@ dir /b 2>nul | findstr "." >nul if errorlevel 1 ( "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/reactos . - :: check if we should download additional modules - if "%_ROSBE_MODULES%" == "1" ( - cd modules - echo Adding rostests... - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rostests rostests - echo Adding rosapps... - "%_ROSBE_BASEDIR%\Tools\svn.exe" checkout svn://svn.reactos.org/reactos/trunk/rosapps rosapps - ) - ) else ( echo ERROR: Folder is not empty. Continuing is dangerous and can cause errors. ABORTED ) Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/de-DE.rc [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "RosBE Einstellungen" FONT 8, "MS Shell Dlg" @@ -14,22 +14,21 @@ CONTROL "CCache benutzen", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Daten strippen", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 CONTROL "Nostrip Dateien zum Debuggen erzeugen", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 - CONTROL "rosapps und rostests miteinbeziehen", ID_MODULES, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150, 12 - LTEXT "Pfad zu MinGW/GCC", -1, 10, 122, 100, 15 - EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP - CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12 - EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12 - EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12 - EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Speichern", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP - CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15 + LTEXT "Pfad zu MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Logs speichern", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Verzichnis für OBJ ändern", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Verzichnis für OUT ändern", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Speichern", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Abbrechen", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Willkommen!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE @@ -75,5 +74,4 @@ HLP_QUITBUTTON, "Dieser Button lässt Sie das Programm, ohne die Konfiguration zu speichern, beenden." HLP_DEFAULTMSG, "Bewegen Sie sich über eine Fläche um Hilfe zu erhalten." HLP_NOSTRIP, "Erzeugt Debuginformation für den ReactOS Debugger." - HLP_MODULES, "Dieser Button lässt Sie entscheiden, ob ROSBE rosapps and rostests in den Build- und SVN Ladevorgang einbeziehen soll." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/en-US.rc [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "ReactOS Build Environment Settings" FONT 8, "MS Shell Dlg" @@ -14,22 +14,21 @@ CONTROL "Use CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 - CONTROL "Download and make rosapps and rostests", ID_MODULES, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150, 12 - LTEXT "Path to MinGW/GCC", -1, 10, 122, 100, 15 - EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP - CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12 - EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12 - EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12 - EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Save", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Cancel", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP - CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15 + LTEXT "Path to MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Save Logs", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Change Folder for OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Change Folder for OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Save", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Cancel", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Welcome!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE @@ -75,5 +74,4 @@ HLP_QUITBUTTON, "This button lets you quit configuration without saving." HLP_DEFAULTMSG, "Hover over a control to get help." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." - HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them to compiled image." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/fr-FR.rc [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -14,22 +14,21 @@ CONTROL "Utiliser CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Optimiser les fichiers", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 - CONTROL "Download and make rosapps and rostests", ID_MODULES, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150, 12 - LTEXT "Chemin vers MinGW/GCC", -1, 10, 122, 110, 15 - EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP - CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12 - EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 150, 12 - EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 150, 12 - EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Sauvegarder", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Annuler", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP - CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15 + LTEXT "Chemin vers MinGW/GCC", -1, 10, 107, 110, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Sauvegarder le journal", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Changer de répertoire pour OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 150, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Changer de répertoire pour OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 150, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Sauvegarder", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Annuler", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Bienvenue !", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE @@ -75,5 +74,4 @@ HLP_QUITBUTTON, "Ce bouton vous permet de quitter la configuration sans sauvegarder." HLP_DEFAULTMSG, "Passez sur un contrôle pour avoir de l'aide." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." - HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them to compiled image." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/pl-PL.rc [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -1,6 +1,6 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia ReactOS Build Environment" FONT 8, "MS Shell Dlg" @@ -14,22 +14,21 @@ CONTROL "U¿yj CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Usuñ dane debugowania", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 CONTROL "Utwórz pliki nostrip dla debugowania", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 - CONTROL "Pobierz i skompiluj rosapps oraz rostests", ID_MODULES, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150, 12 - LTEXT "cie¿ka do MinGW/GCC", -1, 10, 122, 100, 15 - EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP - CONTROL "Zapisuj logi", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12 - EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Zmieñ folder plików OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12 - EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Zmieñ folder plików OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12 - EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Zapisz", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Anuluj", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP - CONTROL "Witamy!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15 + LTEXT "cie¿ka do MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Zapisuj logi", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Zmieñ folder plików OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Zmieñ folder plików OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Zapisz", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Anuluj", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Witamy!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE @@ -75,5 +74,4 @@ HLP_QUITBUTTON, "Przycisk pozwala na wyjcie bez zapisania ustawieñ." HLP_DEFAULTMSG, "Najed na element, aby uzyskaæ pomoc." HLP_NOSTRIP, "Utwórz informacje debugowania dla Debuggera ReactOS." - HLP_MODULES, "Zaznacz jeli chcesz, by ROSBE pobra³o i skompilowa³o pliki z rosapps i rostests." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/ru-RU.rc [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -16,22 +16,21 @@ CONTROL "Èñïîëüçîâàòü êåøèðîâàíèå", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Âûðåçàòü ïóñòîé êîä ïðè êîìïèë.", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 - CONTROL "Download and make rosapps and rostests", ID_MODULES, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150, 12 - LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 122, 100, 15 - EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP - CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12 - EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12 - EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12 - EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP - CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15 + LTEXT "Ïóòü ê êîìïèëÿòîðó GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Âåñòè ëîãè", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Ïóòü ê êàòàëîãó îáúåêòîâ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Ïóòü ê êàòàëîãó âûâîäà", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñîõðàíèòü", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Îòìåíà", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Ââåäåíèå", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE @@ -77,5 +76,4 @@ HLP_QUITBUTTON, "Ýòî êëàâèøà ïîçâîëÿåò âûéòè áåç ñîõðàíåíèÿ èçìåíåíèé" HLP_DEFAULTMSG, "Ïîìîùü ïî èçíà÷àëüíûì ïàðàìåòðàì" HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." - HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them to compiled image." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/lang/uk-UA.rc [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -8,7 +8,7 @@ LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT -ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 305 +ID_DIALOG DIALOGEX DISCARDABLE 0, 0, 255, 290 STYLE DS_MODALFRAME | DS_CENTER | WS_VISIBLE | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêè çì³ííèõ êîìï³ëÿòîðà ReactOS" FONT 8, "MS Shell Dlg" @@ -22,22 +22,21 @@ CONTROL "Âèêîðèñòîâóâàòè CCache", ID_USECCACHE, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 60, 100, 12 CONTROL "Strip Output", ID_STRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 75, 100, 12 CONTROL "Create nostrip files for debugging", ID_NOSTRIP, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 90, 150, 12 - CONTROL "Download and make rosapps and rostests", ID_MODULES, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 105, 150, 12 - LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 122, 100, 15 - EDITTEXT ID_MGWDIR, 10, 135, 200, 13, WS_TABSTOP - PUSHBUTTON "...", ID_BROWSEMGW, 215, 135, 30, 13, WS_TABSTOP - CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 158, 100, 12 - EDITTEXT ID_LOGDIR, 10, 171, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSE, 215, 171, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 193, 100, 12 - EDITTEXT ID_OBJDIR, 10, 207, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOBJ, 215, 207, 30, 13, WS_TABSTOP | WS_DISABLED - CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 230, 100, 12 - EDITTEXT ID_OUTDIR, 10, 243, 200, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "...", ID_BROWSEOUT, 215, 243, 30, 13, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 265, 59, 16, WS_TABSTOP | WS_DISABLED - PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 265, 59, 16, WS_TABSTOP - CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 290, 255, 15 + LTEXT "Øëÿõ äî MinGW/GCC", -1, 10, 107, 100, 15 + EDITTEXT ID_MGWDIR, 10, 120, 200, 13, WS_TABSTOP + PUSHBUTTON "...", ID_BROWSEMGW, 215, 120, 30, 13, WS_TABSTOP + CONTROL "Âåñòè æóðíàë", ID_SAVELOGS, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 143, 100, 12 + EDITTEXT ID_LOGDIR, 10, 156, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSE, 215, 156, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Çì³íèòè ïàïêó äëÿ OBJ", ID_OTHEROBJ, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 178, 100, 12 + EDITTEXT ID_OBJDIR, 10, 192, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOBJ, 215, 192, 30, 13, WS_TABSTOP | WS_DISABLED + CONTROL "Çì³íèòè ïàïêó äëÿ OUT", ID_OTHEROUT, "button", BS_AUTOCHECKBOX | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 10, 215, 100, 12 + EDITTEXT ID_OUTDIR, 10, 228, 200, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "...", ID_BROWSEOUT, 215, 228, 30, 13, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Çáåðåãòè", ID_OK, 63, 250, 59, 16, WS_TABSTOP | WS_DISABLED + PUSHBUTTON "Ñêàñóâàòè", ID_CANCEL, 133, 250, 59, 16, WS_TABSTOP + CONTROL "Ëàñêàâî ïðîñèìî!", ID_STATUSBAR, "msctls_statusbar32", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 275, 255, 15 END STRINGTABLE @@ -83,5 +82,4 @@ HLP_QUITBUTTON, "Öå êíîïêà äîçâîëÿº âèéòè ç êîíô³ãóðóâàííÿ áåç çáåðåæåííÿ çì³í." HLP_DEFAULTMSG, "Íàâåä³òü âêàç³âíèê ìèø³ íà åëåìåíò êåðóâàííÿ, ùîá îòðèìàòè äîâ³äêó." HLP_NOSTRIP, "Creates debug information for the ReactOS Debugger." - HLP_MODULES, "If checked ROSBE will download rosapps and rostests and add them to compiled image." END Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -60,7 +60,7 @@ WriteSettings(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate,modules; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; @@ -69,7 +69,6 @@ showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); - modules = (SendDlgItemMessage(infoPtr->hwndDlg, ID_MODULES, BM_GETCHECK, 0, 0) == BST_CHECKED); strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessage(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); @@ -118,7 +117,6 @@ fwprintf(pFile, L"set _ROSBE_STRIP=%d\n", strip); fwprintf(pFile, L"set _ROSBE_NOSTRIP=%d\n", nostrip); fwprintf(pFile, L"set _ROSBE_WRITELOG=%d\n", writelog); - fwprintf(pFile, L"set _ROSBE_MODULES=%d\n", modules); if (logdir[0] != 0) fwprintf(pFile, L"set _ROSBE_LOGDIR=%s\n", logdir); if (mingwpath[0] != 0) fwprintf(pFile, L"set _ROSBE_MINGWPATH=%s\n", mingwpath); if ((objdir[0] != 0) && objstate) fwprintf(pFile, L"set _ROSBE_OBJPATH=%s\n", objdir); @@ -166,8 +164,6 @@ LoadedSettings->strip = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_NOSTRIP") == 0) LoadedSettings->nostrip = wcstol(ptr2, NULL, 2); - else if (wcscmp(ptr, L"_ROSBE_MODULES") == 0) - LoadedSettings->modules = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_WRITELOG") == 0) LoadedSettings->writelog = wcstol(ptr2, NULL, 2); else if (wcscmp(ptr, L"_ROSBE_LOGDIR") == 0) @@ -198,7 +194,6 @@ SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_SETCURSEL, LoadedSettings->foreground, 0); SendDlgItemMessageW(infoPtr->hwndDlg, IDC_BACK, CB_SETCURSEL, LoadedSettings->background, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_SETCHECK, LoadedSettings->showtime, 0); - SendDlgItemMessage(infoPtr->hwndDlg, ID_MODULES, BM_SETCHECK, LoadedSettings->modules, 0); SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_SETCHECK, LoadedSettings->writelog, 0); if (LoadedSettings->writelog) { @@ -231,7 +226,7 @@ VOID SetSaveState(POPTIONS_DLG infoPtr) { INT foreground, background; - BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate,modules; + BOOL showtime, writelog, useccache, strip, nostrip, objstate, outstate; WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH]; BOOL StateObj = TRUE, StateOut = TRUE, StateLog = TRUE, State = TRUE; PSETTINGS DefaultSettings = &infoPtr->Settings; @@ -241,7 +236,6 @@ useccache = (SendDlgItemMessage(infoPtr->hwndDlg, ID_USECCACHE, BM_GETCHECK, 0, 0) == BST_CHECKED); strip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_STRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); nostrip = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_NOSTRIP, BM_GETCHECK, 0, 0) == BST_CHECKED); - modules = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_MODULES, BM_GETCHECK, 0, 0) == BST_CHECKED); objstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROBJ, BM_GETCHECK, 0, 0) == BST_CHECKED); outstate = (SendDlgItemMessageW(infoPtr->hwndDlg, ID_OTHEROUT, BM_GETCHECK, 0, 0) == BST_CHECKED); foreground = (INT) SendDlgItemMessageW(infoPtr->hwndDlg, IDC_FONT, CB_GETCURSEL, 0, 0); @@ -263,7 +257,7 @@ State ^= ((foreground == DefaultSettings->foreground) && (background == DefaultSettings->background) && (showtime == DefaultSettings->showtime) && (writelog == DefaultSettings->writelog) && - (useccache == DefaultSettings->useccache) && (strip == DefaultSettings->strip) && (modules == DefaultSettings->modules) && + (useccache == DefaultSettings->useccache) && (strip == DefaultSettings->strip) && (objstate == DefaultSettings->objstate) && (outstate == DefaultSettings->outstate) && (StateLog) && (wcscmp(mingwpath, DefaultSettings->mingwpath) == 0) && (StateObj) && (StateOut) && (nostrip == DefaultSettings->nostrip)); @@ -362,7 +356,6 @@ {ID_USECCACHE, HLP_CCACHEUSED}, {ID_STRIP, HLP_STRIPEDEXE}, {ID_NOSTRIP, HLP_NOSTRIP}, - {ID_MODULES, HLP_MODULES}, {ID_MGWDIR, HLP_FINDMGWDIR}, {ID_BROWSEMGW, HLP_FINDMGWDIR}, {ID_LOGDIR, HLP_FINDLOGDIR}, Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.h [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -24,7 +24,6 @@ WCHAR mingwpath[MAX_PATH]; INT foreground; INT background; - BOOL modules; BOOL showtime; BOOL useccache; BOOL strip; Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/resources.h [iso-8859-1] Sat Oct 25 15:53:14 2008 @@ -50,7 +50,6 @@ #define IDC_BACK 0x25 #define ID_STATUSBAR 0x26 #define ID_NOSTRIP 0x27 -#define ID_MODULES 0x28 /* Strings */ #define MSG_NOGCCFOUND 0x27 @@ -79,5 +78,4 @@ #define HLP_QUITBUTTON 0x3c #define HLP_DEFAULTMSG 0x3d #define HLP_NOSTRIP 0x3e -#define HLP_MODULES 0x3f

16 years, 2 months

[dreimer] 36966: Updated changelog to nasm 2.03. Started to sync the Powershell Version. Almost ready, but still some slight problems.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Oct 25 14:52:33 2008 New Revision: 36966 URL: http://svn.reactos.org/svn/reactos?rev=36966&view=rev Log: Updated changelog to nasm 2.03. Started to sync the Powershell Version. Almost ready, but still some slight problems. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 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 trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt trunk/tools/RosBE/RosBE-Windows/Root/README.odt Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Build.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -6,6 +6,68 @@ # COPYRIGHT: Copyright 2008 Daniel Reimer <reimer.daniel(a)freenet.de> # # + +function DELA { +! set /p ROSA_DEL="rosapps.bak exists! Delete it? [yes/no] " + if ($ROSA_DEL -eq "no") exit +! if ($ROSA_DEL -eq "yes") rd /q /s ".\modules\rosapps.bak" +} + +function DELB { +! set /p ROSB_DEL="rostests.bak exists! Delete it? [yes/no] " + if ($ROSB_DEL -eq "no") exit +! if ($ROSB_DEL -eq "yes") rd /q /s ".\modules\rostests.bak" +} + +if ($_ROSBE_MODULES -ne 1) { + if (Test-Path ".\modules\rosapps") { + if (Test-Path ".\modules\rosapps.bak") { + DELA + } + "Renaming rosapps to rosapps.bak..." +! ren ".\modules\rosapps" "rosapps.bak" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } + if (Test-Path ".\modules\rostests") { + if (Test-Path ".\modules\rostests.bak") { + DELB + } + "Renaming rostests to rostests.bak..." +! ren ".\modules\rostests" "rostests.bak" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } +} else { + if (Test-Path ".\modules\rosapps.bak") { + if !(Test-Path ".\modules\rosapps") { + "Renaming rosapps.bak to rosapps..." +! ren ".\modules\rosapps.bak" "rosapps" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } + } + if (Test-Path ".\modules\rostests.bak") { + if !(Test-Path ".\modules\rostests") { + "Renaming rostests.bak to rostests..." +! ren ".\modules\rostests.bak" "rostests" +! if ($ENV:ROS_ARCH -eq $null) { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile.auto + } else { +! if (Test-Path $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto) del /F $_ROSBE_ROSSOURCEDIR\makefile-$ENV:ROS_ARCH.auto + } + } + } +} # # Check if config.template.rbuild is newer than config.rbuild, if it is then @@ -23,8 +85,15 @@ } # -# Check if strip or ccache are being used and set the appropriate options. -# +# Check if strip, no Debug Symbols or ccache are being used and set the appropriate options. +# +if ($_ROSBE_NOSTRIP -ne $null) { + if ($_ROSBE_NOSTRIP -eq 1) { + $ENV:ROS_BUILDNOSTRIP = "yes" + } else { + $ENV:ROS_BUILDNOSTRIP = "no" + } +} if ($_ROSBE_STRIP -ne $null) { if ($_ROSBE_STRIP -eq 1) { $ENV:ROS_LEAN_AND_MEAN = "yes" @@ -32,18 +101,61 @@ $ENV:ROS_LEAN_AND_MEAN = "no" } } +# Small Security Check to prevent useless apps. +if ($ENV:ROS_LEAN_AND_MEAN -eq "yes") { + if ($ENV:ROS_BUILDNOSTRIP -eq "yes") { +! cls + "Selecting Stripping and removing Debug Symbols together will most likely cause useless apps. Please deselect one of them." + exit + } +} + if ($_ROSBE_USECCACHE -ne $null) { if ($_ROSBE_USECCACHE -eq 1) { $ENV:CCACHE_DIR = "$APPDATA\RosBE\.ccache" $ENV:HOST_CC = "ccache gcc" $ENV:HOST_CPP = "ccache g++" + + # + #Target defaults to host(i386) + # + $ENV:TARGET_CC = "ccache gcc" $ENV:TARGET_CPP = "ccache g++" + if ($ENV:ROS_ARCH -eq "arm") { + $ENV:TARGET_CC = "ccache arm-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ccache arm-pc-mingw32-g++" + } + if ($ENV:ROS_ARCH -eq "amd64") { + $ENV:TARGET_CC = "ccache x86_64-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ccache x86_64-pc-mingw32-g++" + } + if $ENV:ROS_ARCH -eq "ppc") { + $ENV:TARGET_CC = "ccache ppc-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ccache ppc-pc-mingw32-g++" + } } else { $ENV:HOST_CC = "gcc" $ENV:HOST_CPP = "g++" + + # + #Target defaults to host(i386) + # + $ENV:TARGET_CC = "gcc" $ENV:TARGET_CPP = "g++" + if ($ENV:ROS_ARCH -eq "arm") { + $ENV:TARGET_CC = "arm-pc-mingw32-gcc" + $ENV:TARGET_CPP = "arm-pc-mingw32-g++" + } + if ($ENV:ROS_ARCH -eq "amd64") { + $ENV:TARGET_CC = "x86_64-pc-mingw32-gcc" + $ENV:TARGET_CPP = "x86_64-pc-mingw32-g++" + } + if $ENV:ROS_ARCH -eq "ppc") { + $ENV:TARGET_CC = "ppc-pc-mingw32-gcc" + $ENV:TARGET_CPP = "ppc-pc-mingw32-g++" + } } } @@ -178,6 +290,7 @@ # # Unload all used Vars. # +$ENV:ROS_BUILDNOSTRIP = $null $ENV:ROS_LEAN_AND_MEAN = $null $ENV:HOST_CC = $null $ENV:HOST_CPP = $null @@ -188,3 +301,5 @@ $ENV:ROS_TEMPORARY = $null $ENV:CPUCOUNT = $null $ENV:CCACHE_DIR = $null +$ENV:ROSA_DEL = $null +$ENV:ROSB_DEL = $null Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -26,26 +26,89 @@ # # Check if we have something to clean, if so, clean it. # - if (Test-Path "obj-i386") { - "Cleaning ReactOS source directory..." - # - # Remove directories/makefile.auto created by the build. - # + + if ($ENV:ROS_ARCH -eq "arm") { + if (Test-Path "obj-arm") { + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-arm") { + $null = (Remove-Item "obj-arm" -recurse -force) + } + if (Test-Path "output-arm") { + $null = (Remove-Item "output-arm" -recurse -force) + } + if (Test-Path "makefile-arm.auto") { + $null = (Remove-Item "makefile-arm.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." + } + } + if ($ENV:ROS_ARCH -eq "ppc") { + if (Test-Path "obj-ppc") { + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-ppc") { + $null = (Remove-Item "obj-ppc" -recurse -force) + } + if (Test-Path "output-ppc") { + $null = (Remove-Item "output-ppc" -recurse -force) + } + if (Test-Path "makefile-ppc.auto") { + $null = (Remove-Item "makefile-ppc.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." + } + } + if ($ENV:ROS_ARCH -eq "amd64") { + if (Test-Path "obj-amd64") { + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-amd64") { + $null = (Remove-Item "obj-amd64" -recurse -force) + } + if (Test-Path "output-amd64") { + $null = (Remove-Item "output-amd64" -recurse -force) + } + if (Test-Path "makefile-amd64.auto") { + $null = (Remove-Item "makefile-amd64.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." + } + } + if ($ENV:ROS_ARCH -eq $null) { if (Test-Path "obj-i386") { - $null = (Remove-Item "obj-i386" -recurse -force) + "Cleaning ReactOS source directory..." + # + # Remove directories/makefile.auto created by the build. + # + if (Test-Path "obj-i386") { + $null = (Remove-Item "obj-i386" -recurse -force) + } + if (Test-Path "output-i386") { + $null = (Remove-Item "output-i386" -recurse -force) + } + if (Test-Path "makefile.auto") { + $null = (Remove-Item "makefile.auto" -force) + } + "Done cleaning ReactOS source directory." + } else { + "ERROR: There is no compiler output to clean." } - if (Test-Path "output-i386") { - $null = (Remove-Item "output-i386" -recurse -force) - } - if (Test-Path "reactos") { - $null = (Remove-Item "reactos" -recurse -force) - } - if (Test-Path "makefile.auto") { - $null = (Remove-Item "makefile.auto" -force) - } - "Done cleaning ReactOS source directory." - } else { - "ERROR: There is no compiler output to clean." + } + if (Test-Path "reactos") { + $null = (Remove-Item "reactos" -recurse -force) } } Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Help.ps1 [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -67,6 +67,10 @@ " options - Starts the RosBE configurator." } + if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { + " update [OPTIONS] - Updates RosBE to the most recent files. + } + "" exit } @@ -99,7 +103,7 @@ if ("$args" -eq "charch") { " Usage: charch [OPTIONS]" " Change the ReactOS source directory for the current RosBE session." - " Possible Architectures are: x86, ppc, arm." + " Possible Architectures are: i386, ppc, arm, amd64." "" exit } @@ -190,6 +194,17 @@ exit } } +if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { + if ("$args" -eq "update") { + " Usage: update [OPTIONS]" + " Updates all files of RosBE to the most recent files." + "" + " nocmds - Skips the Updating of the Script Files." + " nogcc - Skips the Updating of GCC." + " notools - Skips the Updating of the Tools." + exit + } +} if ("$args" -ne $null) { " Unknown command specified. No help available for $args." exit 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] Sat Oct 25 14:52:33 2008 @@ -21,7 +21,8 @@ $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "MinGW" $global:_ROSBE_ORIGINALPATH = "$ENV:PATH" -$global:_ROSBE_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" "" "" 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] Sat Oct 25 14:52:33 2008 @@ -19,7 +19,7 @@ $APPDATA = $ENV:USERPROFILE } $ENV:PATH = "$ENV:SystemRoot\system32;$ENV:SystemRoot" -$global:_ROSBE_VERSION = 1.2 +$global:_ROSBE_VERSION = 1.3 $global:0 = $myInvocation.MyCommand.Definition $global:_ROSBE_BASEDIR = [System.IO.Path]::GetDirectoryName($0) $global:_ROSBE_MODE = "RosBE" @@ -29,7 +29,10 @@ $global:_ROSBE_WRITELOG = 1 $global:_ROSBE_USECCACHE = 0 $global:_ROSBE_STRIP = 0 -$global:_ROSBE_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_NOSTRIP = 0 +$global:_ROSBE_MODULES = 1 +$global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" +$global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.1.3" $global:_ROSBE_LOGDIR = "$_ROSBE_ROSSOURCEDIR\RosBE-Logs" $global:_ROSBE_OBJPATH = $null $global:_ROSBE_OUTPATH = $null @@ -95,6 +98,10 @@ if (Test-Path "$_ROSBE_BASEDIR\sSVN.ps1") { set-alias SSVN "$_ROSBE_BASEDIR\sSVN.ps1" -scope Global set-alias SVN "$_ROSBE_BASEDIR\Tools\svn.exe" -scope Global + } + + if (Test-Path "$_ROSBE_BASEDIR\update.ps1") { + set-alias UPDATE "$_ROSBE_BASEDIR\update.ps1" -scope Global } if (Test-Path "$_ROSBE_BASEDIR\options.ps1") { 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] Sat Oct 25 14:52:33 2008 @@ -17,36 +17,78 @@ $ENV:_ROSBE_ORIGINALPATH = "$PATH" } + +# +# Set the Arch Variables +# + +$ENV:ROS_ARCH = $null +$ENV:ROS_PREFIX = $null + +if ($_ROSBE_ARCH -eq 1) { + $ENV:ROS_ARCH = "arm" + $ENV:ROS_PREFIX = "arm-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" +} +if ($_ROSBE_ARCH -eq 2) { + $ENV:ROS_ARCH = "ppc" + $ENV:ROS_PREFIX = "ppc-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" +} +if ($_ROSBE_ARCH -eq 3) { + $ENV:ROS_ARCH = "amd64" + $ENV:ROS_PREFIX = "x86_64-pc-mingw32" + $_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\4.4.0" +} + # # Set up the GCC 4.x.x build environment. # -$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_ORIGINALPATH" +$ENV:PATH = "$_ROSBE_HOST_MINGWPATH\bin;$_ROSBE_TARGET_MINGWPATH\bin; $_ROSBE_ORIGINALPATH" +$global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" $global:_ROSBE_GCCVERSION = $null $global:_ROSBE_GCCTARGET = $null -$global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' -$global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' -$ENV:PATH = "$_ROSBE_MINGWPATH\bin;$_ROSBE_MINGWPATH\libexec\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION;$_ROSBE_ORIGINALPATH" -$global:_ROSBE_MINGWMAKE = "$_ROSBE_MINGWPATH\bin\mingw32-make.exe" +if ($ENV:ROS_ARCH -ne $null) { + $global:_ROSBE_GCCVERSION = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (& $ENV:ROS_PREFIX-gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' +} else { + $global:_ROSBE_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' + $global:_ROSBE_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' +} +$global:_ROSBE_HOST_GCCVERSION = (& gcc -v 2>&1 | select-string "gcc version") -replace ".*version ((\d|\.)+).*",'$1' +$global:_ROSBE_HOST_GCCTARGET = (& gcc -v 2>&1 | select-string "target=") -replace ".*--target=(.+?)\b.*",'$1' + if ($_ROSBE_MODE -eq "MinGW") { - $ENV:C_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" - $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_MINGWPATH\include;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" + $ENV:C_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" + $ENV:CPLUS_INCLUDE_PATH = "$_ROSBE_HOST_MINGWPATH\include;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION;$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET;$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include" } else { - $ENV:HOST_CFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" - $ENV:HOST_CPPFLAGS = "-I""$_ROSBE_MINGWPATH\include"" -I""$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" + $ENV:HOST_CFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" + $ENV:HOST_CPPFLAGS = "-I""$_ROSBE_HOST_MINGWPATH\include"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION"" -I""$_ROSBE_HOST_MINGWPATH\include\c++\$_ROSBE_HOST_GCCVERSION\$_ROSBE_HOST_GCCTARGET"" -I""$_ROSBE_HOST_MINGWPATH\lib\gcc\$_ROSBE_HOST_GCCTARGET\$_ROSBE_HOST_GCCVERSION\include""" + $ENV:TARGET_CFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" + $ENV:TARGET_CPPFLAGS = "-I""$_ROSBE_TARGET_MINGWPATH\include"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION"" -I""$_ROSBE_TARGET_MINGWPATH\include\c++\$_ROSBE_GCCVERSION\$_ROSBE_GCCTARGET"" -I""$_ROSBE_TARGET_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION\include""" } -$ENV:LIBRARY_PATH = "$_ROSBE_MINGWPATH\lib;$_ROSBE_MINGWPATH\lib\gcc\$_ROSBE_GCCTARGET\$_ROSBE_GCCVERSION" # # Display the current version of GCC, NASM, ld and make. # +if ($ENV:ROS_ARCH -ne $null) { +& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-gcc" -v 2>&1 | select-string "gcc version" +"gcc target - $_ROSBE_GCCTARGET" +& "$_ROSBE_TARGET_MINGWPATH\bin\$ENV:ROS_PREFIX-ld" -v +} else { & gcc -v 2>&1 | select-string "gcc version" "gcc target - $_ROSBE_GCCTARGET" & ld -v +} if (Test-Path "$_ROSBE_MINGWPATH\bin\nasm.exe") { & nasm -v } else { - if ($_ROSBE_MODE -eq "RosBE") { - "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." + if (Test-Path "$_ROSBE_MINGWPATH\bin\yasm.exe") { + & yasm --version | select-string "yasm 0" + } else { + if ($_ROSBE_MODE -eq "RosBE") { + "ERROR: NASM is required to build ReactOS, none found in the current MinGW/GCC." + } } } if (Test-Path "$_ROSBE_MINGWPATH\bin\bison.exe") { Modified: trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cha… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/ChangeLog.txt [iso-8859-1] Sat Oct 25 14:52:33 2008 @@ -1,7 +1,7 @@ *** October 26th, 2008 - RosBE 1.3 Released - Added: Tool to set the Architecture to build ROS for. (Daniel Reimer) -- Updated: NASM to 2.05 RC8 (Daniel Reimer) +- Updated: NASM to 2.03 (Daniel Reimer) - Updated: NSIS to 2.40 (Daniel Reimer) - Updated: Subversion to 1.5.3 (Daniel Reimer) - Updated: GDB to 6.8-3 (Daniel Reimer) Modified: trunk/tools/RosBE/RosBE-Windows/Root/README.odt URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/REA… ============================================================================== Binary files - no diff available.

16 years, 2 months

[mjmartin] 36965: - Correct fix for handling WM_MOUSEACTIVATE and Bug #3111. If no parent, use MsgWindow->hSelf as wParam.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Sat Oct 25 13:42:42 2008 New Revision: 36965 URL: http://svn.reactos.org/svn/reactos?rev=36965&view=rev Log: - Correct fix for handling WM_MOUSEACTIVATE and Bug #3111. If no parent, use MsgWindow->hSelf as wParam. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c [iso-8859-1] Sat Oct 25 13:42:42 2008 @@ -598,16 +598,10 @@ Parent = IntGetParent(MsgWindow);//fixme: deref retval? - /* If there is no parent, do not send the WM_MOUSEACTIVATE message. Fixes Bug #3111 */ - if (!Parent) - { - co_IntMouseActivateWindow(MsgWindow); - return FALSE; - } - + /* If no parent window, pass MsgWindows HWND as wParam. Fixes bug #3111 */ Result = co_IntSendMessage(MsgWindow->hSelf, WM_MOUSEACTIVATE, - (WPARAM) (Parent ? Parent->hSelf : NULL), + (WPARAM) (Parent ? Parent->hSelf : MsgWindow->hSelf), (LPARAM)MAKELONG(*HitTest, Msg->message) );

16 years, 2 months

[sginsberg] 36964: - Fix DXG 64-bit compilation (fix not entirely correct though)

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Oct 25 13:18:03 2008 New Revision: 36964 URL: http://svn.reactos.org/svn/reactos?rev=36964&view=rev Log: - Fix DXG 64-bit compilation (fix not entirely correct though) Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxg/ddhmg.c Modified: branches/ros-amd64-bringup/reactos/drivers/directx/dxg/ddhmg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/directx/dxg/ddhmg.c [iso-8859-1] Sat Oct 25 13:18:03 2008 @@ -26,7 +26,7 @@ FASTCALL VerifyObjectOwner(PDD_ENTRY pEntry) { - DWORD Pid = (DWORD) PsGetCurrentProcessId() & 0xFFFFFFFC; + DWORD Pid = (DWORD)(DWORD_PTR)PsGetCurrentProcessId() & 0xFFFFFFFC; DWORD check = pEntry->ObjectOwner.ulObj & 0xFFFFFFFE; return ( (check == Pid) || (!check)); } @@ -147,7 +147,7 @@ DdHmgLock( HANDLE DdHandle, UCHAR ObjectType, BOOLEAN LockOwned) { - DWORD Index = (DWORD)DdHandle & 0x1FFFFF; + DWORD Index = (DWORD)(DWORD_PTR)DdHandle & 0x1FFFFF; PDD_ENTRY pEntry = NULL; PVOID Object = NULL;

16 years, 2 months

[hyperion] 36963: Visual C++ backend for rbuild (for now just a hacked mingw backend) and related compilation fixes. Just run vcvars.bat from a RosBE console and "make"! modified dll/win32/aclui/guid.c modified dll/win32/aclui/precomp.h modified drivers/bus/acpi/include/actypes.h modified drivers/bus/acpi/include/platform/acenv.h Miscellaneous compilation fixes modified dll/win32/aclui/sidcache.c Damn, forgot to commit this to trunk deleted include/psdk/intrin.h added include/psdk/intrin.h.bak i

by hyperion＠svn.reactos.org

Author: hyperion Date: Sat Oct 25 13:13:25 2008 New Revision: 36963 URL: http://svn.reactos.org/svn/reactos?rev=36963&view=rev Log: Visual C++ backend for rbuild (for now just a hacked mingw backend) and related compilation fixes. Just run vcvars.bat from a RosBE console and "make"! modified dll/win32/aclui/guid.c modified dll/win32/aclui/precomp.h modified drivers/bus/acpi/include/actypes.h modified drivers/bus/acpi/include/platform/acenv.h Miscellaneous compilation fixes modified dll/win32/aclui/sidcache.c Damn, forgot to commit this to trunk deleted include/psdk/intrin.h added include/psdk/intrin.h.bak intrin.h is positively not a PSDK header modified lib/3rdparty/mingw/wcrt1.c Port to Visual C++ modified ReactOS-generic.rbuild Use Visual C++'s built-in CRT headers for now modified ReactOS-i386.rbuild Translate global compiler flags to Visual C++ modified tools/rbuild/backend/mingw/mingw.cpp No need for -pipe in Visual C++ Disable precompiled headers for now Enable a whole lotta warnings, and disable a few. Should move this to a response file somewhere modified tools/rbuild/backend/mingw/modulehandler.cpp .a -> .lib .o -> .obj .coff -> .res.obj, fix windres command line to remove the ambiguity ${gcc}/${gpp} -> ${cl}, translate command line options ECHO_CC -> ECHO_CL Pass *_RCFLAGS to gas instead of *_CFLAGS, for now, so that gas only sees includes and defines (in the future we'll have something like *_ASFLAGS) Disabled some gcc-specific code for now modified tools/rbuild/module.cpp .a -> .lib, .o -> .obj, lib<name>.a -> <name>.lib; and why the hell is this in the front-end? Added: branches/the-real-msvc/include/psdk/intrin.h.bak (props changed) - copied unchanged from r36953, trunk/reactos/include/psdk/intrin.h Removed: branches/the-real-msvc/include/psdk/intrin.h Modified: branches/the-real-msvc/ReactOS-generic.rbuild branches/the-real-msvc/ReactOS-i386.rbuild branches/the-real-msvc/dll/win32/aclui/guid.c branches/the-real-msvc/dll/win32/aclui/precomp.h branches/the-real-msvc/dll/win32/aclui/sidcache.c branches/the-real-msvc/drivers/bus/acpi/include/actypes.h branches/the-real-msvc/drivers/bus/acpi/include/platform/acenv.h branches/the-real-msvc/lib/3rdparty/mingw/wcrt1.c branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp branches/the-real-msvc/tools/rbuild/module.cpp Modified: branches/the-real-msvc/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ReactOS-generic.r… ============================================================================== --- branches/the-real-msvc/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/the-real-msvc/ReactOS-generic.rbuild [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -64,8 +64,8 @@ <include root="intermediate">include/psdk</include> <include>include/dxsdk</include> <include root="intermediate">include/dxsdk</include> - <include>include/crt</include> - <include>include/crt/mingw32</include> +  +  <include>include/ddk</include> <include>include/GL</include> <include>include/ndk</include> Modified: branches/the-real-msvc/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/ReactOS-i386.rbui… ============================================================================== --- branches/the-real-msvc/ReactOS-i386.rbuild [iso-8859-1] (original) +++ branches/the-real-msvc/ReactOS-i386.rbuild [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -16,27 +16,41 @@ <property name="NTOSKRNL_SHARED" value="-file-alignment=0x1000 -section-alignment=0x1000 -shared"/> <if property="OPTIMIZE" value="1"> +  + <compilerflag>-O1</compilerflag> </if> <if property="OPTIMIZE" value="2"> +  + <compilerflag>-O2</compilerflag> + </if> + <if property="OPTIMIZE" value="3"> +  + <compilerflag>-Ox</compilerflag> <compilerflag>-Os</compilerflag> </if> - <if property="OPTIMIZE" value="3"> - <compilerflag>-O1</compilerflag> - </if> <if property="OPTIMIZE" value="4"> - <compilerflag>-O2</compilerflag> +  + <compilerflag>-Ox</compilerflag> + <compilerflag>-Os</compilerflag> </if> <if property="OPTIMIZE" value="5"> - <compilerflag>-O3</compilerflag> +  + <compilerflag>-Ox</compilerflag> + <compilerflag>-Os</compilerflag> </if> +  + <compilerflag>-Oy-</compilerflag> + <compilerflag>-GS-</compilerflag> <linkerflag>-disable-stdcall-fixup</linkerflag> </project> Modified: branches/the-real-msvc/dll/win32/aclui/guid.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/aclui/g… ============================================================================== --- branches/the-real-msvc/dll/win32/aclui/guid.c [iso-8859-1] (original) +++ branches/the-real-msvc/dll/win32/aclui/guid.c [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -19,8 +19,11 @@ /* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ +#include <windows.h> + #include <initguid.h> -#include <windows.h> +#include <objbase.h> + #include <aclui.h> #include <objsel.h> Modified: branches/the-real-msvc/dll/win32/aclui/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/aclui/p… ============================================================================== --- branches/the-real-msvc/dll/win32/aclui/precomp.h [iso-8859-1] (original) +++ branches/the-real-msvc/dll/win32/aclui/precomp.h [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -4,7 +4,7 @@ #include <windows.h> #include <ndk/ntndk.h> #include <commctrl.h> -#include <oleauto.h> +#include <ole2.h> #include <objsel.h> #include <prsht.h> #include <aclui.h> Modified: branches/the-real-msvc/dll/win32/aclui/sidcache.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/dll/win32/aclui/s… ============================================================================== --- branches/the-real-msvc/dll/win32/aclui/sidcache.c [iso-8859-1] (original) +++ branches/the-real-msvc/dll/win32/aclui/sidcache.c [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -178,7 +178,7 @@ if (SystemName != NULL && SystemName[0] != L'\0') { LsaSystemName.Buffer = SystemName; - LsaSystemName.Length = wcslen(SystemName) * sizeof(WCHAR); + LsaSystemName.Length = (USHORT)(wcslen(SystemName) * sizeof(WCHAR)); /* FIXME: possible overflow */ LsaSystemName.MaximumLength = LsaSystemName.Length + sizeof(WCHAR); psn = &LsaSystemName; } Modified: branches/the-real-msvc/drivers/bus/acpi/include/actypes.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/bus/acpi/… ============================================================================== --- branches/the-real-msvc/drivers/bus/acpi/include/actypes.h [iso-8859-1] (original) +++ branches/the-real-msvc/drivers/bus/acpi/include/actypes.h [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -193,11 +193,11 @@ */ #ifdef _MSC_VER typedef ULONGLONG u64; -typedef ULONG u32; +//~ typedef ULONG u32; typedef USHORT u16; typedef UCHAR u8; typedef LONGLONG s64; -typedef LONG s32; +//~ typedef LONG s32; typedef SHORT s16; typedef CHAR s8; #endif Modified: branches/the-real-msvc/drivers/bus/acpi/include/platform/acenv.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/drivers/bus/acpi/… ============================================================================== --- branches/the-real-msvc/drivers/bus/acpi/include/platform/acenv.h [iso-8859-1] (original) +++ branches/the-real-msvc/drivers/bus/acpi/include/platform/acenv.h [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -111,10 +111,10 @@ #elif _AED_EFI #include "acefi.h" -#elif WIN32 +#elif defined(WIN32) #include "acwin.h" -#elif __FreeBSD__ +#elif defined(__FreeBSD__) #include "acfreebsd.h" #else Removed: branches/the-real-msvc/include/psdk/intrin.h URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/include/psdk/intr… ============================================================================== --- branches/the-real-msvc/include/psdk/intrin.h [iso-8859-1] (original) +++ branches/the-real-msvc/include/psdk/intrin.h (removed) @@ -1,96 +1,0 @@ -/* - Compatibility <intrin.h> header for GCC -- GCC equivalents of intrinsic - Microsoft Visual C++ functions. Originally developed for the ReactOS - (<http://www.reactos.org/>) and TinyKrnl (<http://www.tinykrnl.org/>) - projects. - - Copyright (c) 2006 KJK::Hyperion <hackbunny(a)reactos.com> - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. -*/ - -#ifndef KJK_INTRIN_H_ -#define KJK_INTRIN_H_ - -#ifndef __GNUC__ -#error Unsupported compiler -#endif - -/* - FIXME: review all "memory" clobbers, add/remove to match Visual C++ - behavior: some "obvious" memory barriers are not present in the Visual C++ - implementation - e.g. __stosX; on the other hand, some memory barriers that - *are* present could have been missed -*/ - -/* - NOTE: this is a *compatibility* header. Some functions may look wrong at - first, but they're only "as wrong" as they would be on Visual C++. Our - priority is compatibility - - NOTE: unlike most people who write inline asm for GCC, I didn't pull the - constraints and the uses of __volatile__ out of my... hat. Do not touch - them. I hate cargo cult programming - - NOTE: be very careful with declaring "memory" clobbers. Some "obvious" - barriers aren't there in Visual C++ (e.g. __stosX) - - NOTE: review all intrinsics with a return value, add/remove __volatile__ - where necessary. If an intrinsic whose value is ignored generates a no-op - under Visual C++, __volatile__ must be omitted; if it always generates code - (for example, if it has side effects), __volatile__ must be specified. GCC - will only optimize out non-volatile asm blocks with outputs, so input-only - blocks are safe. Oddities such as the non-volatile 'rdmsr' are intentional - and follow Visual C++ behavior - - NOTE: on GCC 4.1.0, please use the __sync_* built-ins for barriers and - atomic operations. Test the version like this: - - #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 - ... - - Pay attention to the type of barrier. Make it match with what Visual C++ - would use in the same case -*/ - -#if defined(__i386__) -#include "intrin_x86.h" -#elif defined(_PPC_) -#include "intrin_ppc.h" -#elif defined(_MIPS_) -#include "intrin_mips.h" -#elif defined(_M_ARM) -#include "intrin_arm.h" -#elif defined(__x86_64__) -/* TODO: the x64 architecture shares most of the i386 intrinsics. It should be easy to support */ -#include "intrin_x86.h" -#else -#error Unsupported architecture -#endif - - -/*** Miscellaneous ***/ -/* BUGBUG: only good for use in macros. Cannot be taken the address of */ -#define __noop(...) ((void)0) - -/* TODO: __assume. GCC only supports the weaker __builtin_expect */ - -#endif - -/* EOF */ Propchange: branches/the-real-msvc/include/psdk/intrin.h.bak ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/the-real-msvc/include/psdk/intrin.h.bak ------------------------------------------------------------------------------ svn:mergeinfo = Modified: branches/the-real-msvc/lib/3rdparty/mingw/wcrt1.c URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/lib/3rdparty/ming… ============================================================================== --- branches/the-real-msvc/lib/3rdparty/mingw/wcrt1.c [iso-8859-1] (original) +++ branches/the-real-msvc/lib/3rdparty/mingw/wcrt1.c [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -42,7 +42,7 @@ #define __UNKNOWN_APP 0 #define __CONSOLE_APP 1 #define __GUI_APP 2 -__MINGW_IMPORT void __set_app_type(int); +_CRTIMP void __set_app_type(int); #endif /* __MSVCRT__ */ /* Global _fmode for this .exe, not the one in msvcrt.dll, @@ -181,7 +181,7 @@ /* * The function mainCRTStartup is the entry point for all console programs. */ -static void __attribute__((noreturn)) +static void __declspec(noreturn) __mingw_wCRTStartup (void) { int nRet; @@ -218,6 +218,7 @@ _pei386_runtime_relocator (); #endif +#if defined(__GNUC__) #if defined(__i386__) /* Align the stack to 16 bytes for the sake of SSE ops in main or in functions inlined into main. */ @@ -231,6 +232,17 @@ #else #error Unsupported architecture #endif +#endif + +#if defined(_MSC_VER) +#if defined(_M_IX86) + /* Align the stack to 16 bytes for the sake of SSE ops in main + or in functions inlined into main. */ + __asm and esp, 0FFFFFFF0h +#else +#error Unsupported architecture +#endif +#endif /* * Call the main function. If the user does not supply one Modified: branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… ============================================================================== --- branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ branches/the-real-msvc/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -340,8 +340,8 @@ DetectCompiler (); DetectBinutils (); DetectNetwideAssembler (); - DetectPipeSupport (); - DetectPCHSupport (); + usePipe = true; //~ DetectPipeSupport (); + use_pch = false; //~ DetectPCHSupport (); CreateMakefile (); GenerateHeader (); GenerateGlobalVariables (); @@ -496,11 +496,12 @@ fprintf ( fMakefile, "PROJECT_WIDLFLAGS := $(PROJECT_CFLAGS) $(PROJECT_CDEFINES)\n" ); fprintf ( fMakefile, "PROJECT_LFLAGS := '$(shell ${TARGET_CC} -print-libgcc-file-name)' %s\n", GenerateProjectLFLAGS ().c_str () ); fprintf ( fMakefile, "PROJECT_LPPFLAGS := '$(shell ${TARGET_CPP} -print-file-name=libstdc++.a)' '$(shell ${TARGET_CPP} -print-file-name=libgcc.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingw32.a)' '$(shell ${TARGET_CPP} -print-file-name=libmingwex.a)'\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); - fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); - fprintf ( fMakefile, "endif\n" ); - fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); + //~ fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); + fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall -W4 -wd4820 -wd4214 -wd4201 -wd4668 -wd4255 -wd4005 -wd4127 -wd4710 -wd4711 -wd4100 -wd4738 -wd4706\n" ); + //~ fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); + //~ fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); + //~ fprintf ( fMakefile, "endif\n" ); + //~ fprintf ( fMakefile, "PROJECT_CFLAGS += $(PROJECT_GCCOPTIONS)\n" ); fprintf ( fMakefile, "\n" ); } Modified: branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/back… ============================================================================== --- branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] (original) +++ branches/the-real-msvc/tools/rbuild/backend/mingw/modulehandler.cpp [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -284,7 +284,7 @@ return GetTargetFilename ( module, NULL ); return new FileLocation ( IntermediateDirectory, module.output->relative_path, - ReplaceExtension ( module.name, ".temp.a" ) ); + ReplaceExtension ( module.name, ".temp.lib" ) ); } /*static*/ bool @@ -417,24 +417,24 @@ if ( module.type == BootSector ) return new FileLocation ( *module.output ); else if ( extension == ".rc" || extension == ".RC" ) - newExtension = "_" + module.name + ".coff"; + newExtension = "_" + module.name + ".res.obj"; else if ( extension == ".mc" || extension == ".MC" ) newExtension = ".rc"; else if ( extension == ".spec" || extension == ".SPEC" ) - newExtension = "_" + module.name + ".stubs.o"; + newExtension = "_" + module.name + ".stubs.obj"; else if ( extension == ".idl" || extension == ".IDL" ) { if ( module.type == RpcServer ) - newExtension = "_s.o"; + newExtension = "_s.obj"; else if ( module.type == RpcClient ) - newExtension = "_c.o"; + newExtension = "_c.obj"; else if ( module.type == RpcProxy ) - newExtension = "_p.o"; + newExtension = "_p.obj"; else newExtension = ".h"; } else - newExtension = "_" + module.name + ".o"; + newExtension = "_" + module.name + ".obj"; if ( module.type == BootSector ) destination_directory = OutputDirectory; @@ -1041,8 +1041,8 @@ module.pch->file->name + ".gch" ); } -Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a: $($(module_name)_OBJS) $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).a", +Rule arRule1 ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).lib: $($(module_name)_OBJS) $(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).lib", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule arRule2 ( "\t$(ECHO_AR)\n" "\t${ar} -rc $@ $($(module_name)_OBJS)\n", @@ -1051,10 +1051,10 @@ "\t${host_ar} -rc $@ $($(module_name)_OBJS)\n", NULL ); Rule gasRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_GAS)\n" - "\t${gcc} -x assembler-with-cpp -o $@ -D__ASM__ $($(module_name)_CFLAGS) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", + "\t${gcc} -x assembler-with-cpp -o $@ -D__ASM__ $($(module_name)_RCFLAGS) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule bootRule ( "$(source): ${$(module_name)_precondition}\n" "$(module_output): $(source)$(dependencies) | $(OUTPUT)$(SEP)$(source_dir)\n" @@ -1062,20 +1062,20 @@ "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", "$(OUTPUT)$(SEP)$(source_dir)$(SEP)", NULL ); Rule nasmRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_NASM)\n" "\t$(Q)${nasm} -f win32 $< -o $@ $($(module_name)_NASMFLAGS)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule windresRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff: $(source)$(dependencies) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).res.obj: $(source)$(dependencies) $(WRC_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir) $(TEMPORARY)\n" "\t$(ECHO_WRC)\n" - "\t${gcc} -xc -E -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp\n" + "\t${cl} -TC -E -DRC_INVOKED ${$(module_name)_RCFLAGS} $(source) > $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp "/*> " NUL*/ "\n" "\t$(Q)$(WRC_TARGET) ${$(module_name)_RCFLAGS} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp\n" "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).rci.tmp 2>$(NUL)\n" - "\t${windres} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp -o $@\n" + "\t${windres} --output-format=coff $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp -o $@\n" "\t-@${rm} $(TEMPORARY)$(SEP)$(module_name).$(source_name_noext).res.tmp 2>$(NUL)\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).coff", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).res.obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule wmcRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).rc $(INTERMEDIATE)$(SEP)include$(SEP)reactos$(SEP)$(source_name_noext).h: $(WMC_TARGET) $(source) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WMC)\n" @@ -1085,19 +1085,19 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildKMDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" - "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n" + "\t${cl} -TC -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec "/*> " NUL*/ "\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildKMRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c:\n" "\t${cp} $(NUL) $@ 1>$(NUL)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.obj: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CL)\n" + "\t${cl} -Fo$@ -Fd$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.pdb $($(module_name)_CFLAGS)$(compiler_flags) -c $< "/*> " NUL*/ "\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule winebuildDefRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WINEBLD)\n" @@ -1108,11 +1108,11 @@ Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c: $(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n" "\t$(ECHO_WINEBLD)\n" "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext)_$(module_name).stubs.c --pedll $(source_path)$(SEP)$(source_name_noext).spec\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.obj: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CL)\n" + "\t${cl} -Fo$@ -Fd$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.pdb $($(module_name)_CFLAGS)$(compiler_flags) -c $< "/*> " NUL*/ "\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).stubs.obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlHeaderRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1124,34 +1124,34 @@ "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h -s -S $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(source)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.obj: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CL)\n" + "\t${cl} -Fo$@ -Fd$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.pdb $($(module_name)_CFLAGS)$(compiler_flags) -c $< "/*> " NUL*/ "\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_s.obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlClientRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h -c -C $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(source)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.obj: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CL)\n" + "\t${cl} -Fo$@ -Fd$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.pdb $($(module_name)_CFLAGS)$(compiler_flags) -c $< "/*> " NUL*/ "\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_c.obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlProxyRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_WIDL)\n" "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -h -H $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h -p -P $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(source)\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.obj: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CL)\n" + "\t${cl} -Fo$@ -Fd$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.pdb $($(module_name)_CFLAGS)$(compiler_flags) -c $< "/*> " NUL*/ "\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.h", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.c", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.o", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_p.obj", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule widlTlbRule ( "$(source): ${$(module_name)_precondition}\n" "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(module_name).tlb: $(source)$(dependencies) $(WIDL_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" @@ -1159,25 +1159,25 @@ "\t$(Q)$(WIDL_TARGET) $($(module_name)_WIDLFLAGS) -t -T $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).tlb $(source)\n", "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL ); Rule gccRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CL)\n" + "\t${cl} -Fo$@ -Fd$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).pdb $($(module_name)_CFLAGS)$(compiler_flags) -c $< "/*> " NUL*/ "\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj", NULL ); Rule gccHostRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj", NULL ); Rule gppRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" - "\t$(ECHO_CC)\n" - "\t${gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "\t$(ECHO_CL)\n" + "\t${cl} -Fo$@ -Fd$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).pdb $($(module_name)_CFLAGS)$(compiler_flags) -c $< "/*> " NUL*/ "\n", + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj", NULL ); Rule gppHostRule ( "$(source): ${$(module_name)_precondition}\n" - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj: $(source)$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n" "\t$(ECHO_CC)\n" "\t${host_gpp} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n", - "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).o", NULL ); + "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext)_$(module_name).obj", NULL ); Rule emptyRule ( "", NULL ); void @@ -1647,8 +1647,8 @@ if ( pchFilename ) { - string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${gcc}" ); - string cppc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gpp}" : "${gpp}" ); + string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${cl}" ); + string cppc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gpp}" : "${cl}" ); const FileLocation& baseHeaderFile = *module.pch->file; CLEAN_FILE ( *pchFilename ); @@ -1665,7 +1665,7 @@ backend->GetFullPath ( *pchFilename ).c_str() ); fprintf ( fMakefile, "\t$(ECHO_PCH)\n" ); fprintf ( fMakefile, - "\t%s -o %s %s -g %s\n\n", + "\t%s -o %s %s -Zi %s\n\n", module.cplusplus ? cppc.c_str() : cc.c_str(), backend->GetFullName ( *pchFilename ).c_str(), cflagsMacro.c_str(), @@ -1897,35 +1897,38 @@ string globalCflags = ""; if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse ) + { globalCflags += " $(PROJECT_CFLAGS)"; + globalCflags += " -Zi"; + + if ( !module.allowWarnings ) + globalCflags += " -WX"; + + globalCflags += " -Zl -MD"; + globalCflags += " -D__MSVCRT__ -D__MINGW_IMPORT=__declspec(dllimport)"; + globalCflags += " -D_CRT_SECURE_NO_WARNINGS"; + globalCflags += " -D_CRT_NON_CONFORMING_SWPRINTFS"; + } else + { globalCflags += " -Wall -Wpointer-arith -D__REACTOS__"; - globalCflags += " -g"; - if ( backend->usePipe ) - globalCflags += " -pipe"; - if ( !module.allowWarnings ) - globalCflags += " -Werror"; - if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ) - { + globalCflags += " -g"; + + if ( !module.allowWarnings ) + globalCflags += " -Werror"; + if ( module.cplusplus ) globalCflags += " $(HOST_CPPFLAGS)"; else globalCflags += " -Wno-strict-aliasing $(HOST_CFLAGS)"; } - else - { - if ( module.cplusplus ) - { - // HACK: use host headers when building C++ - globalCflags += " $(HOST_CPPFLAGS)"; - } - else - globalCflags += " -nostdinc"; - } + + //~ if ( backend->usePipe ) + //~ globalCflags += " -pipe"; // Always force disabling of sibling calls optimisation for GCC // (TODO: Move to version-specific once this bug is fixed in GCC) - globalCflags += " -fno-optimize-sibling-calls"; + //~ globalCflags += " -fno-optimize-sibling-calls"; fprintf ( fMakefile, @@ -1995,9 +1998,9 @@ if ( IsStaticLibrary ( module ) && module.isStartupLib ) { - fprintf ( fMakefile, - "%s += -Wno-main\n\n", - cflagsMacro.c_str () ); + //~ fprintf ( fMakefile, + //~ "%s += -Wno-main\n\n", + //~ cflagsMacro.c_str () ); } fprintf ( fMakefile, "\n\n" ); @@ -3545,7 +3548,7 @@ fprintf ( fMakefile, "\t$(ECHO_BOOTPROG)\n" ); - fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s -g -o %s\n", + fprintf ( fMakefile, "\t${gcc} $(%s_LINKFORMAT) %s %s -Zi -o %s\n", module.buildtype.c_str(), objectsMacro.c_str(), libsMacro.c_str(), Modified: branches/the-real-msvc/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/the-real-msvc/tools/rbuild/modu… ============================================================================== --- branches/the-real-msvc/tools/rbuild/module.cpp [iso-8859-1] (original) +++ branches/the-real-msvc/tools/rbuild/module.cpp [iso-8859-1] Sat Oct 25 13:13:25 2008 @@ -992,9 +992,9 @@ case BootProgram: case StaticLibrary: case HostStaticLibrary: - return ".a"; + return ".lib"; case ObjectLibrary: - return ".o"; + return ".obj"; case Kernel: case NativeCUI: case Win32CUI: @@ -1016,7 +1016,7 @@ case Cabinet: return ".cab"; case BootSector: - return ".o"; + return ".obj"; case Iso: case LiveIso: case IsoRegTest: @@ -1027,7 +1027,7 @@ case RpcServer: case RpcClient: case RpcProxy: - return ".o"; + return ".obj"; case Alias: case ElfExecutable: case IdlHeader: @@ -1284,7 +1284,7 @@ this->importLibrary = importLibrary; dependency = new FileLocation ( HasImportLibrary () ? IntermediateDirectory : output->directory, output->relative_path, - HasImportLibrary () ? "lib" + name + ".a" : output->name ); + HasImportLibrary () ? name + ".lib" : output->name ); }

16 years, 2 months

[cgutman] 36962: - Fail earlier when we try to send on a non-connected adapter - This commit dedicated to blight_

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Oct 25 13:11:57 2008 New Revision: 36962 URL: http://svn.reactos.org/svn/reactos?rev=36962&view=rev Log: - Fail earlier when we try to send on a non-connected adapter - This commit dedicated to blight_ Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Oct 25 13:11:57 2008 @@ -628,6 +628,11 @@ ("Called( NdisPacket %x, Offset %d, Adapter %x )\n", NdisPacket, Offset, Adapter)); + if (Adapter->State != LAN_STATE_STARTED) { + ProtocolSendComplete(Context, NdisPacket, NDIS_STATUS_NOT_ACCEPTED); + return; + } + TI_DbgPrint(DEBUG_DATALINK, ("Adapter Address [%02x %02x %02x %02x %02x %02x]\n", Adapter->HWAddress[0] & 0xff, @@ -643,7 +648,6 @@ LanChainCompletion( Adapter, NdisPacket ); - if (Adapter->State == LAN_STATE_STARTED) { switch (Adapter->Media) { case NdisMedium802_3: EHeader = (PETH_HEADER)Data; @@ -713,9 +717,6 @@ * the situation with IRPs. */ if (NdisStatus != NDIS_STATUS_PENDING) ProtocolSendComplete((NDIS_HANDLE)Context, NdisPacket, NdisStatus); - } else { - ProtocolSendComplete((NDIS_HANDLE)Context, NdisPacket, NDIS_STATUS_CLOSED); - } } static NTSTATUS

16 years, 2 months

← Newer
1
...
13
14
15
16
17
18
19
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2008