Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 35790: GCC doesn't need CDECL on variables
by hpoussin＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: hpoussin Date: Sat Aug 30 02:11:57 2008 New Revision: 35790 URL: http://svn.reactos.org/svn/reactos?rev=35790&view=rev Log: GCC doesn't need CDECL on variables Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=3579… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Sat Aug 30 02:11:57 2008 @@ -73,8 +73,11 @@ #ifndef _NTRTL_ #ifndef DEFINE_GUIDEX - /* CDECL is used here in MS DDK but does this really work?? */ - #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID name + #ifdef _MSC_VER + #define DEFINE_GUIDEX(name) EXTERN_C const CDECL GUID name + #else + #define DEFINE_GUIDEX(name) EXTERN_C const GUID name + #endif #endif #ifndef STATICGUIDOF

1 0

[sserapion] 35789: re-add missing api, remove unneded file
by sserapion＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: sserapion Date: Sat Aug 30 01:49:03 2008 New Revision: 35789 URL: http://svn.reactos.org/svn/reactos?rev=35789&view=rev Log: re-add missing api, remove unneded file Removed: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec Modified: branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] Sat Aug 30 01:49:03 2008 @@ -311,6 +311,7 @@ @ extern _tzname msvcrt._tzname @ cdecl _tzset() msvcrt._tzset @ cdecl _ultoa(long ptr long) msvcrt._ultoa + @ cdecl _ultow(long ptr long) msvcrt._ultow @ cdecl _umask(long) msvcrt._umask @ cdecl _ungetch(long) msvcrt._ungetch @ cdecl _unlink(str) msvcrt._unlink Removed: branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/ws2_32/ws2_32.def (removed) @@ -1,121 +1,0 @@ -; WS2_32.DLL - Windows Sockets 2 DLL - -LIBRARY ws2_32.dll - -EXPORTS -WEP@0 @500 -WPUCompleteOverlappedRequest@20 @25 -WSAAccept@20 @26 -WSAAddressToStringA@20 @27 -WSAAddressToStringW@20 @28 -WSAAsyncGetHostByAddr@28 @102 -WSAAsyncGetHostByName@20 @103 -WSAAsyncGetProtoByName@20 @105 -WSAAsyncGetProtoByNumber@20 @104 -WSAAsyncGetServByName@24 @107 -WSAAsyncGetServByPort@24 @106 -WSAAsyncSelect@16 @101 -WSACancelAsyncRequest@4 @108 -WSACancelBlockingCall@0 @113 -WSACleanup@0 @116 -WSACloseEvent@4 @29 -WSAConnect@28 @30 -WSACreateEvent@0 @31 -WSADuplicateSocketA@12 @32 -WSADuplicateSocketW@12 @33 -WSAEnumNameSpaceProvidersA@8 @34 -WSAEnumNameSpaceProvidersW@8 @35 -WSAEnumNetworkEvents@12 @36 -WSAEnumProtocolsA@12 @37 -WSAEnumProtocolsW@12 @38 -WSAEventSelect@12 @39 -WSAGetLastError@0 @111 -WSAGetOverlappedResult@20 @40 -WSAGetQOSByName@12 @41 -WSAGetServiceClassInfoA@16 @42 -WSAGetServiceClassInfoW@16 @43 -WSAGetServiceClassNameByClassIdA@12 @44 -WSAGetServiceClassNameByClassIdW@12 @45 -WSAHtonl@12 @46 -WSAHtons@12 @47 -WSAInstallServiceClassA@4 @48 -WSAInstallServiceClassW@4 @49 -WSAIoctl@36 @50 -WSAIsBlocking@0 @114 -WSAJoinLeaf@32 @58 -WSALookupServiceBeginA@12 @59 -WSALookupServiceBeginW@12 @60 -WSALookupServiceEnd@4 @61 -WSALookupServiceNextA@16 @62 -WSALookupServiceNextW@16 @63 -WSANSPIoctl@32 @64 -WSANtohl@12 @65 -WSANtohs@12 @66 -WSAProviderConfigChange@12 @67 -WSARecv@28 @68 -WSARecvDisconnect@8 @69 -WSARecvFrom@36 @70 -WSARemoveServiceClass@4 @71 -WSAResetEvent@4 @72 -WSASend@28 @73 -WSASendDisconnect@8 @74 -WSASendTo@36 @75 -WSASetBlockingHook@4 @109 -WSASetEvent@4 @76 -WSASetLastError@4 @112 -WSASetServiceA@12 @77 -WSASetServiceW@12 @78 -WSASocketA@24 @79 -WSASocketW@24 @80 -WSAStartup@8 @115 -WSAStringToAddressA@20 @81 -WSAStringToAddressW@20 @82 -WSAUnhookBlockingHook@0 @110 -WSAWaitForMultipleEvents@20 @83 -WSApSetPostRoutine@4 @24 -WSCDeinstallProvider@8 @84 -WSCEnableNSProvider@8 @85 -WSCEnumProtocols@16 @86 -WSCGetProviderPath@16 @87 -WSCInstallNameSpace@20 @88 -WSCInstallProvider@20 @89 -WSCUnInstallNameSpace@4 @90 -WSCUpdateProvider@20 @91 -WSCWriteNameSpaceOrder@8 @92 -WSCWriteProviderOrder@8 @93 -__WSAFDIsSet@8 @151 -accept@12 @1 -bind@12 @2 -closesocket@4 @3 -connect@12 @4 -freeaddrinfo@4 @94 -getaddrinfo@16 @95 -gethostbyaddr@12 @51 -gethostbyname@4 @52 -gethostname@8 @57 -getnameinfo@28 @96 -getpeername@12 @5 -getprotobyname@4 @53 -getprotobynumber@4 @54 -getservbyname@8 @55 -getservbyport@8 @56 -getsockname@12 @6 -getsockopt@20 @7 -htonl@4 @8 -htons@4 @9 -inet_addr@4 @11 -inet_ntoa@4 @12 -ioctlsocket@12 @10 -listen@8 @13 -ntohl@4 @14 -ntohs@4 @15 -recv@16 @16 -recvfrom@24 @17 -select@20 @18 -send@16 @19 -sendto@24 @20 -setsockopt@20 @21 -shutdown@8 @22 -socket@12 @23 - -; EOF

1 0

[cgutman] 35788: - Merge aicom-network-fixes up to r35787
by cgutman＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cgutman Date: Fri Aug 29 22:42:46 2008 New Revision: 35788 URL: http://svn.reactos.org/svn/reactos?rev=35788&view=rev Log: - Merge aicom-network-fixes up to r35787 Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -53,6 +53,7 @@ return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); FCB->LocalAddress = TaCopyTransportAddress( &BindReq->Address ); if( FCB->LocalAddress ) Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -33,6 +33,7 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { + NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = @@ -50,14 +51,18 @@ FCB->State = SOCKET_STATE_CONNECTED; - return TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); + + if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + + return Status; } static NTSTATUS NTAPI StreamSocketConnectComplete @@ -166,6 +171,7 @@ return LeaveIrpUntilLater( FCB, Irp, FUNCTION_CONNECT ); case SOCKET_STATE_CREATED: + if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); FCB->LocalAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); @@ -193,6 +199,7 @@ /* Drop through to SOCKET_STATE_BOUND */ case SOCKET_STATE_BOUND: + if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); FCB->RemoteAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); 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] Fri Aug 29 22:42:46 2008 @@ -17,6 +17,7 @@ PFILE_OBJECT NewFileObject, PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_FCB FCB = NewFileObject->FsContext; + NTSTATUS Status; if( !SocketAcquireStateLock( FCB ) ) { LostSocket( Irp ); @@ -26,20 +27,27 @@ /* Transfer the connection to the new socket, launch the opening read */ AFD_DbgPrint(MID_TRACE,("Completing a real accept (FCB %x)\n", FCB)); - FCB->State = SOCKET_STATE_CONNECTED; FCB->Connection = Qelt->Object; + + if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); FCB->RemoteAddress = TaCopyTransportAddress( Qelt->ConnInfo->RemoteAddress ); + if( !FCB->RemoteAddress ) + Status = STATUS_NO_MEMORY; + else + Status = MakeSocketIntoConnection( FCB ); + + if( NT_SUCCESS(Status) ) { + FCB->PollState |= AFD_EVENT_SEND; + PollReeval( DeviceExt, NewFileObject ); + } + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); - + Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Status = Status; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - - MakeSocketIntoConnection( FCB ); - FCB->PollState |= AFD_EVENT_SEND; - PollReeval( DeviceExt, NewFileObject ); SocketStateUnlock( FCB ); } @@ -90,7 +98,7 @@ ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { - NTSTATUS Status = STATUS_FILE_CLOSED; + NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; @@ -99,7 +107,7 @@ return STATUS_CANCELLED; } - if( !SocketAcquireStateLock( FCB ) ) return Status; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->ListenIrp.InFlightRequest = NULL; @@ -114,8 +122,10 @@ Qelt = ExAllocatePool( NonPagedPool, sizeof(*Qelt) ); if( !Qelt ) { + /* Is this correct? */ TdiCloseDevice( FCB->Connection.Handle, FCB->Connection.Object ); + Status = STATUS_NO_MEMORY; } else { UINT AddressType = FCB->LocalAddress->Address[0].AddressType; @@ -128,11 +138,12 @@ ConnectionReturnInfo->RemoteAddress)); TdiBuildNullConnectionInfo( &Qelt->ConnInfo, AddressType ); - TaCopyTransportAddressInPlace - ( Qelt->ConnInfo->RemoteAddress, - FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); - - InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + if( Qelt->ConnInfo ) { + TaCopyTransportAddressInPlace + ( Qelt->ConnInfo->RemoteAddress, + FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); + InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + } else Status = STATUS_NO_MEMORY; } /* Satisfy a pre-accept request if one is available */ @@ -160,7 +171,7 @@ SocketStateUnlock( FCB ); - return STATUS_SUCCESS; + return Status; } NTSTATUS AfdListenSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp, Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -136,7 +136,8 @@ NULL); /* Handle information */ if (!NT_SUCCESS(Status)) { AFD_DbgPrint(MIN_TRACE, ("ObReferenceObjectByHandle() failed with status (0x%X).\n", Status)); - ZwClose(*Handle); + ZwClose(*Handle); + *Handle = NULL; } else { AFD_DbgPrint(MAX_TRACE, ("Got handle (0x%X) Object (0x%X)\n", *Handle, *Object)); 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] Fri Aug 29 22:42:46 2008 @@ -1625,7 +1625,7 @@ Status = IoGetDeviceProperty(PhysicalDeviceObject, DevicePropertyDriverKeyName, 0, NULL, &DriverKeyLength); - if (Status != STATUS_BUFFER_TOO_SMALL) + if (Status != STATUS_BUFFER_TOO_SMALL && Status != STATUS_BUFFER_OVERFLOW) { NDIS_DbgPrint(DEBUG_MINIPORT, ("Can't get miniport driver key length.\n")); return Status; Modified: trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Fri Aug 29 22:42:46 2008 @@ -26,6 +26,9 @@ IF_LIST_ITER(CurrentIF); TI_DbgPrint(DEBUG_INFO, ("Called.\n")); + + if (!IpAddress) + return TDI_NO_RESOURCES; TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); @@ -80,7 +83,7 @@ if( !RCache || !RouteEntries ) { if( RCache ) ExFreePool( RCache ); if( RouteEntries ) ExFreePool( RouteEntries ); - return STATUS_NO_MEMORY; + return TDI_NO_RESOURCES; } RtlZeroMemory( RouteEntries, Size );

1 0

[cgutman] 35787: - Change the status to STATUS_SUCCESS if TdiReceive returns STATUS_PENDING
by cgutman＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cgutman Date: Fri Aug 29 22:29:41 2008 New Revision: 35787 URL: http://svn.reactos.org/svn/reactos?rev=35787&view=rev Log: - Change the status to STATUS_SUCCESS if TdiReceive returns STATUS_PENDING Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Aug 29 22:29:41 2008 @@ -33,6 +33,7 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { + NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = @@ -50,14 +51,18 @@ FCB->State = SOCKET_STATE_CONNECTED; - return TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); + + if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; + + return Status; } static NTSTATUS NTAPI StreamSocketConnectComplete

1 0

[cgutman] 35786: - Check if TdiBuildNullConnectionInfo completed successfully - Add a comment - Fail if we can't allocate Qelt
by cgutman＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cgutman Date: Fri Aug 29 21:53:20 2008 New Revision: 35786 URL: http://svn.reactos.org/svn/reactos?rev=35786&view=rev Log: - Check if TdiBuildNullConnectionInfo completed successfully - Add a comment - Fail if we can't allocate Qelt 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] Fri Aug 29 21:53:20 2008 @@ -98,7 +98,7 @@ ( PDEVICE_OBJECT DeviceObject, PIRP Irp, PVOID Context ) { - NTSTATUS Status = STATUS_FILE_CLOSED; + NTSTATUS Status = STATUS_SUCCESS; PAFD_FCB FCB = (PAFD_FCB)Context; PAFD_TDI_OBJECT_QELT Qelt; @@ -107,7 +107,7 @@ return STATUS_CANCELLED; } - if( !SocketAcquireStateLock( FCB ) ) return Status; + if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; FCB->ListenIrp.InFlightRequest = NULL; @@ -122,8 +122,10 @@ Qelt = ExAllocatePool( NonPagedPool, sizeof(*Qelt) ); if( !Qelt ) { + /* Is this correct? */ TdiCloseDevice( FCB->Connection.Handle, FCB->Connection.Object ); + Status = STATUS_NO_MEMORY; } else { UINT AddressType = FCB->LocalAddress->Address[0].AddressType; @@ -136,11 +138,12 @@ ConnectionReturnInfo->RemoteAddress)); TdiBuildNullConnectionInfo( &Qelt->ConnInfo, AddressType ); - TaCopyTransportAddressInPlace - ( Qelt->ConnInfo->RemoteAddress, - FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); - - InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + if( Qelt->ConnInfo ) { + TaCopyTransportAddressInPlace + ( Qelt->ConnInfo->RemoteAddress, + FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); + InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); + } else Status = STATUS_NO_MEMORY; } /* Satisfy a pre-accept request if one is available */ @@ -168,7 +171,7 @@ SocketStateUnlock( FCB ); - return STATUS_SUCCESS; + return Status; } NTSTATUS AfdListenSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp,

1 0

[cgutman] 35785: - FCB->State gets set to SOCKET_STATE_CONNECTED in MakeSocketIntoConnection
by cgutman＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cgutman Date: Fri Aug 29 21:40:26 2008 New Revision: 35785 URL: http://svn.reactos.org/svn/reactos?rev=35785&view=rev Log: - FCB->State gets set to SOCKET_STATE_CONNECTED in MakeSocketIntoConnection 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] Fri Aug 29 21:40:26 2008 @@ -27,7 +27,6 @@ /* Transfer the connection to the new socket, launch the opening read */ AFD_DbgPrint(MID_TRACE,("Completing a real accept (FCB %x)\n", FCB)); - FCB->State = SOCKET_STATE_CONNECTED; FCB->Connection = Qelt->Object; if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress );

1 0

[cgutman] 35784: - Check if MakeSocketIntoConnection succeeded - Check if TaCopyTransportAddress succeeded
by cgutman＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cgutman Date: Fri Aug 29 21:30:27 2008 New Revision: 35784 URL: http://svn.reactos.org/svn/reactos?rev=35784&view=rev Log: - Check if MakeSocketIntoConnection succeeded - Check if TaCopyTransportAddress succeeded 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] Fri Aug 29 21:30:27 2008 @@ -17,6 +17,7 @@ PFILE_OBJECT NewFileObject, PAFD_TDI_OBJECT_QELT Qelt ) { PAFD_FCB FCB = NewFileObject->FsContext; + NTSTATUS Status; if( !SocketAcquireStateLock( FCB ) ) { LostSocket( Irp ); @@ -33,15 +34,21 @@ FCB->RemoteAddress = TaCopyTransportAddress( Qelt->ConnInfo->RemoteAddress ); + if( !FCB->RemoteAddress ) + Status = STATUS_NO_MEMORY; + else + Status = MakeSocketIntoConnection( FCB ); + + if( NT_SUCCESS(Status) ) { + FCB->PollState |= AFD_EVENT_SEND; + PollReeval( DeviceExt, NewFileObject ); + } + if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); - + Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Status = Status; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - - MakeSocketIntoConnection( FCB ); - FCB->PollState |= AFD_EVENT_SEND; - PollReeval( DeviceExt, NewFileObject ); SocketStateUnlock( FCB ); }

1 0

[cgutman] 35783: - Check that we successfully allocated memory - Return TDI_NO_RESOURCES instead of STATUS_NO_MEMORY
by cgutman＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: cgutman Date: Fri Aug 29 21:04:30 2008 New Revision: 35783 URL: http://svn.reactos.org/svn/reactos?rev=35783&view=rev Log: - Check that we successfully allocated memory - Return TDI_NO_RESOURCES instead of STATUS_NO_MEMORY Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/ninfo.c [iso-8859-1] Fri Aug 29 21:04:30 2008 @@ -26,6 +26,9 @@ IF_LIST_ITER(CurrentIF); TI_DbgPrint(DEBUG_INFO, ("Called.\n")); + + if (!IpAddress) + return TDI_NO_RESOURCES; TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); @@ -80,7 +83,7 @@ if( !RCache || !RouteEntries ) { if( RCache ) ExFreePool( RCache ); if( RouteEntries ) ExFreePool( RouteEntries ); - return STATUS_NO_MEMORY; + return TDI_NO_RESOURCES; } RtlZeroMemory( RouteEntries, Size );

1 0

[tkreuzer] 35782: - implement spinlocks, based on x86 up hal code - comment out KeInitializeSpinLock on amd64 builds (it's inlined there) - define some fastcall functions to normal on amd64 - Update amd64 stubs - remove wrong exports from ntokrnl
by tkreuzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: tkreuzer Date: Fri Aug 29 20:44:37 2008 New Revision: 35782 URL: http://svn.reactos.org/svn/reactos?rev=35782&view=rev Log: - implement spinlocks, based on x86 up hal code - comment out KeInitializeSpinLock on amd64 builds (it's inlined there) - define some fastcall functions to normal on amd64 - Update amd64 stubs - remove wrong exports from ntokrnl Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/amd64stubs.c [iso-8859-1] Fri Aug 29 20:44:37 2008 @@ -7,7 +7,6 @@ STUB(KdpEnableSafeMem) STUB(KiIdleLoop) -STUB(KeAcquireInStackQueuedSpinLockRaiseToSynch) STUB(KeBugcheckCallbackListHead) STUB(ExpInterlockedPushEntrySList) STUB(NtContinue) @@ -131,12 +130,6 @@ STUB(IoWMIDeviceObjectToProviderId) STUB(KdDebuggerEnabled) STUB(KdDebuggerNotPresent) -STUB(KeAcquireQueuedSpinLock) -STUB(_imp__KeAcquireQueuedSpinLock) -STUB(_imp__KeReleaseQueuedSpinLock) -STUB(KeAcquireQueuedSpinLockRaiseToSynch) -STUB(KeAcquireSpinLockRaiseToDpc) -STUB(KeAcquireSpinLockRaiseToSynch) STUB(KeEnterCriticalRegion) STUB(KeEnterGuardedRegion) STUB(KeExpandKernelStackAndCallout) @@ -152,8 +145,6 @@ STUB(KeQueryMultiThreadProcessorSet) STUB(KeQueryPrcbAddress) STUB(KeReadStateMutex) -STUB(KeReleaseQueuedSpinLock) -STUB(KeReleaseSpinLock) STUB(KeRestoreFloatingPointState) STUB(KeSaveFloatingPointState) STUB(KeSaveStateForHibernate) @@ -161,8 +152,6 @@ STUB(KeSignalCallDpcDone) STUB(KeSignalCallDpcSynchronize) STUB(KeSynchronizeExecution) -STUB(KeTryToAcquireQueuedSpinLock) -STUB(KeTryToAcquireQueuedSpinLockRaiseToSynch) STUB(KeUpdateRunTime) STUB(KeUpdateSystemTime) STUB(KeUserModeCallback) @@ -245,10 +234,6 @@ STUB(_setjmp) STUB(_setjmpex) STUB(longjmp) -STUB(KfReleaseSpinLock) -STUB(KeAcquireInStackQueuedSpinLock) -STUB(KeReleaseInStackQueuedSpinLock) -STUB(KfAcquireSpinLock) STUB(KeProcessorArchitecture) STUB(KeProcessorLevel) STUB(KeProcessorRevision) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/ke.h [iso-8859-1] Fri Aug 29 20:44:37 2008 @@ -65,6 +65,9 @@ //#define KeArchFnInit() Ke386FnInit() #define KeArchFnInit() DbgPrint("KeArchFnInit is unimplemented!\n"); #define KeArchHaltProcessor() Ke386HaltProcessor() +#define KfLowerIrql KeLowerIrql +#define KfAcquireSpinLock KeAcquireSpinLock +#define KfReleaseSpinLock KeReleaseSpinLock extern ULONG Ke386CacheAlignment; Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c [iso-8859-1] Fri Aug 29 20:44:37 2008 @@ -1,0 +1,188 @@ +/* + * PROJECT: ReactOS HAL + * LICENSE: GPL - See COPYING in the top level directory + * FILE: hal/halx86/up/spinlock.c + * PURPOSE: Spinlock and Queued Spinlock Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <internal/debug.h> + +#undef KeAcquireSpinLock +#undef KeReleaseSpinLock + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +KIRQL +KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) +{ +#ifndef CONFIG_SMP + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +KIRQL +NTAPI +KeAcquireSpinLockRaiseToDpc(PKSPIN_LOCK SpinLock) +{ +#ifndef CONFIG_SMP + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +VOID +NTAPI +KeReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL OldIrql) +{ +#ifndef CONFIG_SMP + /* Simply lower IRQL back */ + KfLowerIrql(OldIrql); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +KIRQL +KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ +#ifndef CONFIG_SMP + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +KIRQL +KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ +#ifndef CONFIG_SMP + /* Simply raise to dispatch */ + return KfRaiseIrql(DISPATCH_LEVEL); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +VOID +KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ +#ifndef CONFIG_SMP + /* Simply raise to dispatch */ + LockHandle->OldIrql = KfRaiseIrql(DISPATCH_LEVEL); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +VOID +KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ +#ifndef CONFIG_SMP + /* Simply raise to synch */ + LockHandle->OldIrql = KfRaiseIrql(SYNCH_LEVEL); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +VOID +KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN KIRQL OldIrql) +{ +#ifndef CONFIG_SMP + /* Simply lower IRQL back */ + KfLowerIrql(OldIrql); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +VOID +KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ +#ifndef CONFIG_SMP + /* Simply lower IRQL back */ + KfLowerIrql(LockHandle->OldIrql); +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +BOOLEAN +KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN PKIRQL OldIrql) +{ +#ifndef CONFIG_SMP + /* Simply raise to dispatch */ + *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + + /* Always return true on UP Machines */ + return TRUE; +#else + UNIMPLEMENTED; +#endif +} + +/* + * @implemented + */ +LOGICAL +KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + OUT PKIRQL OldIrql) +{ +#ifndef CONFIG_SMP + /* Simply raise to dispatch */ + *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); + + /* Always return true on UP Machines */ + return TRUE; +#else + UNIMPLEMENTED; +#endif +} + +/* EOF */ Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/spinlock.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Fri Aug 29 20:44:37 2008 @@ -86,6 +86,7 @@ /* PUBLIC FUNCTIONS **********************************************************/ +#ifdef _X86_ /* * @implemented */ @@ -96,6 +97,7 @@ /* Clear it */ *SpinLock = 0; } +#endif /* * @implemented Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Fri Aug 29 20:44:37 2008 @@ -95,6 +95,7 @@ <file>except.c</file> <file>irql.c</file> <file>kiinit.c</file> + <file>spinlock.c</file> <file>thrdini.c</file> <file>trap.S</file> </directory> Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl_amd64.def [iso-8859-1] Fri Aug 29 20:44:37 2008 @@ -4,16 +4,6 @@ ; EXPORTS ; -KfAcquireSpinLock -KfReleaseSpinLock -KefAcquireSpinLockAtDpcLevel -KefReleaseSpinLockFromDpcLevel -KeInitializeSpinLock -KeGetCurrentProcessorNumber -RtlConvertUlongToLargeInteger -RtlExtendedIntegerMultiply -; -; original: CcCanIWrite CcCopyRead CcCopyWrite

1 0

[tkreuzer] 35781: define some fastcall functions to the normal functions on amd64
by tkreuzer＠svn.reactos.org 30 Aug '08

30 Aug '08

Author: tkreuzer Date: Fri Aug 29 20:42:03 2008 New Revision: 35781 URL: http://svn.reactos.org/svn/reactos?rev=35781&view=rev Log: define some fastcall functions to the normal functions on amd64 Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h Modified: branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/ndis/include/ndissys.h [iso-8859-1] Fri Aug 29 20:42:03 2008 @@ -515,6 +515,13 @@ PULONG TotalCpuTime, PULONG ProcessorNumber); +/* portability fixes */ +#ifdef _M_AMD64 +#define KfReleaseSpinLock KeReleaseSpinLock +#define KefAcquireSpinLockAtDpcLevel KeAcquireSpinLockAtDpcLevel +#define KefReleaseSpinLockFromDpcLevel KeReleaseSpinLockFromDpcLevel +#endif + #endif /* __NDISSYS_H */ /* EOF */

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