Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[akhaldi] 52445: [CMAKE] * Disable kdbg and enable _WINKD_ by default for msvc builds.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 24 21:28:43 2011 New Revision: 52445 URL: http://svn.reactos.org/svn/reactos?rev=52445&view=rev Log: [CMAKE] * Disable kdbg and enable _WINKD_ by default for msvc builds. Modified: trunk/reactos/cmake/config.cmake Modified: trunk/reactos/cmake/config.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config.cmake?rev=524… ============================================================================== --- trunk/reactos/cmake/config.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config.cmake [iso-8859-1] Fri Jun 24 21:28:43 2011 @@ -21,18 +21,24 @@ 4 = -O2 5 = -O3") -set(DBG TRUE CACHE BOOL -"Whether to compile for debugging.") - -set(KDBG TRUE CACHE BOOL -"Whether to compile in the integrated kernel debugger.") - set(GDB FALSE CACHE BOOL "Whether to compile for debugging with GDB. If you don't use GDB, don't enable this.") -set(_WINKD_ FALSE CACHE BOOL +set(DBG TRUE CACHE BOOL +"Whether to compile for debugging.") + +if(MSVC) + set(KDBG FALSE CACHE BOOL +"Whether to compile in the integrated kernel debugger.") + set(_WINKD_ TRUE CACHE BOOL "Whether to compile with the KD protocol.") +else() + set(KDBG TRUE CACHE BOOL +"Whether to compile in the integrated kernel debugger.") + set(_WINKD_ FALSE CACHE BOOL +"Whether to compile with the KD protocol.") +endif() set(_ELF_ FALSE CACHE BOOL "Whether to compile support for ELF files.

13 years, 6 months

[tkreuzer] 52444: [NTOSKRNL] Fix MSVC warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Fri Jun 24 15:52:19 2011 New Revision: 52444 URL: http://svn.reactos.org/svn/reactos?rev=52444&view=rev Log: [NTOSKRNL] Fix MSVC warnings Modified: trunk/reactos/ntoskrnl/config/cmindex.c Modified: trunk/reactos/ntoskrnl/config/cmindex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmindex.c?… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmindex.c [iso-8859-1] Fri Jun 24 15:52:19 2011 @@ -1166,7 +1166,7 @@ PCM_KEY_INDEX IndexKey, LeafKey, NewKey; PCM_KEY_FAST_INDEX FastLeaf; HCELL_INDEX LeafCell, NewCell; - ULONG FirstHalf, LastHalf; + USHORT FirstHalf, LastHalf; ULONG EntrySize, TotalSize; /* Get the cell */ @@ -1290,7 +1290,7 @@ } /* Shift the data inside the root key */ - if (RootSelect < (IndexKey->Count - 1)) + if ((RootSelect + 1) < IndexKey->Count) { RtlMoveMemory(&IndexKey->List[RootSelect + 2], &IndexKey->List[RootSelect + 1], @@ -1425,7 +1425,7 @@ } /* No, it doesn't fit, check the next adjacent leaf */ - if (SubKeyIndex < (IndexKey->Count - 1)) + if ((SubKeyIndex + 1) < IndexKey->Count) { /* Yes, there is space */ LeafCell = IndexKey->List[SubKeyIndex + 1];

13 years, 6 months

[cmihail] 52443: [MSAFD] - merge r52438 - Fail SIO_GET_EXTENSION_FUNCTION_POINTER - Fixes the crash during ws2_32_winetest sock [AFD] - merge r52441 - Queue the user-mode connect IRP before calling...

by cmihail＠svn.reactos.org

Author: cmihail Date: Fri Jun 24 14:57:29 2011 New Revision: 52443 URL: http://svn.reactos.org/svn/reactos?rev=52443&view=rev Log: [MSAFD] - merge r52438 - Fail SIO_GET_EXTENSION_FUNCTION_POINTER - Fixes the crash during ws2_32_winetest sock [AFD] - merge r52441 - Queue the user-mode connect IRP before calling TdiConnect to avoid a race if the TDI_CONNECT IRP is completed before we get a chance to queue the user-mode IRP to accept the connection - Change the non-blocking TDI helper functions to always return STATUS_PENDING if the completion function will be called to avoid duplicate handling of IRPs Modified: branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h Modified: branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/dll/win32… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Jun 24 14:57:29 2011 @@ -1986,6 +1986,9 @@ *lpcbBytesReturned = sizeof(ULONG); return NO_ERROR; } + case SIO_GET_EXTENSION_FUNCTION_POINTER: + *lpErrno = WSAEINVAL; + return SOCKET_ERROR; default: *lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext, Handle, Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c [iso-8859-1] Fri Jun 24 14:57:29 2011 @@ -520,24 +520,32 @@ TargetAddress->Options = FCB->ConnectOptions; TargetAddress->OptionsLength = FCB->ConnectOptionsSize; - Status = TdiConnect( &FCB->ConnectIrp.InFlightRequest, - FCB->Connection.Object, - TargetAddress, - FCB->ConnectInfo, - &FCB->ConnectIrp.Iosb, - StreamSocketConnectComplete, - FCB ); - - ExFreePool(TargetAddress); - AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); DbgPrint("[AFD, AfdStreamSocketConnect] Queueing IRP %x\n", Irp); - - if (Status == STATUS_PENDING) + + FCB->State = SOCKET_STATE_CONNECTING; + + AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); + Status = QueueUserModeIrp( FCB, Irp, FUNCTION_CONNECT ); + if (Status == STATUS_PENDING) { - FCB->State = SOCKET_STATE_CONNECTING; - return LeaveIrpUntilLater(FCB, Irp, FUNCTION_CONNECT); + Status = TdiConnect( &FCB->ConnectIrp.InFlightRequest, + FCB->Connection.Object, + TargetAddress, + FCB->ConnectInfo, + &FCB->ConnectIrp.Iosb, + StreamSocketConnectComplete, + FCB ); } + + if (Status != STATUS_PENDING) + FCB->State = SOCKET_STATE_BOUND; + + ExFreePool(TargetAddress); + + SocketStateUnlock(FCB); + + return Status; } break; Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c [iso-8859-1] Fri Jun 24 14:57:29 2011 @@ -358,13 +358,13 @@ return Status; } -NTSTATUS LeaveIrpUntilLater(PAFD_FCB FCB, PIRP Irp, UINT Function) +NTSTATUS QueueUserModeIrp(PAFD_FCB FCB, PIRP Irp, UINT Function) { NTSTATUS Status; /* Add the IRP to the queue in all cases (so AfdCancelHandler will work properly) */ InsertTailList( &FCB->PendingIrpList[Function], - &Irp->Tail.Overlay.ListEntry ); + &Irp->Tail.Overlay.ListEntry ); /* Acquire the cancel spin lock and check the cancel bit */ IoAcquireCancelSpinLock(&Irp->CancelIrql); @@ -389,8 +389,17 @@ AfdCancelHandler(IoGetCurrentIrpStackLocation(Irp)->DeviceObject, Irp); Status = STATUS_CANCELLED; } - - SocketStateUnlock(FCB); return Status; } + +NTSTATUS LeaveIrpUntilLater(PAFD_FCB FCB, PIRP Irp, UINT Function) +{ + NTSTATUS Status; + + Status = QueueUserModeIrp(FCB, Irp, Function); + + SocketStateUnlock( FCB ); + + return Status; +} Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Jun 24 14:57:29 2011 @@ -331,7 +331,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; AFD_DbgPrint(MAX_TRACE, ("Called\n")); @@ -368,9 +367,9 @@ ConnectionCallInfo, /* Request connection information */ ConnectionReturnInfo); /* Return connection information */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); - - return Status; + TdiCall(*Irp, DeviceObject, NULL, Iosb); + + return STATUS_PENDING; } @@ -388,7 +387,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -425,9 +423,7 @@ NULL, AddressHandle); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } NTSTATUS TdiDisassociateAddressFile( @@ -442,7 +438,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -475,9 +470,7 @@ NULL, NULL); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } NTSTATUS TdiListen @@ -499,7 +492,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; AFD_DbgPrint(MAX_TRACE, ("[AFD, TDIListen] Called\n")); DbgPrint("[AFD, TDIListen] Called\n"); @@ -536,11 +528,9 @@ *RequestConnectionInfo, /* Request connection information */ *ReturnConnectionInfo); /* Return connection information */ - Status = TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); - - DbgPrint("[AFD, TDIListen] Done. Status = 0x%x\n", Status); - - return Status; + TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); + + return STATUS_PENDING; } @@ -564,7 +554,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -602,9 +591,7 @@ Handler, Context); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } @@ -685,7 +672,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -720,9 +706,7 @@ QueryType, MdlBuffer); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } NTSTATUS TdiQueryInformationEx( @@ -912,7 +896,6 @@ PVOID CompletionContext ) { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status = STATUS_SUCCESS; PMDL Mdl; ASSERT(*Irp == NULL); @@ -975,11 +958,11 @@ Flags, /* Flags */ BufferLength); /* Length of data */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion routine. */ - return Status; + return STATUS_PENDING; } NTSTATUS TdiReceive( @@ -992,7 +975,6 @@ PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) { - NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT DeviceObject; PMDL Mdl; @@ -1043,7 +1025,7 @@ AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); IoCompleteRequest(*Irp, IO_NO_INCREMENT); - *Irp = NULL; + *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -1059,14 +1041,11 @@ BufferLength); /* Length of data */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion routine. */ - AFD_DbgPrint(MID_TRACE,("Status %x Information %d\n", - Status, Iosb->Information)); - - return Status; + return STATUS_PENDING; } @@ -1093,7 +1072,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; PMDL Mdl; ASSERT(*Irp == NULL); @@ -1159,11 +1137,11 @@ Addr, Flags); /* Length of data */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion routine. */ - return Status; + return STATUS_PENDING; } @@ -1189,7 +1167,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; PMDL Mdl; ASSERT(*Irp == NULL); @@ -1256,11 +1233,11 @@ BufferLength, /* Bytes to send */ Addr); /* Address */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the send completion routine. */ - return Status; + return STATUS_PENDING; } NTSTATUS TdiDisconnect( @@ -1273,7 +1250,6 @@ PTDI_CONNECTION_INFORMATION RequestConnectionInfo, PTDI_CONNECTION_INFORMATION ReturnConnectionInfo) { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -1315,9 +1291,7 @@ RequestConnectionInfo, /* Indication of who to disconnect */ ReturnConnectionInfo); /* Indication of who disconnected */ - Status = TdiCall(Irp, DeviceObject, &Event, Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, Iosb); } /* EOF */ Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/include/afd.h [iso-8859-1] Fri Jun 24 14:57:29 2011 @@ -302,10 +302,14 @@ PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); PVOID GetLockedData( PIRP Irp, PIO_STACK_LOCATION IrpSp ); +NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ); +NTSTATUS QueueUserModeIrp(PAFD_FCB FCB, PIRP Irp, UINT Function); + +NTSTATUS LeaveIrpUntilLater(PAFD_FCB FCB, PIRP Irp, UINT Function); +NTSTATUS QueueUserModeIrp(PAFD_FCB FCB, PIRP Irp, UINT Function); /* main.c */ -NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ); VOID DestroySocket( PAFD_FCB FCB ); VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, PIRP Irp);

13 years, 6 months

[agreen] 52442: Fix formatting for previous commit * foo=bar > foo = bar

by agreen＠svn.reactos.org

Author: agreen Date: Fri Jun 24 14:33:59 2011 New Revision: 52442 URL: http://svn.reactos.org/svn/reactos?rev=52442&view=rev Log: Fix formatting for previous commit * foo=bar > foo = bar Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c Modified: branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/NewExplorer/base/shel… ============================================================================== --- branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c [iso-8859-1] (original) +++ branches/GSoC_2011/NewExplorer/base/shell/explorer-new/traywnd.c [iso-8859-1] Fri Jun 24 14:33:59 2011 @@ -1886,17 +1886,17 @@ switch (This->Position) { case ABE_LEFT: - backoundPart=TBP_BACKGROUNDLEFT; + backoundPart = TBP_BACKGROUNDLEFT; break; case ABE_TOP: - backoundPart=TBP_BACKGROUNDTOP; + backoundPart = TBP_BACKGROUNDTOP; break; case ABE_RIGHT: - backoundPart=TBP_BACKGROUNDRIGHT; + backoundPart = TBP_BACKGROUNDRIGHT; break; case ABE_BOTTOM: default: - backoundPart=TBP_BACKGROUNDBOTTOM; + backoundPart = TBP_BACKGROUNDBOTTOM; break; } DrawThemeBackground(This->TaskbarTheme, dc, backoundPart, 0, &rect, 0); @@ -1918,21 +1918,21 @@ switch (This->Position) { case ABE_LEFT: - backoundPart=TBP_SIZINGBARLEFT; - rect.left=rect.right-GetSystemMetrics(SM_CXSIZEFRAME); + backoundPart = TBP_SIZINGBARLEFT; + rect.left = rect.right-GetSystemMetrics(SM_CXSIZEFRAME); break; case ABE_TOP: - backoundPart=TBP_SIZINGBARTOP; - rect.top=rect.bottom-GetSystemMetrics(SM_CYSIZEFRAME); + backoundPart = TBP_SIZINGBARTOP; + rect.top = rect.bottom-GetSystemMetrics(SM_CYSIZEFRAME); break; case ABE_RIGHT: - backoundPart=TBP_SIZINGBARRIGHT; - rect.right=rect.left+GetSystemMetrics(SM_CXSIZEFRAME); + backoundPart = TBP_SIZINGBARRIGHT; + rect.right = rect.left+GetSystemMetrics(SM_CXSIZEFRAME); break; case ABE_BOTTOM: default: - backoundPart=TBP_SIZINGBARBOTTOM; - rect.bottom=rect.top+GetSystemMetrics(SM_CYSIZEFRAME); + backoundPart = TBP_SIZINGBARBOTTOM; + rect.bottom = rect.top+GetSystemMetrics(SM_CYSIZEFRAME); break; } @@ -2053,7 +2053,7 @@ (MapWindowPoints(hwnd, NULL, (LPPOINT)&rcClient, - 2) != 0 || GetLastError()!=0)) + 2) != 0 || GetLastError() != 0)) { pt.x = (SHORT)LOWORD(lParam); pt.y = (SHORT)HIWORD(lParam);

13 years, 6 months

[cgutman] 52441: [AFD] - Queue the user-mode connect IRP before calling TdiConnect to avoid a race if the TDI_CONNECT IRP is completed before we get a chance to queue the user-mode IRP to accept th...

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 24 14:06:48 2011 New Revision: 52441 URL: http://svn.reactos.org/svn/reactos?rev=52441&view=rev Log: [AFD] - Queue the user-mode connect IRP before calling TdiConnect to avoid a race if the TDI_CONNECT IRP is completed before we get a chance to queue the user-mode IRP to accept the connection - Change the non-blocking TDI helper functions to always return STATUS_PENDING if the completion function will be called to avoid duplicate handling of IRPs Modified: trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/tdi.c trunk/reactos/drivers/network/afd/include/afd.h 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 Jun 24 14:06:48 2011 @@ -465,23 +465,30 @@ TargetAddress->UserDataLength = FCB->ConnectDataSize; TargetAddress->Options = FCB->ConnectOptions; TargetAddress->OptionsLength = FCB->ConnectOptionsSize; - - Status = TdiConnect( &FCB->ConnectIrp.InFlightRequest, - FCB->Connection.Object, - TargetAddress, - FCB->ConnectInfo, - &FCB->ConnectIrp.Iosb, - StreamSocketConnectComplete, - FCB ); - - ExFreePool(TargetAddress); - - AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); - - if( Status == STATUS_PENDING ) { - FCB->State = SOCKET_STATE_CONNECTING; - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_CONNECT ); - } + + FCB->State = SOCKET_STATE_CONNECTING; + + AFD_DbgPrint(MID_TRACE,("Queueing IRP %x\n", Irp)); + Status = QueueUserModeIrp( FCB, Irp, FUNCTION_CONNECT ); + if (Status == STATUS_PENDING) + { + Status = TdiConnect( &FCB->ConnectIrp.InFlightRequest, + FCB->Connection.Object, + TargetAddress, + FCB->ConnectInfo, + &FCB->ConnectIrp.Iosb, + StreamSocketConnectComplete, + FCB ); + } + + if (Status != STATUS_PENDING) + FCB->State = SOCKET_STATE_BOUND; + + ExFreePool(TargetAddress); + + SocketStateUnlock(FCB); + + return Status; } break; 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] Fri Jun 24 14:06:48 2011 @@ -287,12 +287,13 @@ return Status; } -NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { +NTSTATUS QueueUserModeIrp(PAFD_FCB FCB, PIRP Irp, UINT Function) +{ NTSTATUS Status; /* Add the IRP to the queue in all cases (so AfdCancelHandler will work properly) */ InsertTailList( &FCB->PendingIrpList[Function], - &Irp->Tail.Overlay.ListEntry ); + &Irp->Tail.Overlay.ListEntry ); /* Acquire the cancel spin lock and check the cancel bit */ IoAcquireCancelSpinLock(&Irp->CancelIrql); @@ -319,6 +320,14 @@ Status = STATUS_CANCELLED; } + return Status; +} + +NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ) { + NTSTATUS Status; + + Status = QueueUserModeIrp(FCB, Irp, Function); + SocketStateUnlock( FCB ); return Status; 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 Jun 24 14:06:48 2011 @@ -325,7 +325,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; AFD_DbgPrint(MAX_TRACE, ("Called\n")); @@ -360,9 +359,9 @@ ConnectionCallInfo, /* Request connection information */ ConnectionReturnInfo); /* Return connection information */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); - - return Status; + TdiCall(*Irp, DeviceObject, NULL, Iosb); + + return STATUS_PENDING; } @@ -380,7 +379,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -415,9 +413,7 @@ NULL, AddressHandle); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } NTSTATUS TdiDisassociateAddressFile( @@ -432,7 +428,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -465,9 +460,7 @@ NULL, NULL); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } NTSTATUS TdiListen @@ -489,7 +482,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; AFD_DbgPrint(MAX_TRACE, ("Called\n")); @@ -523,9 +515,9 @@ *RequestConnectionInfo, /* Request connection information */ *ReturnConnectionInfo); /* Return connection information */ - Status = TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); - - return Status; + TdiCall(*Irp, DeviceObject, NULL /* Don't wait for completion */, Iosb); + + return STATUS_PENDING; } @@ -549,7 +541,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -587,9 +578,7 @@ Handler, Context); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } @@ -670,7 +659,6 @@ { PDEVICE_OBJECT DeviceObject; IO_STATUS_BLOCK Iosb; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -705,9 +693,7 @@ QueryType, MdlBuffer); - Status = TdiCall(Irp, DeviceObject, &Event, &Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, &Iosb); } NTSTATUS TdiQueryInformationEx( @@ -897,7 +883,6 @@ PVOID CompletionContext ) { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status = STATUS_SUCCESS; PMDL Mdl; ASSERT(*Irp == NULL); @@ -960,11 +945,11 @@ Flags, /* Flags */ BufferLength); /* Length of data */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion routine. */ - return Status; + return STATUS_PENDING; } NTSTATUS TdiReceive( @@ -977,7 +962,6 @@ PIO_COMPLETION_ROUTINE CompletionRoutine, PVOID CompletionContext) { - NTSTATUS Status = STATUS_SUCCESS; PDEVICE_OBJECT DeviceObject; PMDL Mdl; @@ -1028,7 +1012,7 @@ AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); IoFreeMdl(Mdl); IoCompleteRequest(*Irp, IO_NO_INCREMENT); - *Irp = NULL; + *Irp = NULL; _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; @@ -1044,14 +1028,11 @@ BufferLength); /* Length of data */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion routine. */ - AFD_DbgPrint(MID_TRACE,("Status %x Information %d\n", - Status, Iosb->Information)); - - return Status; + return STATUS_PENDING; } @@ -1078,7 +1059,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; PMDL Mdl; ASSERT(*Irp == NULL); @@ -1144,11 +1124,11 @@ Addr, Flags); /* Length of data */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the receive completion routine. */ - return Status; + return STATUS_PENDING; } @@ -1174,7 +1154,6 @@ */ { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; PMDL Mdl; ASSERT(*Irp == NULL); @@ -1241,11 +1220,11 @@ BufferLength, /* Bytes to send */ Addr); /* Address */ - Status = TdiCall(*Irp, DeviceObject, NULL, Iosb); + TdiCall(*Irp, DeviceObject, NULL, Iosb); /* Does not block... The MDL is deleted in the send completion routine. */ - return Status; + return STATUS_PENDING; } NTSTATUS TdiDisconnect( @@ -1258,7 +1237,6 @@ PTDI_CONNECTION_INFORMATION RequestConnectionInfo, PTDI_CONNECTION_INFORMATION ReturnConnectionInfo) { PDEVICE_OBJECT DeviceObject; - NTSTATUS Status; KEVENT Event; PIRP Irp; @@ -1300,9 +1278,7 @@ RequestConnectionInfo, /* Indication of who to disconnect */ ReturnConnectionInfo); /* Indication of who disconnected */ - Status = TdiCall(Irp, DeviceObject, &Event, Iosb); - - return Status; + return TdiCall(Irp, DeviceObject, &Event, Iosb); } /* EOF */ Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Fri Jun 24 14:06:48 2011 @@ -302,11 +302,12 @@ PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); PVOID GetLockedData( PIRP Irp, PIO_STACK_LOCATION IrpSp ); +NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ); +NTSTATUS QueueUserModeIrp(PAFD_FCB FCB, PIRP Irp, UINT Function); /* main.c */ VOID OskitDumpBuffer( PCHAR Buffer, UINT Len ); -NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function ); VOID DestroySocket( PAFD_FCB FCB ); VOID NTAPI AfdCancelHandler(PDEVICE_OBJECT DeviceObject, PIRP Irp);

13 years, 6 months

[akhaldi] 52440: [CMAKE] * Fix psdk and dxsdk in the USER_WDK_HEADERS mode.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 24 12:12:27 2011 New Revision: 52440 URL: http://svn.reactos.org/svn/reactos?rev=52440&view=rev Log: [CMAKE] * Fix psdk and dxsdk in the USER_WDK_HEADERS mode. Modified: trunk/reactos/include/dxsdk/CMakeLists.txt trunk/reactos/include/psdk/CMakeLists.txt Modified: trunk/reactos/include/dxsdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/CMakeLists.t… ============================================================================== --- trunk/reactos/include/dxsdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/dxsdk/CMakeLists.txt [iso-8859-1] Fri Jun 24 12:12:27 2011 @@ -1,3 +1,5 @@ + +include_directories(${REACTOS_SOURCE_DIR}/include/psdk) list(APPEND SOURCE amstream.idl Modified: trunk/reactos/include/psdk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/CMakeLists.tx… ============================================================================== --- trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/include/psdk/CMakeLists.txt [iso-8859-1] Fri Jun 24 12:12:27 2011 @@ -1,5 +1,7 @@ add_definitions(-D_MIDL_USE_GUIDDEF_) + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) list(APPEND SOURCE # access.idl

13 years, 6 months

[akhaldi] 52439: [CMAKE] * Add a way to use WDK headers (psdk, crt and ddk) instead of ours. To use it, just alter USE_WDK_HEADERS in configure.cmd to be 1 instead of 0.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 24 12:08:57 2011 New Revision: 52439 URL: http://svn.reactos.org/svn/reactos?rev=52439&view=rev Log: [CMAKE] * Add a way to use WDK headers (psdk, crt and ddk) instead of ours. To use it, just alter USE_WDK_HEADERS in configure.cmd to be 1 instead of 0. Modified: trunk/reactos/CMakeLists.txt trunk/reactos/configure.cmd Modified: trunk/reactos/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/CMakeLists.txt?rev=52439&r… ============================================================================== --- trunk/reactos/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/CMakeLists.txt [iso-8859-1] Fri Jun 24 12:08:57 2011 @@ -152,19 +152,36 @@ # Activate language support for resource files enable_language(RC) - include_directories( - include - include/psdk - include/dxsdk - ${REACTOS_BINARY_DIR}/include - ${REACTOS_BINARY_DIR}/include/dxsdk - ${REACTOS_BINARY_DIR}/include/psdk - ${REACTOS_BINARY_DIR}/include/reactos - include/crt - include/ddk - include/ndk - include/reactos - include/reactos/libs) + if(MSVC AND USE_WDK_HEADERS) + include_directories( + include + $ENV{SDK_INC_PATH} + include/dxsdk + ${REACTOS_BINARY_DIR}/include + ${REACTOS_BINARY_DIR}/include/dxsdk + ${REACTOS_BINARY_DIR}/include/psdk + ${REACTOS_BINARY_DIR}/include/reactos + $ENV{CRT_INC_PATH} + $ENV{DDK_INC_PATH} + include/ndk + include/reactos + include/reactos/libs) + else() + include_directories( + include + include/psdk + include/dxsdk + ${REACTOS_BINARY_DIR}/include + ${REACTOS_BINARY_DIR}/include/dxsdk + ${REACTOS_BINARY_DIR}/include/psdk + ${REACTOS_BINARY_DIR}/include/reactos + include/crt + include/ddk + include/ndk + include/reactos + include/reactos/libs) + endif() + if(ARCH MATCHES arm) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm) Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=52439&r1… ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Fri Jun 24 12:08:57 2011 @@ -18,6 +18,7 @@ ) set BUILD_ENVIRONMENT=WDK set USE_NMAKE=1 + set USE_WDK_HEADERS=0 echo Detected DDK/WDK for %DDK_TARGET_OS%-%ARCH% )else if defined VCINSTALLDIR ( :: VS command prompt does not put this in enviroment vars @@ -118,7 +119,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" ( cmake -G "MinGW Makefiles" -DENABLE_CCACHE=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% ) else if defined USE_NMAKE ( - cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% + cmake -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DUSE_WDK_HEADERS=%USE_WDK_HEADERS% -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR% ) else if "%BUILD_ENVIRONMENT%" == "VS8" ( if "%ARCH%" == "amd64" ( cmake -G "Visual Studio 8 2005 Win64" -DCMAKE_TOOLCHAIN_FILE=toolchain-msvc.cmake -DARCH=%ARCH% -DREACTOS_BUILD_TOOLS_DIR:DIR="%REACTOS_BUILD_TOOLS_DIR%" %REACTOS_SOURCE_DIR%

13 years, 6 months

[cgutman] 52438: [MSAFD] - Fail SIO_GET_EXTENSION_FUNCTION_POINTER - Fixes the crash during ws2_32_winetest sock - In my testing, "sock: 4374916 tests executed (0 marked as todo, 93 failures), 6 sk...

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 24 04:31:31 2011 New Revision: 52438 URL: http://svn.reactos.org/svn/reactos?rev=52438&view=rev Log: [MSAFD] - Fail SIO_GET_EXTENSION_FUNCTION_POINTER - Fixes the crash during ws2_32_winetest sock - In my testing, "sock: 4374916 tests executed (0 marked as todo, 93 failures), 6 skipped." Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Fri Jun 24 04:31:31 2011 @@ -1986,6 +1986,9 @@ *lpcbBytesReturned = sizeof(ULONG); return NO_ERROR; } + case SIO_GET_EXTENSION_FUNCTION_POINTER: + *lpErrno = WSAEINVAL; + return SOCKET_ERROR; default: *lpErrno = Socket->HelperData->WSHIoctl(Socket->HelperContext, Handle,

13 years, 6 months

[cgutman] 52437: [IP] - Fix copying of the remote address when satisfying an accept request - accept() and WSAAccept() no longer report strange peer addresses - Fixes a few ws2_32_winetest sock tests

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 24 03:35:30 2011 New Revision: 52437 URL: http://svn.reactos.org/svn/reactos?rev=52437&view=rev Log: [IP] - Fix copying of the remote address when satisfying an accept request - accept() and WSAAccept() no longer report strange peer addresses - Fixes a few ws2_32_winetest sock tests Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Fri Jun 24 03:35:30 2011 @@ -39,24 +39,19 @@ TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status)); if( NT_SUCCESS(Status) && Status != STATUS_PENDING ) { - RequestAddressReturn = WhoIsConnecting->RemoteAddress; + RequestAddressReturn = WhoIsConnecting->RemoteAddress; - TI_DbgPrint(DEBUG_TCP,("Copying address to %x (Who %x)\n", - RequestAddressReturn, WhoIsConnecting)); + TI_DbgPrint(DEBUG_TCP,("Copying address to %x (Who %x)\n", + RequestAddressReturn, WhoIsConnecting)); RequestAddressReturn->TAAddressCount = 1; - RequestAddressReturn->Address[0].AddressLength = OutAddrLen; + RequestAddressReturn->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP; + RequestAddressReturn->Address[0].AddressType = TDI_ADDRESS_TYPE_IP; + RequestAddressReturn->Address[0].Address[0].sin_port = OutAddr.sin_port; + RequestAddressReturn->Address[0].Address[0].in_addr = OutAddr.sin_addr.s_addr; + RtlZeroMemory(RequestAddressReturn->Address[0].Address[0].sin_zero, 8); - /* BSD uses the first byte of the sockaddr struct as a length. - * Since windows doesn't do that we strip it */ - RequestAddressReturn->Address[0].AddressType = - (OutAddr.sin_family >> 8) & 0xff; - - RtlCopyMemory( &RequestAddressReturn->Address[0].Address, - ((PCHAR)&OutAddr) + sizeof(USHORT), - sizeof(RequestAddressReturn->Address[0].Address[0]) ); - - TI_DbgPrint(DEBUG_TCP,("Done copying\n")); + TI_DbgPrint(DEBUG_TCP,("Done copying\n")); } TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status));

13 years, 6 months

[cgutman] 52436: [VFATLIB] - Don't overwrite format status with lock status

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jun 24 01:36:32 2011 New Revision: 52436 URL: http://svn.reactos.org/svn/reactos?rev=52436&view=rev Log: [VFATLIB] - Don't overwrite format status with lock status Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatlib/vfatlib.… ============================================================================== --- trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatlib/vfatlib.c [iso-8859-1] Fri Jun 24 01:36:32 2011 @@ -32,7 +32,7 @@ HANDLE FileHandle; PARTITION_INFORMATION PartitionInfo; FORMAT_CONTEXT Context; - NTSTATUS Status; + NTSTATUS Status, LockStatus; DPRINT("VfatFormat(DriveRoot '%wZ')\n", DriveRoot); @@ -194,20 +194,20 @@ Context.Percent = 0; Callback (PROGRESS, 0, (PVOID)&Context.Percent); } - - Status = NtFsControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_LOCK_VOLUME, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", Status); + + LockStatus = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_LOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", LockStatus); } if (PartitionInfo.PartitionType == PARTITION_FAT_12) @@ -250,20 +250,20 @@ { Status = STATUS_INVALID_PARAMETER; } - - Status = NtFsControlFile(FileHandle, - NULL, - NULL, - NULL, - &Iosb, - FSCTL_UNLOCK_VOLUME, - NULL, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Failed to unlock volume (Status: 0x%x)\n", Status); + + LockStatus = NtFsControlFile(FileHandle, + NULL, + NULL, + NULL, + &Iosb, + FSCTL_UNLOCK_VOLUME, + NULL, + 0, + NULL, + 0); + if (!NT_SUCCESS(LockStatus)) + { + DPRINT1("Failed to unlock volume (Status: 0x%x)\n", LockStatus); } NtClose(FileHandle);

13 years, 6 months

← Newer
1
2
3
4
5
6
7
8
9
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2011