Ros-diffs

ros-diffs@reactos.org

81390 discussions

[arty] 35399: Merge aicom-network-fixes up to 35398
by arty＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: arty Date: Sat Aug 16 17:39:01 2008 New Revision: 35399 URL: http://svn.reactos.org/svn/reactos?rev=35399&view=rev Log: Merge aicom-network-fixes up to 35398 Modified: trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/tcpip/tcpip/irp.c Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -39,27 +39,30 @@ NTSTATUS STDCALL AfdSetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - NTSTATUS Status = STATUS_NO_MEMORY; + NTSTATUS Status = STATUS_BUFFER_TOO_SMALL; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + if( FCB->Context ) { + ExFreePool( FCB->Context ); + FCB->Context = NULL; + } + if( FCB->ContextSize < IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { - if( FCB->Context ) - ExFreePool( FCB->Context ); FCB->Context = ExAllocatePool ( PagedPool, IrpSp->Parameters.DeviceIoControl.InputBufferLength ); - } - if( FCB->Context ) { - Status = STATUS_SUCCESS; + if( !FCB->Context ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + RtlCopyMemory( FCB->Context, IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, IrpSp->Parameters.DeviceIoControl.InputBufferLength ); + Status = STATUS_SUCCESS; } AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -24,12 +24,9 @@ AFD_DbgPrint(MID_TRACE,("Called %x %x\n", InfoReq, InfoReq ? InfoReq->InformationClass : 0)); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + _SEH_TRY { - if( !SocketAcquireStateLock( FCB ) ) { - Status = LostSocket( Irp ); - _SEH_YIELD(return Status); - } - switch( InfoReq->InformationClass ) { case AFD_INFO_RECEIVE_WINDOW_SIZE: InfoReq->Information.Ulong = FCB->Recv.Size; @@ -113,7 +110,7 @@ TDI_QUERY_ADDRESS_INFO, Mdl ); } else { - if( !NT_SUCCESS + if( NT_SUCCESS ( Status = TdiBuildNullConnectionInfo ( &ConnInfo, FCB->LocalAddress->Address[0].AddressType ) ) ) { @@ -148,11 +145,11 @@ if( ConnInfo ) ExFreePool( ConnInfo ); if( SysMdl ) IoFreeMdl( SysMdl ); + if( TransAddr ) MmUnmapLockedPages( TransAddr, Mdl ); } + /* MmUnlockPages( Mdl ); */ } - - /* MmUnlockPages( Mdl ); */ - /* IoFreeMdl( Mdl ); */ + /* IoFreeMdl( Mdl ); */ } else { Status = STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -188,14 +188,17 @@ if( !NT_SUCCESS(Status) ) return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); - FCB->State = SOCKET_STATE_LISTENING; - TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionCallInfo, FCB->LocalAddress->Address[0].AddressType ); TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + + if( !FCB->ListenIrp.ConnectionReturnInfo || !FCB->ListenIrp.ConnectionCallInfo ) + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + + FCB->State = SOCKET_STATE_LISTENING; Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, @@ -272,6 +275,8 @@ ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + if( !FCB->ListenIrp.ConnectionReturnInfo ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, @@ -306,6 +311,8 @@ (PVOID *)&NewFileObject, NULL ); + if( !NT_SUCCESS(Status) ) UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + ASSERT(NewFileObject != FileObject); ASSERT(NewFileObject->FsContext != FCB); Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -167,7 +167,7 @@ NTSTATUS Status = STATUS_SUCCESS; PVOID CurrentThread = KeGetCurrentThread(); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); AFD_DbgPrint(MAX_TRACE,("Called on %x, attempting to lock\n", FCB)); @@ -218,7 +218,7 @@ PVOID CurrentThread = KeGetCurrentThread(); #endif ASSERT(FCB->LockCount > 0); - ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); ExAcquireFastMutex( &FCB->Mutex ); FCB->LockCount--; 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 Aug 16 17:39:01 2008 @@ -210,8 +210,12 @@ ExFreePool( FCB->LocalAddress ); if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - - ExFreePool(FCB->TdiDeviceName.Buffer); + if( FCB->ListenIrp.ConnectionReturnInfo ) + ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); + if( FCB->ListenIrp.ConnectionCallInfo ) + ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); + if( FCB->TdiDeviceName.Buffer ) + ExFreePool(FCB->TdiDeviceName.Buffer); ExFreePool(FCB); AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB)); Modified: trunk/reactos/drivers/network/tcpip/tcpip/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] Sat Aug 16 17:39:01 2008 @@ -27,14 +27,14 @@ UntrackFL( __FILE__, __LINE__, Irp ); #endif - (void)IoSetCancelRoutine( Irp, NULL ); + Irp->IoStatus.Status = Status; if( Status == STATUS_PENDING ) IoMarkIrpPending( Irp ); else { - Irp->IoStatus.Status = Status; Irql = KeGetCurrentIrql(); + (void)IoSetCancelRoutine( Irp, NULL ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); if (KeGetCurrentIrql() != Irql) { DbgPrint("WARNING: IO COMPLETION RETURNED AT WRONG IRQL:\n");

1 0

[cgutman] 35398: - Make sure we successfully allocated ConnectionReturnInfo and ConnectionCallInfo - Make sure ObReferenceObjectByHandle was successful
by cgutman＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: cgutman Date: Sat Aug 16 16:16:41 2008 New Revision: 35398 URL: http://svn.reactos.org/svn/reactos?rev=35398&view=rev Log: - Make sure we successfully allocated ConnectionReturnInfo and ConnectionCallInfo - Make sure ObReferenceObjectByHandle was successful Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 16 16:16:41 2008 @@ -188,14 +188,17 @@ if( !NT_SUCCESS(Status) ) return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); - FCB->State = SOCKET_STATE_LISTENING; - TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionCallInfo, FCB->LocalAddress->Address[0].AddressType ); TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + + if( !FCB->ListenIrp.ConnectionReturnInfo || !FCB->ListenIrp.ConnectionCallInfo ) + return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + + FCB->State = SOCKET_STATE_LISTENING; Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, @@ -271,6 +274,8 @@ ( &FCB->ListenIrp.ConnectionReturnInfo, FCB->LocalAddress->Address[0].AddressType ); + if( !FCB->ListenIrp.ConnectionReturnInfo ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, @@ -305,6 +310,8 @@ (PVOID *)&NewFileObject, NULL ); + if( !NT_SUCCESS(Status) ) UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + ASSERT(NewFileObject != FileObject); ASSERT(NewFileObject->FsContext != FCB);

1 0

[sginsberg] 35397: - Remove deprecated ExfpInterlockedExchange64
by sginsberg＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: sginsberg Date: Sat Aug 16 13:06:12 2008 New Revision: 35397 URL: http://svn.reactos.org/svn/reactos?rev=35397&view=rev Log: - Remove deprecated ExfpInterlockedExchange64 Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S trunk/reactos/ntoskrnl/include/internal/ex.h Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Sat Aug 16 13:06:12 2008 @@ -556,24 +556,5 @@ /* Return */ ret 8 - -/* Ugly hack: Use InterlockedExchange64 */ -.att_syntax -.global @ExfpInterlockedExchange64@8 -@ExfpInterlockedExchange64@8: - pushl %ebx - pushl %esi - movl %ecx,%esi - movl (%edx),%ebx - movl 4(%edx),%ecx -1: - movl (%esi),%eax - movl 4(%esi),%edx - LOCK - cmpxchg8b (%esi) - jnz 1b - popl %esi - popl %ebx - ret /* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h [iso-8859-1] Sat Aug 16 13:06:12 2008 @@ -1007,13 +1007,6 @@ IN PERESOURCE Resource ); -LONGLONG -FASTCALL -ExfpInterlockedExchange64( - LONGLONG volatile * Destination, - PLONGLONG Exchange -); - NTSTATUS ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation); @@ -1068,7 +1061,4 @@ #define ExfInterlockedCompareExchange64UL(Destination, Exchange, Comperand) \ (ULONGLONG)ExfInterlockedCompareExchange64((PLONGLONG)(Destination), (PLONGLONG)(Exchange), (PLONGLONG)(Comperand)) -#define ExfpInterlockedExchange64UL(Target, Value) \ - (ULONGLONG)ExfpInterlockedExchange64((PLONGLONG)(Target), (PLONGLONG)(Value)) - #endif /* __NTOSKRNL_INCLUDE_INTERNAL_EXECUTIVE_H */

1 0

[sginsberg] 35396: - Spelling fixes - Remove deprecated comment from resource.c - Fix obsdcach.c comment header
by sginsberg＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: sginsberg Date: Sat Aug 16 12:53:28 2008 New Revision: 35396 URL: http://svn.reactos.org/svn/reactos?rev=35396&view=rev Log: - Spelling fixes - Remove deprecated comment from resource.c - Fix obsdcach.c comment header Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ex/resource.c trunk/reactos/ntoskrnl/io/iomgr/iowork.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obinit.c trunk/reactos/ntoskrnl/ob/oblife.c trunk/reactos/ntoskrnl/ob/oblink.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/obsdcach.c Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -226,7 +226,7 @@ cmp eax, ecx je 2f - /* Get the next entry and do the deletion*/ + /* Get the next entry and do the deletion */ #ifdef CONFIG_SMP push ebx mov ebx, [eax] @@ -569,7 +569,7 @@ push ebx push ebp - /* Get desination pointer, exchange value and comperand value/address */ + /* Get destination pointer, exchange value and comperand value/address */ mov ebp, ecx mov ebx, [edx] mov ecx, [edx+4] @@ -601,7 +601,7 @@ push ebp push ebp - /* Get desination pointer, exchange value and comperand value/address */ + /* Get destination pointer, exchange value and comperand value/address */ mov ebp, ecx mov ebx, [edx] mov ecx, [edx+4] @@ -730,7 +730,7 @@ push ebp push ebp - /* Get desination pointer, exchange value and comperand value/address */ + /* Get destination pointer, exchange value and comperand value/address */ mov ebp, ecx mov ebx, [edx] mov ecx, [edx+4] Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -239,7 +239,7 @@ /* Restore flags */ popfd - /* check if the list was empty and return NULL */ + /* Check if the list was empty and return NULL */ xor eax, edx jz 2f Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=353… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -986,7 +986,7 @@ /* Setup bugcheck messages */ KiInitializeBugCheck(); - /* Setup initial system settings (FIXME: Needs Cm Rewrite) */ + /* Setup initial system settings */ CmGetSystemControlValues(LoaderBlock->RegistryBase, CmControlVector); /* Load static defaults for Service Pack 1 and add our SVN revision */ Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -4,14 +4,6 @@ * FILE: ntoskrnl/ex/resource.c * PURPOSE: Executive Resource Implementation * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* - * WARNING: - * This implementation is the Windows NT 5.x one. - * Vista has optimized the OwnerThread entry array and the internals of - * ExpFindEntryForThread and ExpFindFreeEntry probably need to be modified - * accordingly in order to support the WDK. */ /* INCLUDES *****************************************************************/ Modified: trunk/reactos/ntoskrnl/io/iomgr/iowork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iowork.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iowork.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -26,7 +26,7 @@ /* Call the work routine */ IoWorkItem->WorkerRoutine(DeviceObject, IoWorkItem->Context); - /* Dereferenece the device object */ + /* Dereference the device object */ ObDereferenceObject(DeviceObject); } Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/dirobj.c + * FILE: ntoskrnl/ob/obdir.c * PURPOSE: Manages the Object Manager's Directory Implementation, * such as functions for addition, deletion and lookup into * the Object Manager's namespace. These routines are separate Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/init.c + * FILE: ntoskrnl/ob/obinit.c * PURPOSE: Handles Object Manager Initialization and Shutdown * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Eric Kohl Modified: trunk/reactos/ntoskrnl/ob/oblife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblife.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblife.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/create.c + * FILE: ntoskrnl/ob/oblife.c * PURPOSE: Manages the lifetime of an Object, including its creation, * and deletion, as well as setting or querying any of its * information while it is active. Since Object Types are also Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory -* FILE: ntoskrnl/ob/symlink.c +* FILE: ntoskrnl/ob/oblink.c * PURPOSE: Implements symbolic links * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * David Welch (welch(a)mcmail.com) Modified: trunk/reactos/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/namespce.c + * FILE: ntoskrnl/ob/obname.c * PURPOSE: Manages all functions related to the Object Manager name- * space, such as finding objects or querying their names. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obref.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,7 +1,7 @@ /* * PROJECT: ReactOS Kernel * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/ob/refderef.c + * FILE: ntoskrnl/ob/obref.c * PURPOSE: Manages the referencing and de-referencing of all Objects, * as well as the Object Fast Reference implementation. * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Sat Aug 16 12:53:28 2008 @@ -1,10 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/ob/sdcache.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/ob/obsdcach.c + * PURPOSE: Security Descriptor Caching + * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) */ /* INCLUDES *******************************************************************/

1 0

[jimtabor] 35395: Wine update to dialog.c, see bug 3644.
by jimtabor＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: jimtabor Date: Sat Aug 16 11:01:03 2008 New Revision: 35395 URL: http://svn.reactos.org/svn/reactos?rev=35395&view=rev Log: Wine update to dialog.c, see bug 3644. Modified: trunk/reactos/dll/win32/user32/windows/dialog.c Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sat Aug 16 11:01:03 2008 @@ -755,13 +755,12 @@ { rect.left += MulDiv(template.x, xBaseUnit, 4); rect.top += MulDiv(template.y, yBaseUnit, 8); + if( !(template.style & (WS_CHILD|DS_ABSALIGN)) ) + ClientToScreen( owner, (POINT *)&rect ); } if ( !(template.style & WS_CHILD) ) { INT dX, dY; - - if( !(template.style & DS_ABSALIGN) ) - ClientToScreen( owner, (POINT *)&rect ); /* try to fit it into the desktop */

1 0

[jimtabor] 35394: Add check for null after allocating new DCE. See bug 3638.
by jimtabor＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: jimtabor Date: Sat Aug 16 10:48:05 2008 New Revision: 35394 URL: http://svn.reactos.org/svn/reactos?rev=35394&view=rev Log: Add check for null after allocating new DCE. See bug 3638. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Sat Aug 16 10:48:05 2008 @@ -467,6 +467,7 @@ { Dce = DceAllocDCE(NULL, DCE_CACHE_DC); } + if (!Dce) return NULL; Dce->hwndCurrent = (Window ? Window->hSelf : NULL); }

1 0

[cgutman] 35393: - Move SocketAcquireStateLock out of SEH
by cgutman＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: cgutman Date: Sat Aug 16 10:06:12 2008 New Revision: 35393 URL: http://svn.reactos.org/svn/reactos?rev=35393&view=rev Log: - Move SocketAcquireStateLock out of SEH Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Sat Aug 16 10:06:12 2008 @@ -24,12 +24,9 @@ AFD_DbgPrint(MID_TRACE,("Called %x %x\n", InfoReq, InfoReq ? InfoReq->InformationClass : 0)); + if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + _SEH_TRY { - if( !SocketAcquireStateLock( FCB ) ) { - Status = LostSocket( Irp ); - _SEH_YIELD(return Status); - } - switch( InfoReq->InformationClass ) { case AFD_INFO_RECEIVE_WINDOW_SIZE: InfoReq->Information.Ulong = FCB->Recv.Size;

1 0

[hpoussin] 35392: Increase lost packet count when transmit failed or receive failed for whatever reason
by hpoussin＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: hpoussin Date: Sat Aug 16 09:30:20 2008 New Revision: 35392 URL: http://svn.reactos.org/svn/reactos?rev=35392&view=rev Log: Increase lost packet count when transmit failed or receive failed for whatever reason Modified: trunk/reactos/base/applications/network/ping/ping.c Modified: trunk/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/network/ping/ping.c [iso-8859-1] Sat Aug 16 09:30:20 2008 @@ -541,6 +541,7 @@ } if (Status == SOCKET_ERROR) { + LostCount++; if (WSAGetLastError() == WSAEHOSTUNREACH) printf("Destination host unreachable.\n"); else @@ -567,6 +568,8 @@ printf("\n"); #endif /* !NDEBUG */ } + else + LostCount++; if (Status == SOCKET_ERROR) { if (WSAGetLastError() != WSAETIMEDOUT) @@ -581,7 +584,6 @@ if (Status == 0) { printf("Request timed out.\n"); - LostCount++; GlobalFree(Buffer); return TRUE; }

1 0

[cgutman] 35391: - Move MmUnlockPages to the proper place (still commented out though)
by cgutman＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: cgutman Date: Sat Aug 16 09:23:58 2008 New Revision: 35391 URL: http://svn.reactos.org/svn/reactos?rev=35391&view=rev Log: - Move MmUnlockPages to the proper place (still commented out though) Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/info.c [iso-8859-1] Sat Aug 16 09:23:58 2008 @@ -150,10 +150,9 @@ if( SysMdl ) IoFreeMdl( SysMdl ); if( TransAddr ) MmUnmapLockedPages( TransAddr, Mdl ); } + /* MmUnlockPages( Mdl ); */ } - - /* MmUnlockPages( Mdl ); */ - /* IoFreeMdl( Mdl ); */ + /* IoFreeMdl( Mdl ); */ } else { Status = STATUS_INSUFFICIENT_RESOURCES; }

1 0

[sginsberg] 35390: - No need to set a variable to TRUE twice before it is used
by sginsberg＠svn.reactos.org 16 Aug '08

16 Aug '08

Author: sginsberg Date: Sat Aug 16 09:18:42 2008 New Revision: 35390 URL: http://svn.reactos.org/svn/reactos?rev=35390&view=rev Log: - No need to set a variable to TRUE twice before it is used Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] Sat Aug 16 09:18:42 2008 @@ -35,7 +35,7 @@ PKINTERRUPT InterruptUsed; PIO_INTERRUPT IoInterrupt; PKSPIN_LOCK SpinLockUsed; - BOOLEAN FirstRun = TRUE; + BOOLEAN FirstRun; CCHAR Count = 0; KAFFINITY Affinity; PAGED_CODE();

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