Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jimtabor] 41753: - More Window Threads issues. Need to finish the window object rewrite!
by jimtabor＠svn.reactos.org 03 Jul '09

03 Jul '09

Author: jimtabor Date: Fri Jul 3 12:03:56 2009 New Revision: 41753 URL: http://svn.reactos.org/svn/reactos?rev=41753&view=rev Log: - More Window Threads issues. Need to finish the window object rewrite! Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/vis.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/vis.c [iso-8859-1] Fri Jul 3 12:03:56 2009 @@ -43,7 +43,7 @@ Wnd = Window->Wnd; - if (!(Wnd->Style & WS_VISIBLE)) + if (!Wnd || !(Wnd->Style & WS_VISIBLE)) { return NULL; } Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Fri Jul 3 12:03:56 2009 @@ -759,6 +759,9 @@ WinPosFixupFlags(WINDOWPOS *WinPos, PWINDOW_OBJECT Window) { PWINDOW Wnd = Window->Wnd; + + if (!Wnd) return FALSE; + if (Wnd->Style & WS_VISIBLE) { WinPos->flags &= ~SWP_SHOWWINDOW;

1 0

[cgutman] 41752: - TCPIP lock rewrite (part 3 of 3) - Use a spin lock to protect the signalled connections list - Add a debug ASSERT into each function that depends on the TCPLock being held - Release TCPLock before completing the IRP - Add some locking where it was forgotten - Optimize HandleSignalledConnection
by cgutman＠svn.reactos.org 03 Jul '09

03 Jul '09

Author: cgutman Date: Fri Jul 3 10:28:59 2009 New Revision: 41752 URL: http://svn.reactos.org/svn/reactos?rev=41752&view=rev Log: - TCPIP lock rewrite (part 3 of 3) - Use a spin lock to protect the signalled connections list - Add a debug ASSERT into each function that depends on the TCPLock being held - Release TCPLock before completing the IRP - Add some locking where it was forgotten - Optimize HandleSignalledConnection Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] Fri Jul 3 10:28:59 2009 @@ -84,7 +84,8 @@ #define SRF_FIN TCP_FIN extern LONG TCP_IPIdentification; -extern LIST_ENTRY SignalledConnections; +extern LIST_ENTRY SignalledConnectionsList; +extern KSPIN_LOCK SignalledConnectionsLock; extern LIST_ENTRY SleepingThreadsList; extern FAST_MUTEX SleepingThreadsLock; extern RECURSIVE_MUTEX TCPLock; Modified: trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/recm… ============================================================================== --- trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/recmutex/recmutex.h [iso-8859-1] Fri Jul 3 10:28:59 2009 @@ -24,4 +24,6 @@ extern SIZE_T RecursiveMutexEnter( PRECURSIVE_MUTEX RecMutex, BOOLEAN ToRead ); extern VOID RecursiveMutexLeave( PRECURSIVE_MUTEX RecMutex ); +#define ASSERT_LOCKED(x) ASSERT((x)->Locked) + #endif/*_ROSRTL_RECMUTEX_H*/ Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Jul 3 10:28:59 2009 @@ -106,6 +106,7 @@ PDISCONNECT_TYPE DisType = (PDISCONNECT_TYPE)Data; TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect\n")); + TcpipRecursiveMutexEnter(&TCPLock, TRUE); TCPDisconnect ( DisType->Context, DisType->Type, @@ -113,6 +114,7 @@ NULL, DispDataRequestComplete, DisType->Irp ); + TcpipRecursiveMutexLeave(&TCPLock); TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n")); DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0); @@ -405,12 +407,12 @@ Irp ); done: + TcpipRecursiveMutexLeave( &TCPLock ); + if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, 0); } else IoMarkIrpPending(Irp); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("TCP Connect returned %08x\n", Status)); @@ -513,12 +515,12 @@ Irp ); done: + TcpipRecursiveMutexLeave( &TCPLock ); + if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, 0); } else IoMarkIrpPending(Irp); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MAX_TRACE, ("TCP Disconnect returned %08x\n", Status)); @@ -618,12 +620,12 @@ } done: + TcpipRecursiveMutexLeave( &TCPLock ); + if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, 0); } else IoMarkIrpPending(Irp); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(MID_TRACE,("Leaving %x\n", Status)); @@ -834,12 +836,12 @@ } done: + TcpipRecursiveMutexLeave( &TCPLock ); + if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, BytesReceived); } else IoMarkIrpPending(Irp); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); @@ -912,12 +914,12 @@ } done: + TcpipRecursiveMutexLeave( &TCPLock ); + if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, BytesReceived); } else IoMarkIrpPending(Irp); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); @@ -988,12 +990,12 @@ } done: + TcpipRecursiveMutexLeave( &TCPLock ); + if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, BytesSent); } else IoMarkIrpPending(Irp); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status)); @@ -1070,12 +1072,12 @@ } done: + TcpipRecursiveMutexLeave( &TCPLock ); + if (Status != STATUS_PENDING) { DispDataRequestComplete(Irp, Status, Irp->IoStatus.Information); } else IoMarkIrpPending(Irp); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_IRP, ("Leaving.\n")); Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Fri Jul 3 10:28:59 2009 @@ -363,7 +363,9 @@ case IPPROTO_TCP: TCPFreePort( AddrFile->Port ); if( AddrFile->Listener ) { + TcpipRecursiveMutexEnter(&TCPLock, TRUE); TCPClose( AddrFile->Listener ); + TcpipRecursiveMutexLeave(&TCPLock); exFreePool( AddrFile->Listener ); } break; @@ -425,7 +427,9 @@ if( !Connection ) return STATUS_NO_MEMORY; + TcpipRecursiveMutexEnter(&TCPLock, TRUE); Status = TCPSocket( Connection, AF_INET, SOCK_STREAM, IPPROTO_TCP ); + TcpipRecursiveMutexLeave(&TCPLock); if( !NT_SUCCESS(Status) ) { TCPFreeConnectionEndpoint( Connection ); 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] Fri Jul 3 10:28:59 2009 @@ -18,6 +18,8 @@ OSK_UINT OutAddrLen; PTA_IP_ADDRESS RequestAddressReturn; PTDI_CONNECTION_INFORMATION WhoIsConnecting; + + ASSERT_LOCKED(&TCPLock); /* Unpack TDI info -- We need the return connection information * struct to return the address so it can be filtered if needed Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Fri Jul 3 10:28:59 2009 @@ -16,6 +16,8 @@ OSK_UINT NewState ) { PCONNECTION_ENDPOINT Connection = WhichConnection; + ASSERT_LOCKED(&TCPLock); + TI_DbgPrint(MID_TRACE,("Flags: %c%c%c%c\n", NewState & SEL_CONNECT ? 'C' : 'c', NewState & SEL_READ ? 'R' : 'r', @@ -42,7 +44,7 @@ Connection->SignalState |= NewState; if( !Connection->Signalled ) { Connection->Signalled = TRUE; - InsertTailList( &SignalledConnections, &Connection->SignalList ); + ExInterlockedInsertTailList( &SignalledConnectionsList, &Connection->SignalList, &SignalledConnectionsLock ); } return 0; @@ -52,6 +54,8 @@ PNDIS_PACKET NdisPacket, NDIS_STATUS NdisStatus ) { TI_DbgPrint(DEBUG_TCP,("called %x\n", NdisPacket)); + ASSERT_LOCKED(&TCPLock); + FreeNdisPacket(NdisPacket); TI_DbgPrint(DEBUG_TCP,("done\n")); } @@ -64,6 +68,8 @@ IP_PACKET Packet = { 0 }; IP_ADDRESS RemoteAddress, LocalAddress; PIPv4_HEADER Header; + + ASSERT_LOCKED(&TCPLock); if( *data == 0x45 ) { /* IPv4 */ Header = (PIPv4_HEADER)data; @@ -114,6 +120,8 @@ PSLEEPING_THREAD SleepingThread; LARGE_INTEGER Timeout; + ASSERT_LOCKED(&TCPLock); + TI_DbgPrint(DEBUG_TCP, ("Called TSLEEP: tok = %x, pri = %d, wmesg = %s, tmio = %x\n", token, priority, msg, tmio)); @@ -158,6 +166,8 @@ void TCPWakeup( void *ClientData, void *token ) { PLIST_ENTRY Entry; PSLEEPING_THREAD SleepingThread; + + ASSERT_LOCKED(&TCPLock); TcpipAcquireFastMutex( &SleepingThreadsLock ); Entry = SleepingThreadsList.Flink; @@ -222,6 +232,8 @@ OSK_UINT Bytes, OSK_PCHAR File, OSK_UINT Line ) { void *v; ULONG Signature; + + ASSERT_LOCKED(&TCPLock); #if 0 != MEM_PROFILE static OSK_UINT *Sizes = NULL, *Counts = NULL, ArrayAllocated = 0; @@ -298,6 +310,8 @@ void *data, OSK_PCHAR File, OSK_UINT Line ) { ULONG Signature; + ASSERT_LOCKED(&TCPLock); + UntrackFL( (PCHAR)File, Line, data, FOURCC('f','b','s','d') ); data = (void *)((char *) data - sizeof(ULONG)); Signature = *((ULONG *) data); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Fri Jul 3 10:28:59 2009 @@ -34,6 +34,8 @@ NTSTATUS Status; POSK_IFADDR ifaddr = IF->TCPContext; ASSERT(ifaddr); + + ASSERT_LOCKED(&TCPLock); RtlZeroMemory(ifaddr, sizeof(OSK_IFADDR) + 2 * sizeof( struct sockaddr_in )); @@ -77,6 +79,8 @@ struct sockaddr_in *addr_in = (struct sockaddr_in *)ReqAddr; POSK_IFADDR InterfaceData; + ASSERT_LOCKED(&TCPLock); + TI_DbgPrint(DEBUG_TCPIF,("called for type %d\n", FindType)); if( !ReqAddr ) { 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] Fri Jul 3 10:28:59 2009 @@ -15,14 +15,14 @@ LONG TCP_IPIdentification = 0; static BOOLEAN TCPInitialized = FALSE; static NPAGED_LOOKASIDE_LIST TCPSegmentList; -LIST_ENTRY SignalledConnections; +LIST_ENTRY SignalledConnectionsList; +KSPIN_LOCK SignalledConnectionsLock; LIST_ENTRY SleepingThreadsList; FAST_MUTEX SleepingThreadsLock; RECURSIVE_MUTEX TCPLock; PORT_SET TCPPorts; -static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection, - ULONG NewState ) { +static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection ) { NTSTATUS Status = STATUS_SUCCESS; PTCP_COMPLETION_ROUTINE Complete; PTDI_BUCKET Bucket; @@ -30,11 +30,79 @@ PIRP Irp; PMDL Mdl; + ASSERT_LOCKED(&TCPLock); + TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n", Connection, Connection->SocketContext)); + if( Connection->SignalState & SEL_FIN ) { + TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); + + while ((Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest, + &Connection->Lock )) != NULL) + { + DISCONNECT_TYPE DisType; + PIO_STACK_LOCATION IrpSp; + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); + + /* We have to notify oskittcp of the abortion */ + DisType.Type = TDI_DISCONNECT_RELEASE | TDI_DISCONNECT_ABORT; + DisType.Context = Connection; + DisType.Irp = (PIRP)Bucket->Request.RequestContext; + DisType.FileObject = IrpSp->FileObject; + + ChewCreate(NULL, sizeof(DISCONNECT_TYPE), + DispDoDisconnect, &DisType); + } + + while ((Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest, + &Connection->Lock )) != NULL) + { + DISCONNECT_TYPE DisType; + PIO_STACK_LOCATION IrpSp; + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); + + /* We have to notify oskittcp of the abortion */ + DisType.Type = TDI_DISCONNECT_RELEASE; + DisType.Context = Connection; + DisType.Irp = (PIRP)Bucket->Request.RequestContext; + DisType.FileObject = IrpSp->FileObject; + + ChewCreate(NULL, sizeof(DISCONNECT_TYPE), + DispDoDisconnect, &DisType); + } + + while ((Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest, + &Connection->Lock )) != NULL) + { + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + /* We have to notify oskittcp of the abortion */ + TCPAbortListenForSocket(Connection->AddressFile->Listener, + Connection); + + Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + } + + while ((Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest, + &Connection->Lock )) != NULL) + { + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + Complete = Bucket->Request.RequestNotifyObject; + + Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); + } + + Connection->SignalState = 0; + } + /* Things that can happen when we try the initial connection */ - if( NewState & SEL_CONNECT ) { + if( Connection->SignalState & SEL_CONNECT ) { while( (Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest, &Connection->Lock )) != NULL ) { @@ -45,20 +113,14 @@ TI_DbgPrint(DEBUG_TCP, ("Completing Request %x\n", Bucket->Request.RequestContext)); - if( (NewState & (SEL_CONNECT | SEL_FIN)) == - (SEL_CONNECT | SEL_FIN) ) - Status = STATUS_CONNECTION_REFUSED; - else - Status = STATUS_SUCCESS; - - Complete( Bucket->Request.RequestContext, Status, 0 ); + Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, 0 ); /* Frees the bucket allocated in TCPConnect */ exFreePool( Bucket ); } } - if( NewState & SEL_ACCEPT ) { + if( Connection->SignalState & SEL_ACCEPT ) { /* Handle readable on a listening socket -- * TODO: Implement filtering */ @@ -97,7 +159,7 @@ } /* Things that happen after we're connected */ - if( NewState & SEL_READ ) { + if( Connection->SignalState & SEL_READ ) { TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n", IsListEmpty(&Connection->ReceiveRequest) ? "empty" : "nonempty")); @@ -157,7 +219,7 @@ } } } - if( NewState & SEL_WRITE ) { + if( Connection->SignalState & SEL_WRITE ) { TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n", IsListEmpty(&Connection->SendRequest) ? "empty" : "nonempty")); @@ -217,70 +279,7 @@ } } - if( NewState & SEL_FIN ) { - TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n")); - - while ((Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest, - &Connection->Lock )) != NULL) - { - DISCONNECT_TYPE DisType; - PIO_STACK_LOCATION IrpSp; - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); - - /* We have to notify oskittcp of the abortion */ - DisType.Type = TDI_DISCONNECT_RELEASE | TDI_DISCONNECT_ABORT; - DisType.Context = Connection; - DisType.Irp = (PIRP)Bucket->Request.RequestContext; - DisType.FileObject = IrpSp->FileObject; - - ChewCreate(NULL, sizeof(DISCONNECT_TYPE), - DispDoDisconnect, &DisType); - } - - while ((Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest, - &Connection->Lock )) != NULL) - { - DISCONNECT_TYPE DisType; - PIO_STACK_LOCATION IrpSp; - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - IrpSp = IoGetCurrentIrpStackLocation((PIRP)Bucket->Request.RequestContext); - - /* We have to notify oskittcp of the abortion */ - DisType.Type = TDI_DISCONNECT_RELEASE; - DisType.Context = Connection; - DisType.Irp = (PIRP)Bucket->Request.RequestContext; - DisType.FileObject = IrpSp->FileObject; - - ChewCreate(NULL, sizeof(DISCONNECT_TYPE), - DispDoDisconnect, &DisType); - } - - while ((Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest, - &Connection->Lock )) != NULL) - { - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - /* We have to notify oskittcp of the abortion */ - TCPAbortListenForSocket(Connection->AddressFile->Listener, - Connection); - - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); - } - - while ((Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest, - &Connection->Lock )) != NULL) - { - Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); - Complete = Bucket->Request.RequestNotifyObject; - - Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 ); - } - } - + Connection->SignalState = 0; Connection->Signalled = FALSE; } @@ -288,11 +287,11 @@ PCONNECTION_ENDPOINT Connection; PLIST_ENTRY ListEntry; - while( !IsListEmpty( &SignalledConnections ) ) { - ListEntry = RemoveHeadList( &SignalledConnections ); + while( (ListEntry = ExInterlockedRemoveHeadList(&SignalledConnectionsList, + &SignalledConnectionsLock)) != NULL) { Connection = CONTAINING_RECORD( ListEntry, CONNECTION_ENDPOINT, SignalList ); - HandleSignalledConnection( Connection, Connection->SignalState ); + HandleSignalledConnection( Connection ); } } @@ -327,6 +326,8 @@ NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection, UINT Family, UINT Type, UINT Proto ) { NTSTATUS Status; + + ASSERT_LOCKED(&TCPLock); TI_DbgPrint(DEBUG_TCP,("Called: Connection %x, Family %d, Type %d, " "Proto %d\n", @@ -480,8 +481,9 @@ TcpipRecursiveMutexInit( &TCPLock ); ExInitializeFastMutex( &SleepingThreadsLock ); + KeInitializeSpinLock( &SignalledConnectionsLock ); InitializeListHead( &SleepingThreadsList ); - InitializeListHead( &SignalledConnections ); + InitializeListHead( &SignalledConnectionsList ); Status = TCPMemStartup(); if ( ! NT_SUCCESS(Status) ) { return Status; @@ -493,8 +495,10 @@ return Status; } + TcpipRecursiveMutexEnter(&TCPLock, TRUE); RegisterOskitTCPEventHandlers( &EventHandlers ); InitOskitTCP(); + TcpipRecursiveMutexLeave(&TCPLock); /* Register this protocol with IP layer */ IPRegisterProtocol(IPPROTO_TCP, TCPReceive); @@ -581,6 +585,8 @@ TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n")); + ASSERT_LOCKED(&TCPLock); + Status = AddrBuildAddress ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress, &RemoteAddress, @@ -655,6 +661,8 @@ PVOID Context ) { NTSTATUS Status; + ASSERT_LOCKED(&TCPLock); + TI_DbgPrint(DEBUG_TCP,("started\n")); switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) { @@ -685,6 +693,8 @@ NTSTATUS Status; TI_DbgPrint(DEBUG_TCP,("TCPClose started\n")); + + ASSERT_LOCKED(&TCPLock); /* Make our code remove all pending IRPs */ Connection->State |= SEL_FIN; @@ -713,6 +723,8 @@ TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n", ReceiveLength, Connection->SocketContext)); + ASSERT_LOCKED(&TCPLock); + ASSERT_KM_POINTER(Connection->SocketContext); /* Closing */ @@ -775,6 +787,8 @@ NTSTATUS Status; PTDI_BUCKET Bucket; + ASSERT_LOCKED(&TCPLock); + TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n", SendLength, Connection->SocketContext)); @@ -851,6 +865,8 @@ OSK_UINT LocalAddress, RemoteAddress; OSK_UI16 LocalPort, RemotePort; PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address; + + ASSERT_LOCKED(&TCPLock); OskitTCPGetAddress ( Connection->SocketContext,

1 0

[cgutman] 41751: - TCPIP locking rewrite (part 2 of x) - Add locking in places that need it - Eliminate double acquisition of TCPLock for the same request - Next step: Verify that all places that need locking have it
by cgutman＠svn.reactos.org 03 Jul '09

03 Jul '09

Author: cgutman Date: Fri Jul 3 04:57:47 2009 New Revision: 41751 URL: http://svn.reactos.org/svn/reactos?rev=41751&view=rev Log: - TCPIP locking rewrite (part 2 of x) - Add locking in places that need it - Eliminate double acquisition of TCPLock for the same request - Next step: Verify that all places that need locking have it Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Fri Jul 3 04:57:47 2009 @@ -646,15 +646,19 @@ PTDI_REQUEST_KERNEL_QUERY_INFORMATION Parameters; PTRANSPORT_CONTEXT TranContext; PIO_STACK_LOCATION IrpSp; + NTSTATUS Status; TI_DbgPrint(DEBUG_IRP, ("Called.\n")); IrpSp = IoGetCurrentIrpStackLocation(Irp); Parameters = (PTDI_REQUEST_KERNEL_QUERY_INFORMATION)&IrpSp->Parameters; + + TcpipRecursiveMutexEnter( &TCPLock, TRUE ); TranContext = IrpSp->FileObject->FsContext; if (!TranContext) { TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_INVALID_PARAMETER; } @@ -672,6 +676,7 @@ (FIELD_OFFSET(TDI_ADDRESS_INFO, Address.Address[0].Address) + sizeof(TDI_ADDRESS_IP))) { TI_DbgPrint(MID_TRACE, ("MDL buffer too small.\n")); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_BUFFER_TOO_SMALL; } @@ -690,6 +695,7 @@ RtlZeroMemory( &Address->Address[0].Address[0].sin_zero, sizeof(Address->Address[0].Address[0].sin_zero)); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_SUCCESS; case TDI_CONNECTION_FILE: @@ -700,18 +706,22 @@ RtlZeroMemory( &Address->Address[0].Address[0].sin_zero, sizeof(Address->Address[0].Address[0].sin_zero)); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_SUCCESS; default: TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_INVALID_PARAMETER; } if (!AddrFile) { TI_DbgPrint(MID_TRACE, ("No address file object.\n")); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_INVALID_PARAMETER; } + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_SUCCESS; } @@ -725,6 +735,7 @@ (FIELD_OFFSET(TDI_CONNECTION_INFORMATION, RemoteAddress) + sizeof(PVOID))) { TI_DbgPrint(MID_TRACE, ("MDL buffer too small (ptr).\n")); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_BUFFER_TOO_SMALL; } @@ -743,18 +754,24 @@ default: TI_DbgPrint(MIN_TRACE, ("Invalid transport context\n")); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_INVALID_PARAMETER; } if (!Endpoint) { TI_DbgPrint(MID_TRACE, ("No connection object.\n")); + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_INVALID_PARAMETER; } - return TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE ); + Status = TCPGetSockAddress( Endpoint, AddressInfo->RemoteAddress, TRUE ); + + TcpipRecursiveMutexLeave(&TCPLock); + return Status; } } + TcpipRecursiveMutexLeave(&TCPLock); return STATUS_NOT_IMPLEMENTED; } 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] Fri Jul 3 04:57:47 2009 @@ -142,6 +142,8 @@ Status = TCPServiceListeningSocket( Listener, Connection, (PTDI_REQUEST_KERNEL)Request ); + TcpipRecursiveMutexLeave( &TCPLock ); + if( Status == STATUS_PENDING ) { Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); @@ -155,8 +157,6 @@ Status = STATUS_NO_MEMORY; } - TcpipRecursiveMutexLeave( &TCPLock ); - TI_DbgPrint(DEBUG_TCP,("TCPAccept finished %x\n", Status)); return Status; } 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] Fri Jul 3 04:57:47 2009 @@ -332,7 +332,6 @@ "Proto %d\n", Connection, Family, Type, Proto)); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); Status = TCPTranslateError( OskitTCPSocket( Connection, &Connection->SocketContext, Family, @@ -343,8 +342,6 @@ TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n", Connection->SocketContext)); - - TcpipRecursiveMutexLeave( &TCPLock ); return Status; } @@ -599,11 +596,8 @@ return STATUS_NETWORK_UNREACHABLE; } - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - if (Connection->State & SEL_FIN) { - TcpipRecursiveMutexLeave( &TCPLock ); return STATUS_REMOTE_DISCONNECT; } @@ -649,8 +643,6 @@ } } - TcpipRecursiveMutexLeave( &TCPLock ); - return Status; } @@ -665,8 +657,6 @@ TI_DbgPrint(DEBUG_TCP,("started\n")); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) { case 0: case TDI_DISCONNECT_ABORT: @@ -685,8 +675,6 @@ Status = TCPTranslateError ( OskitTCPShutdown( Connection->SocketContext, Flags ) ); - TcpipRecursiveMutexLeave( &TCPLock ); - TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status)); return Status; @@ -698,15 +686,11 @@ TI_DbgPrint(DEBUG_TCP,("TCPClose started\n")); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - /* Make our code remove all pending IRPs */ Connection->State |= SEL_FIN; DrainSignals(); Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) ); - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status)); @@ -731,12 +715,9 @@ ASSERT_KM_POINTER(Connection->SocketContext); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - /* Closing */ if (Connection->State & SEL_FIN) { - TcpipRecursiveMutexLeave( &TCPLock ); *BytesReceived = 0; return STATUS_REMOTE_DISCONNECT; } @@ -761,7 +742,6 @@ Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); if( !Bucket ) { TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); - TcpipRecursiveMutexLeave( &TCPLock ); return STATUS_NO_MEMORY; } @@ -777,8 +757,6 @@ TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received)); *BytesReceived = Received; } - - TcpipRecursiveMutexLeave( &TCPLock ); TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); @@ -802,8 +780,6 @@ ASSERT_KM_POINTER(Connection->SocketContext); - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - TI_DbgPrint(DEBUG_TCP,("Connection = %x\n", Connection)); TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n", Connection->SocketContext)); @@ -811,7 +787,6 @@ /* Closing */ if (Connection->State & SEL_FIN) { - TcpipRecursiveMutexLeave( &TCPLock ); *BytesSent = 0; return STATUS_REMOTE_DISCONNECT; } @@ -829,7 +804,6 @@ Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) ); if( !Bucket ) { TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n")); - TcpipRecursiveMutexLeave( &TCPLock ); return STATUS_NO_MEMORY; } @@ -846,8 +820,6 @@ *BytesSent = Sent; } - TcpipRecursiveMutexLeave( &TCPLock ); - TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); return Status; @@ -880,8 +852,6 @@ OSK_UI16 LocalPort, RemotePort; PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address; - TcpipRecursiveMutexEnter( &TCPLock, TRUE ); - OskitTCPGetAddress ( Connection->SocketContext, &LocalAddress, &LocalPort, @@ -892,8 +862,6 @@ AddressIP->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; AddressIP->Address[0].Address[0].sin_port = GetRemote ? RemotePort : LocalPort; AddressIP->Address[0].Address[0].in_addr = GetRemote ? RemoteAddress : LocalAddress; - - TcpipRecursiveMutexLeave( &TCPLock ); return STATUS_SUCCESS; }

1 0

[dgorbachev] 41750: Color schemes by Peter Dimitriu. Bug #4654.
by dgorbachev＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: dgorbachev Date: Fri Jul 3 02:41:39 2009 New Revision: 41750 URL: http://svn.reactos.org/svn/reactos?rev=41750&view=rev Log: Color schemes by Peter Dimitriu. Bug #4654. Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf trunk/reactos/boot/bootdata/hivedef_i386.inf [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/hivedef_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_arm.… Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386…

1 0

[mkupfer] 41749: IntIsMenu() removed - use UserGetMenuObject() instead
by mkupfer＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: mkupfer Date: Fri Jul 3 02:28:58 2009 New Revision: 41749 URL: http://svn.reactos.org/svn/reactos?rev=41749&view=rev Log: IntIsMenu() removed - use UserGetMenuObject() instead Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h trunk/reactos/subsystems/win32/win32k/ntuser/menu.c Modified: trunk/reactos/subsystems/win32/win32k/include/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/menu.h [iso-8859-1] Fri Jul 3 02:28:58 2009 @@ -78,9 +78,6 @@ IntGetMenuInfo(PMENU_OBJECT MenuObject, PROSMENUINFO lpmi); BOOL FASTCALL -IntIsMenu(HMENU hMenu); - -BOOL FASTCALL IntSetMenuInfo(PMENU_OBJECT MenuObject, PROSMENUINFO lpmi); int FASTCALL Modified: trunk/reactos/subsystems/win32/win32k/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/menu.c [iso-8859-1] Fri Jul 3 02:28:58 2009 @@ -501,20 +501,6 @@ } return TRUE; } - - -BOOL FASTCALL -IntIsMenu(HMENU hMenu) -{ - PMENU_OBJECT Menu; - - if((Menu = UserGetMenuObject(hMenu))) - { - return TRUE; - } - return FALSE; -} - BOOL FASTCALL IntSetMenuInfo(PMENU_OBJECT Menu, PROSMENUINFO lpmi)

1 0

[cfinck] 41748: Merge the OpenTTD update from 0.3.10 branch
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Fri Jul 3 01:18:18 2009 New Revision: 41748 URL: http://svn.reactos.org/svn/reactos?rev=41748&view=rev Log: Merge the OpenTTD update from 0.3.10 branch Modified: trunk/reactos/base/applications/downloader/downloader.xml Modified: trunk/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/download… ============================================================================== --- trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ trunk/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Fri Jul 3 01:18:18 2009 @@ -242,10 +242,10 @@ <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> </application> <application name="OpenTTD"> - <regname>OpenTTD 0.6.0</regname> - <version>0.6.0</version> - <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe</location> + <regname>OpenTTD 0.7.1</regname> + <version>0.7.1</version> + <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You either need a copy of Transport Tycoon or have to manually download and set up the OpenGFX files.</description> + <location>http://binaries.openttd.org/releases/0.7.1/openttd-0.7.1-windows-win32.exe</location> </application> <application name="LBreakout2"> <regname>LBreakout2 2.4.1</regname>

1 0

[cfinck] 41747: Fix OpenTTD link
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Fri Jul 3 01:14:22 2009 New Revision: 41747 URL: http://svn.reactos.org/svn/reactos?rev=41747&view=rev Log: Fix OpenTTD link Modified: branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Fri Jul 3 01:14:22 2009 @@ -163,7 +163,7 @@ <regname>OpenTTD 0.7.1</regname> <version>0.7.1</version> <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You either need a copy of Transport Tycoon or have to manually download and set up the OpenGFX files.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe</location> + <location>http://binaries.openttd.org/releases/0.7.1/openttd-0.7.1-windows-win32.exe</location> </application> <application name="LBreakout2"> <regname>LBreakout2 2.4.1</regname>

1 0

[dreimer] 41746: Fix a Bug in ssvn.cmd. thx to Shashkov Maxim aka bz00mmer for noticing.
by dreimer＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: dreimer Date: Fri Jul 3 01:02:51 2009 New Revision: 41746 URL: http://svn.reactos.org/svn/reactos?rev=41746&view=rev Log: Fix a Bug in ssvn.cmd. thx to Shashkov Maxim aka bz00mmer for noticing. Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd 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] Fri Jul 3 01:02:51 2009 @@ -94,7 +94,7 @@ ) echo Do you want to see the changelog? set /p CL="Please enter 'yes' or 'no': " - if /i "!UP!"=="yes" ( + if /i "!CL!"=="yes" ( call :WHILE ) )

1 0

[cfinck] 41745: - Remove non-working apps according to http://www.reactos.org/wiki/index.php/Tests_for_0.3.10 - Update OpenTTD to 0.7.1 and add more descriptions, it can actually be used without the original game.
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Fri Jul 3 00:09:28 2009 New Revision: 41745 URL: http://svn.reactos.org/svn/reactos?rev=41745&view=rev Log: - Remove non-working apps according to http://www.reactos.org/wiki/index.php/Tests_for_0.3.10 - Update OpenTTD to 0.7.1 and add more descriptions, it can actually be used without the original game. Modified: branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml Modified: branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/… ============================================================================== --- branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original) +++ branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Fri Jul 3 00:09:28 2009 @@ -14,13 +14,6 @@ <description>The most popular and one of the best free Web Browsers out there.</description> <location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/win32/e…</location> </application> - <application name="Opera"> - <regname>Opera</regname> - <licence>Freeware</licence> - <version>9.63</version> - <description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description> - <location>http://ftp.opera.com/pub/opera/win/963/en/Opera_963_classic_Setup.exe</location> - </application> <application name="Abyss Web server X1 2.6"> <regname>AbyssX1 2.6</regname> <licence>Freeware</licence> @@ -53,16 +46,6 @@ <description>The most popular client for the Internet Relay Chat (IRC)</description> <location>http://mirc.bigchief.dk/mirc635.exe</location> </application> - <application name="Samba TNG"> - <description>This tool allows you to access your Windows shared folders/printers with ReactOS.</description> - <location>http://svn.reactos.org/packages/samba-tng.exe</location> - </application> - <application name="Miranda IM"> - <regname>Miranda IM</regname> - <version>0.7.4</version> - <description>Open source multiprotocol instant messaging application - May not work completely.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/miranda/miranda-im-v0.7.4-unicode…</location> - </application> <application name="Putty"> <regname>PuTTY version 0.60</regname> <licence>MIT</licence> @@ -92,18 +75,6 @@ <description>A light viewer which lets you open, view, and print documents created with Microsoft Word 6.0 to 2007, TextMaker as well as OpenDocument and other common office file formats.</description> <location>http://www.softmaker.net/down/TMViewerSetup.exe</location> </application> - <application name="OpenOffice 2.4"> - <regname>OpenOffice.org 2.4.2</regname> - <version>2.4.2</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.plusline.de/OpenOffice/stable/2.4.2/OOo_2.4.2_Win32Intel_install…</location> - </application> - <application name="OpenOffice 3.0"> - <regname>OpenOffice.org 3.0.1</regname> - <version>3.0.1</version> - <description>THE Open Source Office Suite.</description> - <location>http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.0.1/OOo_3.0.1_Win32Intel_…</location> - </application> </category> <category name="Graphics" icon="3"> <application name="IrfanView"> @@ -112,11 +83,6 @@ <description>Viewer for all kinds of graphics/audio files/video files.</description> <location>http://irfanview.tuwien.ac.at/iview423_setup.exe</location> </application> - <application name="IrfanView Plugins"> - <version>4.22</version> - <description>Additional Plugins for supporting more file types.</description> - <location>http://irfanview.tuwien.ac.at/plugins/irfanview_plugins_422_setup.exe</location> - </application> <application name="TuxPaint"> <regname>Tux Paint 0.9.19</regname> <version>0.9.19</version> @@ -131,18 +97,6 @@ </application> </category> <category name="Libraries" icon="4"> - <application name="Microsoft XML 3"> - <regname>msxml3</regname> - <version>3.0</version> - <description>MSXML3 is needed for some MSI Installers.</description> - <location>http://download.microsoft.com/download/8/8/8/888f34b7-4f54-4f06-8dac-fa29b1…</location> - </application> - <application name="OLE Viewer and Microsoft Foundation Classes version 4"> - <regname>mfc40</regname> - <version>4.0</version> - <description>MFC 4 is needed by some applications</description> - <location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location> - </application> <application name="Visual Basic 5 Runtime"> <regname>vb5run</regname> <version>5.0</version> @@ -155,38 +109,8 @@ <description>Visual Basic 6 Runtime</description> <location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru…</location> </application> - <application name="Visual Studio 6 Runtime"> - <regname>vc6run</regname> - <version>6.0</version> - <description>Visual Studio 6 Runtime</description> - <location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red…</location> - </application> - <application name="Visual Studio 2005 Runtime"> - <regname>vc2005run</regname> - <version>7.0</version> - <description>Visual Studio 2005 Runtime</description> - <location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486…</location> - </application> - <application name="Visual Studio 2005 Runtime SP1"> - <regname>vc2005sp1run</regname> - <version>7.1</version> - <description>Visual Studio 2005 Runtime SP1</description> - <location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906…</location> - </application> - <application name="Visual Studio 2008 Runtime"> - <regname>vc2008run</regname> - <version>8.0</version> - <description>Visual Studio 2008 Runtime</description> - <location>http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5…</location> - </application> </category> <category name="Multimedia" icon="4"> - <application name="SMPlayer 0.6.7"> - <regname>smplayer</regname> - <version>0.6.7</version> - <description>SMPlayer</description> - <location>http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe</location> - </application> <application name="VLC Media Player 0.8.0"> <regname>vlc0.8.0</regname> <licence>GPL</licence> @@ -196,12 +120,6 @@ </application> </category> <category name="Development" icon="5"> - <application name="ReactOS Build Environment"> - <regname>ReactOS Build Environment 1.4.4</regname> - <version>1.4.4</version> - <description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description> - <location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.4.exe</location> - </application> <application name="MinGW"> <regname>MinGW 5.1.3</regname> <version>5.1.3</version> @@ -242,9 +160,9 @@ <location>http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-…</location> </application> <application name="OpenTTD"> - <regname>OpenTTD 0.6.0</regname> - <version>0.6.0</version> - <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You need a copy of Transport Tycoon.</description> + <regname>OpenTTD 0.7.1</regname> + <version>0.7.1</version> + <description>Open Source clone of the "Transport Tycoon Deluxe" game engine. You either need a copy of Transport Tycoon or have to manually download and set up the OpenGFX files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/openttd/openttd-0.6.0-win32.exe</location> </application> <application name="LBreakout2"> @@ -273,12 +191,6 @@ <location>http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe</location> </application> </category> - <category name="Science" icon="11"> - </category> - <category name="Edutainment" icon="12"> - </category> - <category name="Engineering" icon="13"> - </category> <category name="Tools" icon="7"> <application name="7-Zip"> <regname>7-Zip 4.57</regname> @@ -286,18 +198,6 @@ <description>Utility to create and open 7zip, zip, tar, rar and other archive files.</description> <location>http://ovh.dl.sourceforge.net/sourceforge/sevenzip/7z457.exe</location> </application> - <application name="uTorrent"> - <regname>µTorrent</regname> - <version>1.8</version> - <description>Small and fast BitTorrent Client</description> - <location>http://download.utorrent.com/1.8.2/utorrent-1.8.2.upx.exe</location> - </application> - <application name="Audio Grabber"> - <regname>Audiograbber 1.83 SE</regname> - <version>1.83 SE</version> - <description>A very good CD Ripper/Audio File Converter.</description> - <location>http://www.audiograbber.de/files/4898276276/agsetup183se.exe</location> - </application> </category> <category name="Drivers" icon="8"> <application name="AC97 Driver for VirtualBox">

1 0

[cfinck] 442: Increase the memory limit a bit, so that we don't fail for the comprehensive user32:msg debug information.
by cfinck＠svn.reactos.org 02 Jul '09

02 Jul '09

Author: cfinck Date: Thu Jul 2 23:27:29 2009 New Revision: 442 URL: http://svn.reactos.org/svn/reactos?rev=442&view=rev Log: Increase the memory limit a bit, so that we don't fail for the comprehensive user32:msg debug information. Modified: branches/danny-web/www/www.reactos.org/testman/webservice/config.inc.php Modified: branches/danny-web/www/www.reactos.org/testman/webservice/config.inc.php URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/t… ============================================================================== --- branches/danny-web/www/www.reactos.org/testman/webservice/config.inc.php [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/testman/webservice/config.inc.php [iso-8859-1] Thu Jul 2 23:27:29 2009 @@ -13,5 +13,5 @@ // aggregator script // NOTE: The aggregator script allocates memory per test result, so this // has no effect on the total log size - define("MAX_MEMORY", 500000); + define("MAX_MEMORY", 700000); ?>

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