Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 36974: - Merge aicom-network-fixes up to r36973
by cgutman＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: cgutman Date: Sat Oct 25 18:44:41 2008 New Revision: 36974 URL: http://svn.reactos.org/svn/reactos?rev=36974&view=rev Log: - Merge aicom-network-fixes up to r36973 Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Oct 25 18:44:41 2008 @@ -221,10 +221,6 @@ ExFreePool( FCB->LocalAddress ); if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - if( FCB->ListenIrp.ConnectionReturnInfo ) - ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); - if( FCB->ListenIrp.ConnectionCallInfo ) - ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer); Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sat Oct 25 18:44:41 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 Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sat Oct 25 18:44:41 2008 @@ -28,6 +28,9 @@ VOID NBSendPackets( PNEIGHBOR_CACHE_ENTRY NCE ) { PLIST_ENTRY PacketEntry; PNEIGHBOR_PACKET Packet; + + if(!(NCE->State & NUD_CONNECTED)) + return; /* Send any waiting packets */ PacketEntry = ExInterlockedRemoveHeadList(&NCE->PacketQueue, Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sat Oct 25 18:44:41 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: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Oct 25 18:44:41 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 );

1 0

[cgutman] 36973: - Don't free ConnectionReturnInfo and ConnectionCallInfo because they get freed in the completion routine - Fixes Abyss Web Server regression
by cgutman＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: cgutman Date: Sat Oct 25 18:02:07 2008 New Revision: 36973 URL: http://svn.reactos.org/svn/reactos?rev=36973&view=rev Log: - Don't free ConnectionReturnInfo and ConnectionCallInfo because they get freed in the completion routine - Fixes Abyss Web Server regression Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Sat Oct 25 18:02:07 2008 @@ -221,10 +221,6 @@ ExFreePool( FCB->LocalAddress ); if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - if( FCB->ListenIrp.ConnectionReturnInfo ) - ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); - if( FCB->ListenIrp.ConnectionCallInfo ) - ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); if( FCB->TdiDeviceName.Buffer ) ExFreePool(FCB->TdiDeviceName.Buffer);

1 0

[sginsberg] 36972: - When doing pointer arithmetic, ULONG_PTR is your friend
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

Author: sginsberg Date: Sat Oct 25 17:57:16 2008 New Revision: 36972 URL: http://svn.reactos.org/svn/reactos?rev=36972&view=rev Log: - When doing pointer arithmetic, ULONG_PTR is your friend Modified: branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c Modified: branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/video/displays/vga/main/enable.c [iso-8859-1] Sat Oct 25 17:57:16 2008 @@ -562,7 +562,7 @@ /* next DEVMODE entry */ OutputModes--; - DM = (PDEVMODEW) ( ((ULONG)DM) + sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE); + DM = (PDEVMODEW) ( ((ULONG_PTR)DM) + sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE); OutputSize += (sizeof(DEVMODEW) + DRIVER_EXTRA_SIZE); }

1 0

[sginsberg] 36971: - Don't typedef ULONG_PTR to a 32-bit value
by sginsberg＠svn.reactos.org 25 Oct '08

25 Oct '08

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 */

1 0

[cgutman] 36970: - Check the status of OskitTCPBind
by cgutman＠svn.reactos.org 25 Oct '08

25 Oct '08

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 );

1 0

[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 25 Oct '08

25 Oct '08

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:

1 0

[dreimer] 36968: ok, Binutils and ccache reverted.
by dreimer＠svn.reactos.org 25 Oct '08

25 Oct '08

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

1 0

[dreimer] 36967: Removed the disabling feature which caused more problems than help. Hope we are friends again guys.
by dreimer＠svn.reactos.org 25 Oct '08

25 Oct '08

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

1 0

[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 25 Oct '08

25 Oct '08

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.

1 0

[mjmartin] 36965: - Correct fix for handling WM_MOUSEACTIVATE and Bug #3111. If no parent, use MsgWindow->hSelf as wParam.
by mjmartin＠svn.reactos.org 25 Oct '08

25 Oct '08

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) );

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs