Ros-diffs September 2008

ros-diffs@reactos.org

27 participants
747 discussions

[arty] 36014: Fix return type, spotted by aicom.

by arty＠svn.reactos.org

Author: arty Date: Sat Sep 6 20:39:23 2008 New Revision: 36014 URL: http://svn.reactos.org/svn/reactos?rev=36014&view=rev Log: Fix return type, spotted by aicom. Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c Modified: branches/arty-newcc/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/cache/pinsu… ============================================================================== --- branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ branches/arty-newcc/ntoskrnl/cache/pinsup.c [iso-8859-1] Sat Sep 6 20:39:23 2008 @@ -168,7 +168,7 @@ DPRINT("System view is at %x\n", Bcb->BaseAddress); Bcb->Length = ViewSize; - return TRUE; + return Status; } NTSTATUS CcpAllocateSection

16 years, 7 months

[tkreuzer] 36013: comment out some functions on AMD64 build that don't belong here.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Sep 6 19:17:05 2008 New Revision: 36013 URL: http://svn.reactos.org/svn/reactos?rev=36013&view=rev Log: comment out some functions on AMD64 build that don't belong here. Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal.c [iso-8859-1] Sat Sep 6 19:17:05 2008 @@ -748,7 +748,7 @@ return 0; } - +#ifndef _M_AMD64 VOID FASTCALL KeAcquireInStackQueuedSpinLock( @@ -777,6 +777,7 @@ { UNIMPLEMENTED; } +#endif VOID NTAPI @@ -853,6 +854,7 @@ } #endif +#ifndef _M_AMD64 #undef KeReleaseSpinLock VOID NTAPI @@ -862,7 +864,7 @@ { UNIMPLEMENTED; } - +#endif VOID NTAPI

16 years, 7 months

[tkreuzer] 36012: more ulong <-> pointer fixes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Sep 6 19:04:29 2008 New Revision: 36012 URL: http://svn.reactos.org/svn/reactos?rev=36012&view=rev Log: more ulong <-> pointer fixes Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.c Modified: branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Sat Sep 6 19:04:29 2008 @@ -462,7 +462,7 @@ /* i/o space */ if (AddressSpace != 0) - return((PVOID)TranslatedAddress.u.LowPart); + return((PVOID)(ULONG_PTR)TranslatedAddress.QuadPart); MappedAddress = MmMapIoSpace(TranslatedAddress, NumberOfBytes, @@ -1133,8 +1133,8 @@ PortConfig->AccessRanges = (PVOID)(PortConfig+1); /* Align to LONGLONG */ - PortConfig->AccessRanges = (PVOID)((ULONG)(PortConfig->AccessRanges) + 7); - PortConfig->AccessRanges = (PVOID)((ULONG)(PortConfig->AccessRanges) & ~7); + PortConfig->AccessRanges = (PVOID)((ULONG_PTR)(PortConfig->AccessRanges) + 7); + PortConfig->AccessRanges = (PVOID)((ULONG_PTR)(PortConfig->AccessRanges) & ~7); /* Copy the data */ RtlCopyMemory(PortConfig->AccessRanges,

16 years, 7 months

[tkreuzer] 36011: Fix a ULONG to pointer cast to make out shiny new RosBE happy.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Sep 6 18:56:10 2008 New Revision: 36011 URL: http://svn.reactos.org/svn/reactos?rev=36011&view=rev Log: Fix a ULONG to pointer cast to make out shiny new RosBE happy. Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Sat Sep 6 18:56:10 2008 @@ -873,7 +873,7 @@ if(AddressSpace) { ASSERT(TranslatedAddress.u.HighPart == 0); - *PortOffset = (PVOID) TranslatedAddress.u.LowPart; + *PortOffset = (PVOID)(ULONG_PTR)TranslatedAddress.QuadPart; NDIS_DbgPrint(MAX_TRACE, ("Returning 0x%x\n", *PortOffset)); return NDIS_STATUS_SUCCESS; }

16 years, 7 months

[cgutman] 36010: - Merge aicom-network-fixes up to r36009

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Sep 6 17:21:56 2008 New Revision: 36010 URL: http://svn.reactos.org/svn/reactos?rev=36010&view=rev Log: - Merge aicom-network-fixes up to r36009 Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/ndis/ndis/stubs.c trunk/reactos/drivers/network/tcpip/include/ports.h trunk/reactos/drivers/network/tcpip/tcpip/buffer.c trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c trunk/reactos/drivers/network/tcpip/tcpip/main.c trunk/reactos/lib/drivers/ip/network/ports.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -1293,8 +1293,7 @@ * NdisMQueryAdapterResources. */ - if (Stack->Parameters.StartDevice.AllocatedResources != NULL && - Stack->Parameters.StartDevice.AllocatedResourcesTranslated != NULL) + if (Stack->Parameters.StartDevice.AllocatedResources != NULL) { ResourceCount = Stack->Parameters.StartDevice.AllocatedResources->List[0]. PartialResourceList.Count; @@ -1310,24 +1309,31 @@ return STATUS_INSUFFICIENT_RESOURCES; } + RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResources, + Stack->Parameters.StartDevice.AllocatedResources, + ResourceListSize); + } + + if (Stack->Parameters.StartDevice.AllocatedResourcesTranslated != NULL) + { + ResourceCount = Stack->Parameters.StartDevice.AllocatedResources->List[0]. + PartialResourceList.Count; + ResourceListSize = + FIELD_OFFSET(CM_RESOURCE_LIST, List[0].PartialResourceList. + PartialDescriptors[ResourceCount]); + Adapter->NdisMiniportBlock.AllocatedResourcesTranslated = ExAllocatePool(PagedPool, ResourceListSize); if (Adapter->NdisMiniportBlock.AllocatedResourcesTranslated == NULL) { - ExFreePool(Adapter->NdisMiniportBlock.AllocatedResources); - Adapter->NdisMiniportBlock.AllocatedResources = NULL; ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return STATUS_INSUFFICIENT_RESOURCES; } - RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResources, - Stack->Parameters.StartDevice.AllocatedResources, - ResourceListSize); - RtlCopyMemory(Adapter->NdisMiniportBlock.AllocatedResourcesTranslated, Stack->Parameters.StartDevice.AllocatedResourcesTranslated, ResourceListSize); - } + } /* * Store the Bus Type, Bus Number and Slot information. It's used by Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -805,10 +805,11 @@ NtStatus = ZwQueryValueKey(DriverKeyHandle, &ValueName, KeyValuePartialInformation, KeyInformation, sizeof(KEY_VALUE_PARTIAL_INFORMATION) + ResultLength, &ResultLength); + ZwClose(DriverKeyHandle); + if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("Unable to query the Bind value\n")); - ZwClose(DriverKeyHandle); ExFreePool(KeyInformation); ExFreePool(Protocol); *Status = NDIS_STATUS_FAILURE; @@ -893,7 +894,8 @@ */ } - *Status = NDIS_STATUS_SUCCESS; + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_SUCCESS; } Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -321,9 +321,6 @@ FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions 0, // PVOID EaBuffer 0 ); // ULONG EaLength - - //if ( !NT_SUCCESS(*Status) ) - // goto cleanup; cleanup: if ( FullFileName.Buffer != NULL ) Modified: trunk/reactos/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/ports.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/ports.h [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -20,9 +20,9 @@ FAST_MUTEX Mutex; } PORT_SET, *PPORT_SET; -VOID PortsStartup( PPORT_SET PortSet, - UINT StartingPort, - UINT PortsToManage ); +NTSTATUS PortsStartup( PPORT_SET PortSet, + UINT StartingPort, + UINT PortsToManage ); VOID PortsShutdown( PPORT_SET PortSet ); VOID DeallocatePort( PPORT_SET PortSet, ULONG Port ); BOOLEAN AllocatePort( PPORT_SET PortSet, ULONG Port ); Modified: trunk/reactos/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -319,11 +319,11 @@ if( Copy ) { NewBuf = ExAllocatePool( NonPagedPool, Length ); - if( !NewBuf ) return STATUS_NO_MEMORY; + if( !NewBuf ) return NDIS_STATUS_RESOURCES; RtlCopyMemory( NewBuf, Data, Length ); } else NewBuf = Data; - NdisAllocateBuffer( &Status, &Buffer, GlobalBufferPool, Data, Length ); + NdisAllocateBuffer( &Status, &Buffer, GlobalBufferPool, NewBuf, Length ); if( Status != NDIS_STATUS_SUCCESS ) return Status; NdisChainBufferAtFront( Packet, Buffer ); @@ -351,7 +351,7 @@ PCHAR NewData; NewData = ExAllocatePool( NonPagedPool, Len ); - if( !NewData ) return NDIS_STATUS_NOT_ACCEPTED; // XXX + if( !NewData ) return NDIS_STATUS_RESOURCES; TrackWithTag(EXALLOC_TAG, NewData, File, Line); if( Data ) RtlCopyMemory(NewData, Data, Len); Modified: trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/iinfo.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -29,7 +29,7 @@ (PIFENTRY)ExAllocatePool( NonPagedPool, sizeof(IFENTRY) + MAX_IFDESCR_LEN ); - if( !OutData ) return TDI_INVALID_REQUEST; /* Out of memory */ + if( !OutData ) return TDI_NO_RESOURCES; /* Out of memory */ RtlZeroMemory( OutData, sizeof(IFENTRY) + MAX_IFDESCR_LEN ); Modified: trunk/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -711,8 +711,8 @@ /* Setup network layer and transport layer entities */ KeInitializeSpinLock(&EntityListLock); EntityList = ExAllocatePool(NonPagedPool, sizeof(TDIEntityID) * MAX_TDI_ENTITIES ); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + if (!EntityList) { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); TiUnload(DriverObject); return STATUS_INSUFFICIENT_RESOURCES; } @@ -760,9 +760,23 @@ IPStartup(RegistryPath); /* Initialize transport level protocol subsystems */ - RawIPStartup(); - UDPStartup(); - TCPStartup(); + Status = RawIPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + Status = UDPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + Status = TCPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } /* Initialize the lan worker */ LANStartup(); Modified: trunk/reactos/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/por… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ports.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -10,7 +10,7 @@ #include "precomp.h" -VOID PortsStartup( PPORT_SET PortSet, +NTSTATUS PortsStartup( PPORT_SET PortSet, UINT StartingPort, UINT PortsToManage ) { PortSet->StartingPort = StartingPort; @@ -19,11 +19,13 @@ PortSet->PortsToOversee - 1; PortSet->ProtoBitBuffer = PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); + if(!PortSet->ProtoBitBuffer) return STATUS_INSUFFICIENT_RESOURCES; RtlInitializeBitMap( &PortSet->ProtoBitmap, PortSet->ProtoBitBuffer, PortSet->PortsToOversee ); RtlClearAllBits( &PortSet->ProtoBitmap ); ExInitializeFastMutex( &PortSet->Mutex ); + return STATUS_SUCCESS; } VOID PortsShutdown( PPORT_SET PortSet ) { 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 Sep 6 17:21:56 2008 @@ -455,7 +455,11 @@ return Status; } - PortsStartup( &TCPPorts, 1, 0xfffe ); + Status = PortsStartup( &TCPPorts, 1, 0xfffe ); + if( !NT_SUCCESS(Status) ) { + TCPMemShutdown(); + return Status; + } RegisterOskitTCPEventHandlers( &EventHandlers ); InitOskitTCP(); Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Sep 6 17:21:56 2008 @@ -302,8 +302,12 @@ #ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); #endif - - PortsStartup( &UDPPorts, 1, 0xfffe ); + + NTSTATUS Status; + + Status = PortsStartup( &UDPPorts, 1, 0xfffe ); + + if( !NT_SUCCESS(Status) ) return Status; /* Register this protocol with IP layer */ IPRegisterProtocol(IPPROTO_UDP, UDPReceive);

16 years, 7 months

[cgutman] 36009: - Return NDIS_STATUS_RESOURCES not NDIS_STATUS_NOT_ACCEPTED when we fail to allocate memory

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Sep 6 16:45:23 2008 New Revision: 36009 URL: http://svn.reactos.org/svn/reactos?rev=36009&view=rev Log: - Return NDIS_STATUS_RESOURCES not NDIS_STATUS_NOT_ACCEPTED when we fail to allocate memory Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/buffer.c [iso-8859-1] Sat Sep 6 16:45:23 2008 @@ -351,7 +351,7 @@ PCHAR NewData; NewData = ExAllocatePool( NonPagedPool, Len ); - if( !NewData ) return NDIS_STATUS_NOT_ACCEPTED; // XXX + if( !NewData ) return NDIS_STATUS_RESOURCES; TrackWithTag(EXALLOC_TAG, NewData, File, Line); if( Data ) RtlCopyMemory(NewData, Data, Len);

16 years, 7 months

[cgutman] 36008: - Forgot this file from r36006

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Sep 6 16:42:58 2008 New Revision: 36008 URL: http://svn.reactos.org/svn/reactos?rev=36008&view=rev Log: - Forgot this file from r36006 Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h Modified: branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/include/ports.h [iso-8859-1] Sat Sep 6 16:42:58 2008 @@ -20,9 +20,9 @@ FAST_MUTEX Mutex; } PORT_SET, *PPORT_SET; -VOID PortsStartup( PPORT_SET PortSet, - UINT StartingPort, - UINT PortsToManage ); +NTSTATUS PortsStartup( PPORT_SET PortSet, + UINT StartingPort, + UINT PortsToManage ); VOID PortsShutdown( PPORT_SET PortSet ); VOID DeallocatePort( PPORT_SET PortSet, ULONG Port ); BOOLEAN AllocatePort( PPORT_SET PortSet, ULONG Port );

16 years, 7 months

[cgutman] 36007: - Check status from RawIPStartup, UDPStartup, and TCPStartup

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Sep 6 16:36:55 2008 New Revision: 36007 URL: http://svn.reactos.org/svn/reactos?rev=36007&view=rev Log: - Check status from RawIPStartup, UDPStartup, and TCPStartup Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Sat Sep 6 16:36:55 2008 @@ -760,9 +760,23 @@ IPStartup(RegistryPath); /* Initialize transport level protocol subsystems */ - RawIPStartup(); - UDPStartup(); - TCPStartup(); + Status = RawIPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + Status = UDPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } + + Status = TCPStartup(); + if( !NT_SUCCESS(Status) ) { + TiUnload(DriverObject); + return Status; + } /* Initialize the lan worker */ LANStartup();

16 years, 7 months

[cgutman] 36006: - Make PortsStartup return NTSTATUS so we can make sure memory allocated succeeded - Change the callers to check the return status

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Sep 6 16:30:09 2008 New Revision: 36006 URL: http://svn.reactos.org/svn/reactos?rev=36006&view=rev Log: - Make PortsStartup return NTSTATUS so we can make sure memory allocated succeeded - Change the callers to check the return status Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c branches/aicom-network-fixes/lib/drivers/ip/transport/tcp/tcp.c branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-fixes/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/network/ports.c [iso-8859-1] Sat Sep 6 16:30:09 2008 @@ -10,7 +10,7 @@ #include "precomp.h" -VOID PortsStartup( PPORT_SET PortSet, +NTSTATUS PortsStartup( PPORT_SET PortSet, UINT StartingPort, UINT PortsToManage ) { PortSet->StartingPort = StartingPort; @@ -19,11 +19,13 @@ PortSet->PortsToOversee - 1; PortSet->ProtoBitBuffer = PoolAllocateBuffer( (PortSet->PortsToOversee + 7) / 8 ); + if(!PortSet->ProtoBitBuffer) return STATUS_INSUFFICIENT_RESOURCES; RtlInitializeBitMap( &PortSet->ProtoBitmap, PortSet->ProtoBitBuffer, PortSet->PortsToOversee ); RtlClearAllBits( &PortSet->ProtoBitmap ); ExInitializeFastMutex( &PortSet->Mutex ); + return STATUS_SUCCESS; } VOID PortsShutdown( PPORT_SET PortSet ) { 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 Sep 6 16:30:09 2008 @@ -455,7 +455,11 @@ return Status; } - PortsStartup( &TCPPorts, 1, 0xfffe ); + Status = PortsStartup( &TCPPorts, 1, 0xfffe ); + if( !NT_SUCCESS(Status) ) { + TCPMemShutdown(); + return Status; + } RegisterOskitTCPEventHandlers( &EventHandlers ); InitOskitTCP(); Modified: branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/lib/drivers… ============================================================================== --- branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Sep 6 16:30:09 2008 @@ -302,8 +302,12 @@ #ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); #endif - - PortsStartup( &UDPPorts, 1, 0xfffe ); + + NTSTATUS Status; + + Status = PortsStartup( &UDPPorts, 1, 0xfffe ); + + if( !NT_SUCCESS(Status) ) return Status; /* Register this protocol with IP layer */ IPRegisterProtocol(IPPROTO_UDP, UDPReceive);

16 years, 7 months

[sginsberg] 36005: - Make sure we get a Subkey in RegDeleteKeyA/W. Fixes Winetests causing a system crash, but (for now) hides a bug in CM.

by sginsberg＠svn.reactos.org

Author: sginsberg Date: Sat Sep 6 16:02:54 2008 New Revision: 36005 URL: http://svn.reactos.org/svn/reactos?rev=36005&view=rev Log: - Make sure we get a Subkey in RegDeleteKeyA/W. Fixes Winetests causing a system crash, but (for now) hides a bug in CM. Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Sat Sep 6 16:02:54 2008 @@ -1180,6 +1180,13 @@ HANDLE TargetKey; NTSTATUS Status; + /* Make sure we got a subkey */ + if (!lpSubKey) + { + /* Fail */ + return ERROR_INVALID_PARAMETER; + } + Status = MapDefaultKey (&ParentKey, hKey); if (!NT_SUCCESS(Status)) @@ -1233,6 +1240,13 @@ HANDLE ParentKey; HANDLE TargetKey; NTSTATUS Status; + + /* Make sure we got a subkey */ + if (!lpSubKey) + { + /* Fail */ + return ERROR_INVALID_PARAMETER; + } Status = MapDefaultKey (&ParentKey, hKey);

16 years, 7 months

← Newer
1
...
56
57
58
59
60
61
62
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2008