Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 36144: - Make sure we successfully allocated memory
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 14:43:19 2008 New Revision: 36144 URL: http://svn.reactos.org/svn/reactos?rev=36144&view=rev Log: - Make sure we successfully allocated memory 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] Thu Sep 11 14:43:19 2008 @@ -52,6 +52,7 @@ ULONG EaLength; PWCHAR EaInfoValue = NULL; UINT Disposition, i; + NTSTATUS Status; AFD_DbgPrint(MID_TRACE, ("AfdCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); @@ -140,16 +141,27 @@ AFD_DbgPrint(MID_TRACE,("Packet oriented socket\n")); /* Allocate our backup buffer */ FCB->Recv.Window = ExAllocatePool( NonPagedPool, FCB->Recv.Size ); + if( !FCB->Recv.Window ) Status = STATUS_NO_MEMORY; FCB->Send.Window = ExAllocatePool( NonPagedPool, FCB->Send.Size ); + if( !FCB->Send.Window ) { + if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); + Status = STATUS_NO_MEMORY; + } /* A datagram socket is always sendable */ FCB->PollState |= AFD_EVENT_SEND; PollReeval( FCB->DeviceExt, FCB->FileObject ); } - Irp->IoStatus.Status = STATUS_SUCCESS; + if( !NT_SUCCESS(Status) ) { + if( FCB->TdiDeviceName.Buffer ) ExFreePool( FCB->TdiDeviceName.Buffer ); + ExFreePool( FCB ); + FileObject->FsContext = NULL; + } + + Irp->IoStatus.Status = Status; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - return STATUS_SUCCESS; + return Status; } VOID DestroySocket( PAFD_FCB FCB ) {

1 0

[cgutman] 36143: - Fix 2 typos
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 14:15:35 2008 New Revision: 36143 URL: http://svn.reactos.org/svn/reactos?rev=36143&view=rev Log: - Fix 2 typos Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Thu Sep 11 14:15:35 2008 @@ -174,8 +174,8 @@ ( NonPagedPool, HandleCount * sizeof(AFD_HANDLE) ); for( i = 0; FileObjects && i < HandleCount; i++ ) { - HandleArray[i].Status = 0; - HandleArray[i].Events = HandleArray[i].Events; + FileObjects[i].Status = 0; + FileObjects[i].Events = HandleArray[i].Events; FileObjects[i].Handle = 0; if( !HandleArray[i].Handle ) continue; if( NT_SUCCESS(Status) ) { @@ -206,6 +206,7 @@ } ExFreePool( HandleArray ); + HandleArray = NULL; } /* Returns transitioned state or SOCKET_STATE_INVALID_TRANSITION */

1 0

[fireball] 36142: - Use CD_ROM type instead of DISK.
by fireball＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: fireball Date: Thu Sep 11 13:50:47 2008 New Revision: 36142 URL: http://svn.reactos.org/svn/reactos?rev=36142&view=rev Log: - Use CD_ROM type instead of DISK. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Thu Sep 11 13:50:47 2008 @@ -331,7 +331,7 @@ Status = IoCreateDevice(CdfsGlobalData->DriverObject, sizeof(DEVICE_EXTENSION), NULL, - FILE_DEVICE_DISK_FILE_SYSTEM, + FILE_DEVICE_CD_ROM_FILE_SYSTEM, 0, FALSE, &NewDeviceObject);

1 0

[cgutman] 36141: - Nicer solution for the problem fixed in r36102
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 13:17:11 2008 New Revision: 36141 URL: http://svn.reactos.org/svn/reactos?rev=36141&view=rev Log: - Nicer solution for the problem fixed in r36102 Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Thu Sep 11 13:17:11 2008 @@ -57,7 +57,9 @@ PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL, PAFD_POLL_INFO PollReq, - NTSTATUS Status + NTSTATUS Status, + KSPIN_LOCK Lock, + KIRQL OldIrql ) { UINT i; @@ -86,6 +88,10 @@ } UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + AFD_DbgPrint(MID_TRACE,("Completing\n")); + KeReleaseSpinLock(&Lock, OldIrql); + IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + KeAcquireSpinLock(&Lock, &OldIrql); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -108,10 +114,8 @@ ZeroEvents( PollReq->Handles, PollReq->HandleCount ); KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT ); + SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT, DeviceExt->Lock, OldIrql ); KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); AFD_DbgPrint(MID_TRACE,("Timeout\n")); } @@ -145,10 +149,7 @@ if( (PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); - KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS, DeviceExt->Lock, OldIrql ); } } } @@ -232,10 +233,7 @@ if( Signalled ) { Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - SignalSocket( NULL, Irp, PollReq, Status ); - KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - return Status; + SignalSocket( NULL, Irp, PollReq, Status, DeviceExt->Lock, OldIrql ); } else { PAFD_ACTIVE_POLL Poll = NULL; @@ -426,10 +424,7 @@ if( UpdatePollWithFCB( Poll, FileObject ) ) { ThePollEnt = ThePollEnt->Flink; AFD_DbgPrint(MID_TRACE,("Signalling socket\n")); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); - KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); - IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS, DeviceExt->Lock, OldIrql ); } else ThePollEnt = ThePollEnt->Flink; }

1 0

[cwittich] 36140: fix heap corruption
by cwittich＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cwittich Date: Thu Sep 11 12:00:47 2008 New Revision: 36140 URL: http://svn.reactos.org/svn/reactos?rev=36140&view=rev Log: fix heap corruption Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c Modified: trunk/reactos/dll/win32/advapi32/service/sctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/sctrl.c [iso-8859-1] Thu Sep 11 12:00:47 2008 @@ -286,7 +286,7 @@ lpService->Arguments = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - ControlPacket->dwSize * sizeof(WCHAR)); + (ControlPacket->dwSize + 1) * sizeof(WCHAR)); if (lpService->Arguments == NULL) return ERROR_OUTOFMEMORY;

1 0

[sginsberg] 36139: - IoAcquire/ReleaseVpbSpinLock: Use the queued IopVpbSpinLock spinlock instead of a regular "IoVpbLock" spinlock
by sginsberg＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: sginsberg Date: Thu Sep 11 11:53:36 2008 New Revision: 36139 URL: http://svn.reactos.org/svn/reactos?rev=36139&view=rev Log: - IoAcquire/ReleaseVpbSpinLock: Use the queued IopVpbSpinLock spinlock instead of a regular "IoVpbLock" spinlock Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c trunk/reactos/ntoskrnl/io/iomgr/volume.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iomgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iomgr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iomgr.c [iso-8859-1] Thu Sep 11 11:53:36 2008 @@ -68,7 +68,6 @@ extern LIST_ENTRY IopTimerQueueHead; extern KDPC IopTimerDpc; extern KTIMER IopTimer; -extern KSPIN_LOCK IoVpbLock; extern KSPIN_LOCK IoStatisticsLock; extern KSPIN_LOCK DriverReinitListLock; extern KSPIN_LOCK DriverBootReinitListLock; @@ -462,7 +461,6 @@ InitializeListHead(&LastChanceShutdownListHead); InitializeListHead(&FsChangeNotifyListHead); InitializeListHead(&IopErrorLogListHead); - KeInitializeSpinLock(&IoVpbLock); KeInitializeSpinLock(&IoStatisticsLock); KeInitializeSpinLock(&DriverReinitListLock); KeInitializeSpinLock(&DriverBootReinitListLock); Modified: trunk/reactos/ntoskrnl/io/iomgr/volume.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/volume.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/volume.c [iso-8859-1] Thu Sep 11 11:53:36 2008 @@ -26,7 +26,6 @@ LIST_ENTRY IopCdRomFsListHead, IopTapeFsListHead; KGUARDED_MUTEX FsChangeNotifyListLock; LIST_ENTRY FsChangeNotifyListHead; -KSPIN_LOCK IoVpbLock; /* PRIVATE FUNCTIONS *********************************************************/ @@ -923,7 +922,7 @@ IoAcquireVpbSpinLock(OUT PKIRQL Irql) { /* Simply acquire the lock */ - KeAcquireSpinLock(&IoVpbLock, Irql); + *Irql = KeAcquireQueuedSpinLock(LockQueueIoVpbLock); } /* @@ -934,7 +933,7 @@ IoReleaseVpbSpinLock(IN KIRQL Irql) { /* Just release the lock */ - KeReleaseSpinLock(&IoVpbLock, Irql); + KeReleaseQueuedSpinLock(LockQueueIoVpbLock, Irql); } /*

1 0

[cwittich] 36138: add missing HandleBind() calls
by cwittich＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cwittich Date: Thu Sep 11 11:48:42 2008 New Revision: 36138 URL: http://svn.reactos.org/svn/reactos?rev=36138&view=rev Log: add missing HandleBind() calls Modified: trunk/reactos/dll/win32/advapi32/service/scm.c Modified: trunk/reactos/dll/win32/advapi32/service/scm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/service… ============================================================================== --- trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/service/scm.c [iso-8859-1] Thu Sep 11 11:48:42 2008 @@ -2326,6 +2326,8 @@ { DWORD dwError; + HandleBind(); + _SEH_TRY { dwError = RStartServiceA(BindingHandle, @@ -2362,6 +2364,8 @@ { DWORD dwError; + HandleBind(); + _SEH_TRY { dwError = RStartServiceW(BindingHandle,

1 0

[fireball] 36137: - Use a correct device type when creating volume device objects.
by fireball＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: fireball Date: Thu Sep 11 09:43:12 2008 New Revision: 36137 URL: http://svn.reactos.org/svn/reactos?rev=36137&view=rev Log: - Use a correct device type when creating volume device objects. Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c trunk/reactos/drivers/filesystems/fastfat/fsctl.c Modified: trunk/reactos/drivers/filesystems/cdfs/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/cdfs/f… ============================================================================== --- trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/cdfs/fsctl.c [iso-8859-1] Thu Sep 11 09:43:12 2008 @@ -331,8 +331,7 @@ Status = IoCreateDevice(CdfsGlobalData->DriverObject, sizeof(DEVICE_EXTENSION), NULL, - FILE_DEVICE_FILE_SYSTEM, -// FILE_DEVICE_DISK_FILE_SYSTEM, + FILE_DEVICE_DISK_FILE_SYSTEM, 0, FALSE, &NewDeviceObject); Modified: trunk/reactos/drivers/filesystems/fastfat/fsctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fsctl.c [iso-8859-1] Thu Sep 11 09:43:12 2008 @@ -422,7 +422,7 @@ Status = IoCreateDevice(VfatGlobalData->DriverObject, ROUND_UP(sizeof (DEVICE_EXTENSION), sizeof(ULONG)) + sizeof(HASHENTRY*) * HashTableSize, NULL, - FILE_DEVICE_FILE_SYSTEM, + FILE_DEVICE_DISK_FILE_SYSTEM, 0, FALSE, &DeviceObject);

1 0

[sginsberg] 36136: - NtQueryInformationProcess with ProcessImageFileName query type: Free the buffer allocated by SeLocateProcessImageName, and set return status if return buffer is too small (so caller will know to allocate more memory). Spotted by #3714 See issue #3714 for more details.
by sginsberg＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: sginsberg Date: Thu Sep 11 09:24:41 2008 New Revision: 36136 URL: http://svn.reactos.org/svn/reactos?rev=36136&view=rev Log: - NtQueryInformationProcess with ProcessImageFileName query type: Free the buffer allocated by SeLocateProcessImageName, and set return status if return buffer is too small (so caller will know to allocate more memory). Spotted by #3714 See issue #3714 for more details. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=36… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/query.c [iso-8859-1] Thu Sep 11 09:24:41 2008 @@ -426,6 +426,14 @@ } _SEH_END; } + else + { + /* Buffer too small */ + Status = STATUS_INFO_LENGTH_MISMATCH; + } + + /* Free the image path */ + ExFreePool(ImageName); } break;

1 0

[fireball] 36135: - Silence the raised IRQL level warning. - Use a better status code for invalid requests.
by fireball＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: fireball Date: Thu Sep 11 07:41:26 2008 New Revision: 36135 URL: http://svn.reactos.org/svn/reactos?rev=36135&view=rev Log: - Silence the raised IRQL level warning. - Use a better status code for invalid requests. Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c trunk/reactos/drivers/filesystems/fastfat/misc.c Modified: trunk/reactos/drivers/filesystems/fastfat/fastio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/fastio.c [iso-8859-1] Thu Sep 11 07:41:26 2008 @@ -289,7 +289,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatReleaseForModWrite\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static NTSTATUS NTAPI @@ -297,7 +297,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatAcquireForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } static NTSTATUS NTAPI @@ -305,7 +305,7 @@ IN PDEVICE_OBJECT DeviceObject) { DPRINT("VfatReleaseForCcFlush\n"); - return STATUS_UNSUCCESSFUL; + return STATUS_INVALID_DEVICE_REQUEST; } BOOLEAN NTAPI Modified: trunk/reactos/drivers/filesystems/fastfat/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat/misc.c [iso-8859-1] Thu Sep 11 07:41:26 2008 @@ -156,11 +156,6 @@ } else { - if (KeGetCurrentIrql() > PASSIVE_LEVEL) - { - DPRINT1("Vfat is entered at irql = %d\n", KeGetCurrentIrql()); - } - FsRtlEnterFileSystem(); Status = VfatDispatchRequest (IrpContext); FsRtlExitFileSystem();

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