Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cgutman] 52405: [IP] - Don't attempt to service a request if the only flag specified was SEL_FIN - Handle TDI_DISCONNECT_RELEASE properly [OSKITTCP] - Verify that the socket is in a legal state to...

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jun 21 16:23:27 2011 New Revision: 52405 URL: http://svn.reactos.org/svn/reactos?rev=52405&view=rev Log: [IP] - Don't attempt to service a request if the only flag specified was SEL_FIN - Handle TDI_DISCONNECT_RELEASE properly [OSKITTCP] - Verify that the socket is in a legal state to do a send or receive - Don't indicate send and receive events when the socket is not connected or has been been closed in that particular direction - Add a small hack to soshutdown so shutdown in the send direction works correctly (ie. doesn't shutdown receive) - Fixes the hangs in ws2_32_apitest ioctlsocket and ws2_32_apitest recv Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c 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] Tue Jun 21 16:23:27 2011 @@ -69,10 +69,17 @@ TI_DbgPrint(DEBUG_TCP,("Getting the socket\n")); - Status = TCPServiceListeningSocket - ( Connection->AddressFile->Listener, - Bucket->AssociatedEndpoint, - (PTDI_REQUEST_KERNEL)&IrpSp->Parameters ); + if (Connection->SignalState & SEL_ACCEPT) + { + Status = TCPServiceListeningSocket(Connection->AddressFile->Listener, + Bucket->AssociatedEndpoint, + (PTDI_REQUEST_KERNEL)&IrpSp->Parameters); + } + else + { + /* We got here because of a SEL_FIN event */ + Status = STATUS_CANCELLED; + } TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n")); @@ -121,12 +128,19 @@ Connection->SocketContext)); TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer)); - Status = TCPTranslateError - ( OskitTCPRecv( Connection->SocketContext, - RecvBuffer, - RecvLen, - &Received, - 0 ) ); + if (Connection->SignalState & SEL_READ) + { + Status = TCPTranslateError(OskitTCPRecv(Connection->SocketContext, + RecvBuffer, + RecvLen, + &Received, + 0)); + } + else + { + /* We got here because of a SEL_FIN event */ + Status = STATUS_CANCELLED; + } TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received)); @@ -175,12 +189,19 @@ ("Connection->SocketContext: %x\n", Connection->SocketContext)); - Status = TCPTranslateError - ( OskitTCPSend( Connection->SocketContext, - SendBuffer, - SendLen, - &Sent, - 0 ) ); + if (Connection->SignalState & SEL_WRITE) + { + Status = TCPTranslateError(OskitTCPSend(Connection->SocketContext, + SendBuffer, + SendLen, + &Sent, + 0)); + } + else + { + /* We got here because of a SEL_FIN event */ + Status = STATUS_CANCELLED; + } TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent)); @@ -648,7 +669,7 @@ LockObject(Connection, &OldIrql); if (Flags & TDI_DISCONNECT_RELEASE) - Status = TCPTranslateError(OskitTCPDisconnect(Connection->SocketContext)); + Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE)); if ((Flags & TDI_DISCONNECT_ABORT) || !Flags) Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD)); Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Tue Jun 21 16:23:27 2011 @@ -148,6 +148,7 @@ OSK_UINT Len, OSK_UINT *OutLen, OSK_UINT Flags ) { + struct socket *so = connection; struct uio uio = { 0 }; struct iovec iov = { 0 }; int error = 0; @@ -155,9 +156,12 @@ if (!connection) return OSK_ESHUTDOWN; + + if (so->so_state & SS_CANTRCVMORE) + return OSK_ESHUTDOWN; OS_DbgPrint(OSK_MID_TRACE, - ("so->so_state %x\n", ((struct socket *)connection)->so_state)); + ("so->so_state %x\n", so->so_state)); if( Flags & OSK_MSG_OOB ) tcp_flags |= MSG_OOB; if( Flags & OSK_MSG_DONTWAIT ) tcp_flags |= MSG_DONTWAIT; @@ -290,11 +294,15 @@ int OskitTCPSend( void *socket, OSK_PCHAR Data, OSK_UINT Len, OSK_UINT *OutLen, OSK_UINT flags ) { + struct socket *so = socket; int error; struct uio uio; struct iovec iov; if (!socket) + return OSK_ESHUTDOWN; + + if (so->so_state & SS_CANTSENDMORE) return OSK_ESHUTDOWN; iov.iov_len = Len; Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] Tue Jun 21 16:23:27 2011 @@ -31,11 +31,13 @@ OS_DbgPrint(OSK_MID_TRACE,("Socket accepting q\n")); flags |= SEL_ACCEPT; } - if( so->so_rcv.sb_cc > 0 ) { + if( so->so_rcv.sb_cc > 0 && !(so->so_state & SS_CANTRCVMORE) && + (so->so_state & SS_ISCONNECTED) ) { OS_DbgPrint(OSK_MID_TRACE,("Socket readable\n")); flags |= SEL_READ; } - if( 0 < sbspace(&so->so_snd) ) { + if( 0 < sbspace(&so->so_snd) && !(so->so_state & SS_CANTSENDMORE) && + (so->so_state & SS_ISCONNECTED) ) { OS_DbgPrint(OSK_MID_TRACE,("Socket writeable\n")); flags |= SEL_WRITE; } @@ -51,7 +53,7 @@ if( OtcpEvent.SocketState ) OtcpEvent.SocketState( OtcpEvent.ClientData, so, - so ? so->so_connection : 0, + so->so_connection, flags ); if( OtcpEvent.Wakeup ) Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c [iso-8859-1] Tue Jun 21 16:23:27 2011 @@ -826,7 +826,13 @@ { register struct protosw *pr = so->so_proto; +#ifndef __REACTOS__ + /* Reads are always killed whether we want + * them stopped or not. We don't want this + * happening on ROS so this code is commented out + */ how++; +#endif if (how & FREAD) sorflush(so); if (how & FWRITE)

13 years, 6 months

[rharabien] 52404: [NTOSKRNL] - Display boot blue bitmap when native application or kernel calls NtDisplayString with string displaying enabled - Fix drawing order in Phase1InitializationDiscard

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Jun 21 15:53:02 2011 New Revision: 52404 URL: http://svn.reactos.org/svn/reactos?rev=52404&view=rev Log: [NTOSKRNL] - Display boot blue bitmap when native application or kernel calls NtDisplayString with string displaying enabled - Fix drawing order in Phase1InitializationDiscard Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/inbv/inbv.c trunk/reactos/ntoskrnl/include/internal/inbv.h Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=524… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Tue Jun 21 15:53:02 2011 @@ -1904,32 +1904,29 @@ /* Initialize Power Subsystem in Phase 1*/ if (!PoInitSystem(1)) KeBugCheck(INTERNAL_POWER_ERROR); + /* Update progress bar */ + InbvUpdateProgressBar(90); + /* Initialize the Process Manager at Phase 1 */ if (!PsInitSystem(LoaderBlock)) KeBugCheck(PROCESS1_INITIALIZATION_FAILED); - - /* Update progress bar */ - InbvUpdateProgressBar(85); /* Make sure nobody touches the loader block again */ if (LoaderBlock == KeLoaderBlock) KeLoaderBlock = NULL; LoaderBlock = Context = NULL; /* Update progress bar */ - InbvUpdateProgressBar(90); + InbvUpdateProgressBar(100); + + /* Clean the screen */ + if (InbvBootDriverInstalled) FinalizeBootLogo(); + + /* Allow strings to be displayed */ + InbvEnableDisplayString(TRUE); /* Launch initial process */ DPRINT1("Free non-cache pages: %lx\n", MmAvailablePages + MiMemoryConsumers[MC_CACHE].PagesUsed); ProcessInfo = &InitBuffer->ProcessInfo; ExpLoadInitialProcess(InitBuffer, &ProcessParameters, &Environment); - - /* Clean the screen */ - if (InbvBootDriverInstalled) FinalizeBootLogo(); - - /* Update progress bar */ - InbvUpdateProgressBar(100); - - /* Allow strings to be displayed */ - InbvEnableDisplayString(TRUE); /* Wait 5 seconds for initial process to initialize */ Timeout.QuadPart = Int32x32To64(5, -10000000); Modified: trunk/reactos/ntoskrnl/inbv/inbv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/inbv/inbv.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/inbv/inbv.c [iso-8859-1] Tue Jun 21 15:53:02 2011 @@ -576,7 +576,7 @@ VOID NTAPI INIT_FUNCTION -DisplayBootBitmap(IN BOOLEAN SosMode) +DisplayBootBitmap(IN BOOLEAN TextMode) { PVOID Header, Band, Text, Screen; ROT_BAR_TYPE TempRotBarSelection = RB_UNSPECIFIED; @@ -591,9 +591,9 @@ InbvReleaseLock(); } - /* Check if this is SOS mode */ + /* Check if this is text mode */ ShowProgressBar = FALSE; - if (SosMode) + if (TextMode) { /* Check if this is a server OS */ if (SharedUserData->NtProductType == NtProductWinNt) @@ -696,6 +696,9 @@ /* Draw the progress bar bit */ // if (Bar) InbvBitBlt(Bar, 0, 0); + + /* Set filter which will draw text display if needed */ + InbvInstallDisplayStringFilter(DisplayFilter); } /* Do we have a system thread? */ @@ -712,6 +715,18 @@ VOID NTAPI INIT_FUNCTION +DisplayFilter(PCHAR *String) +{ + /* Remove the filter */ + InbvInstallDisplayStringFilter(NULL); + + /* Draw text screen */ + DisplayBootBitmap(TRUE); +} + +VOID +NTAPI +INIT_FUNCTION FinalizeBootLogo(VOID) { /* Acquire lock and check the display state */ Modified: trunk/reactos/ntoskrnl/include/internal/inbv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/inbv.h [iso-8859-1] Tue Jun 21 15:53:02 2011 @@ -42,7 +42,13 @@ VOID NTAPI DisplayBootBitmap( - IN BOOLEAN SosMode + IN BOOLEAN TextMode +); + +VOID +NTAPI +DisplayFilter( + IN PCHAR *String ); VOID

13 years, 6 months

[tkreuzer] 52403: Merge missing tuff from r51731 - Improve a DPRINT - Initialize a global variable

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 21 14:45:17 2011 New Revision: 52403 URL: http://svn.reactos.org/svn/reactos?rev=52403&view=rev Log: Merge missing tuff from r51731 - Improve a DPRINT - Initialize a global variable Modified: trunk/reactos/base/setup/usetup/filesup.c trunk/reactos/ntoskrnl/ke/i386/cpu.c Modified: trunk/reactos/base/setup/usetup/filesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/filesup.… ============================================================================== --- trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/filesup.c [iso-8859-1] Tue Jun 21 14:45:17 2011 @@ -126,7 +126,7 @@ FILE_SEQUENTIAL_ONLY); if(!NT_SUCCESS(Status)) { - DPRINT1("NtOpenFile failed: %x\n", Status); + DPRINT1("NtOpenFile failed: %x, %wZ\n", Status, &FileName); goto done; } #else Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Tue Jun 21 14:45:17 2011 @@ -41,7 +41,7 @@ ULONG KeIcacheFlushCount = 0; ULONG KiDmaIoCoherency = 0; ULONG KePrefetchNTAGranularity = 32; -CHAR KeNumberProcessors; +CHAR KeNumberProcessors = 0; KAFFINITY KeActiveProcessors = 1; BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent;

13 years, 6 months

[cgutman] 52402: [AFD] - Remove extra cruft around the TdiReceive call - Handle send and receive requests better after a socket closure

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jun 21 13:59:49 2011 New Revision: 52402 URL: http://svn.reactos.org/svn/reactos?rev=52402&view=rev Log: [AFD] - Remove extra cruft around the TdiReceive call - Handle send and receive requests better after a socket closure Modified: trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Tue Jun 21 13:59:49 2011 @@ -47,24 +47,18 @@ } static VOID RefillSocketBuffer( PAFD_FCB FCB ) { - NTSTATUS Status; - if( !FCB->ReceiveIrp.InFlightRequest && !(FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_ABORT)) ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); - 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) - { - HandleEOFOnIrp(FCB, Status, FCB->ReceiveIrp.Iosb.Information); - } + TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); } } @@ -163,12 +157,23 @@ TotalBytesCopied)); UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); - Status = NextIrp->IoStatus.Status = FCB->PollStatus[FD_CLOSE_BIT]; + if (FCB->Overread && FCB->PollStatus[FD_CLOSE_BIT] == STATUS_SUCCESS) + { + /* Overread after a graceful disconnect so complete with an error */ + Status = STATUS_FILE_CLOSED; + } + else + { + /* Unexpected disconnect by the remote host or initial read after a graceful disconnnect */ + Status = FCB->PollStatus[FD_CLOSE_BIT]; + } + NextIrp->IoStatus.Status = Status; NextIrp->IoStatus.Information = 0; if( NextIrp == Irp ) RetStatus = Status; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + FCB->Overread = TRUE; } } else { /* Kick the user that receive would be possible now */ Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Tue Jun 21 13:59:49 2011 @@ -286,6 +286,20 @@ UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); } + + if (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)) + { + if (FCB->PollStatus[FD_CLOSE_BIT] == STATUS_SUCCESS) + { + /* This is a local send shutdown or a graceful remote disconnect */ + return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); + } + else + { + /* This is an unexpected remote disconnect */ + return UnlockAndMaybeComplete(FCB, FCB->PollStatus[FD_CLOSE_BIT], Irp, 0); + } + } if( !(SendReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete

13 years, 6 months

[tkreuzer] 52401: [OLEAUT32] - add assembly version of call_method for MSVC - fix a syntax error (sizeof(int[3]) is not valid C) - move definitions to the top of the CMakeLists.txt

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 21 13:22:07 2011 New Revision: 52401 URL: http://svn.reactos.org/svn/reactos?rev=52401&view=rev Log: [OLEAUT32] - add assembly version of call_method for MSVC - fix a syntax error (sizeof(int[3]) is not valid C) - move definitions to the top of the CMakeLists.txt Added: trunk/reactos/dll/win32/oleaut32/msvc.S (with props) Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt trunk/reactos/dll/win32/oleaut32/typelib2.c Modified: trunk/reactos/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Tue Jun 21 13:22:07 2011 @@ -1,3 +1,24 @@ + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + +add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}") + +add_definitions( + -D__WINESRC__ + -DCOM_NO_WINDOWS_H + -D_OLEAUT32_ + -DPROXY_DELEGATION + -DREGISTER_PROXY_DLL + -DENTRY_PREFIX=OLEAUTPS_) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg + ${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(oleaut32.dll oleaut32.spec) + +add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) list(APPEND SOURCE connpt.c @@ -25,32 +46,12 @@ ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_ocidl_p.c ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - -add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}") - -add_definitions( - -D__WINESRC__ - -DCOM_NO_WINDOWS_H - -D_OLEAUT32_ - -DPROXY_DELEGATION - -DREGISTER_PROXY_DLL - -DENTRY_PREFIX=OLEAUTPS_) - -if(MSC) -# seems to work, but is this correct ? -# <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> -add_definitions(/FIwine/typeof.h) -endif(MSC) - -include_directories( - ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg - ${REACTOS_SOURCE_DIR}/include/reactos/wine) - -spec2def(oleaut32.dll oleaut32.spec) - -add_rpcproxy_files(oleaut32_oaidl.idl oleaut32_ocidl.idl) +if(MSVC) + set_source_files_properties(${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c PROPERTIES GENERATED TRUE) + list(APPEND SOURCE + ${REACTOS_BINARY_DIR}/include/psdk/wincodec_i.c + msvc.S) +endif() add_library(oleaut32 SHARED ${SOURCE}) Added: trunk/reactos/dll/win32/oleaut32/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/msvc.S?… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/msvc.S (added) +++ trunk/reactos/dll/win32/oleaut32/msvc.S [iso-8859-1] Tue Jun 21 13:22:07 2011 @@ -1,0 +1,30 @@ + +#include <asm.inc> + +.code32 + +PUBLIC _call_method +_call_method: + push ebp + mov ebp, esp + push esi + push edi + mov edx, dword ptr ds:[ebp + 12] + shl edx, 2 + jz cm1 + sub esp, edx + and esp, HEX(0FFFFFFF0) + mov ecx, dword ptr ds:[ebp + 12] + mov esi, dword ptr ds:[ebp + 16] + mov edi, esp + cld + rep movsd +cm1: + call dword ptr ds:[ebp + 8] + lea esp, [ebp - 8] + pop edi + pop esi + pop ebp + ret + +END Propchange: trunk/reactos/dll/win32/oleaut32/msvc.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/oleaut32/typelib2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/typelib… ============================================================================== --- trunk/reactos/dll/win32/oleaut32/typelib2.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/oleaut32/typelib2.c [iso-8859-1] Tue Jun 21 13:22:07 2011 @@ -1780,7 +1780,7 @@ insert = HeapAlloc(GetProcessHeap(), 0, sizeof(CyclicList)); if(!insert) return E_OUTOFMEMORY; - insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int[6])+sizeof(int[(num_defaults?4:3)])*pFuncDesc->cParams); + insert->u.data = HeapAlloc(GetProcessHeap(), 0, sizeof(int)*6+sizeof(int)*(num_defaults?4:3)*pFuncDesc->cParams); if(!insert->u.data) { HeapFree(GetProcessHeap(), 0, insert); return E_OUTOFMEMORY;

13 years, 6 months

[cgutman] 52400: [AFD] - Complete receive requests with the correct status if the socket is unexpectedly closed

by cgutman＠svn.reactos.org

Author: cgutman Date: Tue Jun 21 13:02:42 2011 New Revision: 52400 URL: http://svn.reactos.org/svn/reactos?rev=52400&view=rev Log: [AFD] - Complete receive requests with the correct status if the socket is unexpectedly closed Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Tue Jun 21 13:02:42 2011 @@ -163,14 +163,12 @@ TotalBytesCopied)); UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, FALSE ); - Status = NextIrp->IoStatus.Status = - FCB->Overread ? STATUS_END_OF_FILE : STATUS_SUCCESS; + Status = NextIrp->IoStatus.Status = FCB->PollStatus[FD_CLOSE_BIT]; NextIrp->IoStatus.Information = 0; if( NextIrp == Irp ) RetStatus = Status; if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); (void)IoSetCancelRoutine(NextIrp, NULL); IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - FCB->Overread = TRUE; } } else { /* Kick the user that receive would be possible now */

13 years, 6 months

[tkreuzer] 52399: [RPCRT4] - Add msvc.S containing call_stubless_func in assembly - Fix spec file, 2 stub functions are already implemented - fix use of GetExceptionCode(), it cannot be used in tha...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 21 12:22:47 2011 New Revision: 52399 URL: http://svn.reactos.org/svn/reactos?rev=52399&view=rev Log: [RPCRT4] - Add msvc.S containing call_stubless_func in assembly - Fix spec file, 2 stub functions are already implemented - fix use of GetExceptionCode(), it cannot be used in that context. Added: trunk/reactos/dll/win32/rpcrt4/msvc.S (with props) Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec Modified: trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Tue Jun 21 12:22:47 2011 @@ -22,6 +22,10 @@ unix_func.c ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4_stubs.c ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def) + +if(MSVC) + list(APPEND SOURCE msvc.S) +endif() remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) Added: trunk/reactos/dll/win32/rpcrt4/msvc.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/msvc.S?re… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/msvc.S (added) +++ trunk/reactos/dll/win32/rpcrt4/msvc.S [iso-8859-1] Tue Jun 21 12:22:47 2011 @@ -1,0 +1,18 @@ + +#include <asm.inc> + +.code32 + +EXTERN _ObjectStubless@4:PROC + +PUBLIC _call_stubless_func +_call_stubless_func: + + push esp /* pointer to index */ + call _ObjectStubless@4 + pop edx /* args size */ + mov ecx, [esp] /* return address */ + add esp, edx + jmp ecx + +END Propchange: trunk/reactos/dll/win32/rpcrt4/msvc.S ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpc_epmap… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpc_epmap.c [iso-8859-1] Tue Jun 21 12:22:47 2011 @@ -171,7 +171,7 @@ static LONG WINAPI rpc_filter(EXCEPTION_POINTERS *__eptr) { - switch (GetExceptionCode()) + switch (__eptr->ExceptionRecord->ExceptionCode) { case EXCEPTION_ACCESS_VIOLATION: case EXCEPTION_ILLEGAL_INSTRUCTION: @@ -396,7 +396,7 @@ status = get_epm_handle_client(Binding, &handle); if (status != RPC_S_OK) return status; - + status = TowerConstruct(&If->InterfaceId, &If->TransferSyntax, bind->Protseq, ((RpcBinding *)handle)->Endpoint, bind->NetworkAddr, &tower); Modified: trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/rpcrt4.sp… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/rpcrt4.spec [iso-8859-1] Tue Jun 21 12:22:47 2011 @@ -53,7 +53,7 @@ @ stub I_RpcIfInqTransferSyntaxes @ stub I_RpcLogEvent @ stdcall I_RpcMapWin32Status(long) -@ stub I_RpcNegotiateTransferSyntax # wxp +@ stdcall I_RpcNegotiateTransferSyntax(ptr) # wxp @ stub I_RpcNsBindingSetEntryName @ stub I_RpcNsBindingSetEntryNameA @ stub I_RpcNsBindingSetEntryNameW @@ -194,7 +194,7 @@ @ stdcall NdrFullPointerQueryPointer(ptr ptr long ptr) @ stdcall NdrFullPointerQueryRefId(ptr long long ptr) @ stdcall NdrFullPointerXlatFree(ptr) -@ stdcall NdrFullPointerXlatInit(long long) +@ stdcall NdrFullPointerXlatInit(long long) @ stdcall NdrGetBuffer(ptr long ptr) @ stub NdrGetDcomProtocolVersion @ stub NdrGetPartialBuffer @@ -265,7 +265,7 @@ @ stdcall NdrRangeUnmarshall(ptr ptr ptr long) @ stub NdrRpcSmClientAllocate @ stub NdrRpcSmClientFree -@ stub NdrRpcSmSetClientToOsf +@ stdcall NdrRpcSmSetClientToOsf(ptr) @ stub NdrRpcSsDefaultAllocate @ stub NdrRpcSsDefaultFree @ stub NdrRpcSsDisableAllocate

13 years, 6 months

[cmihail] 52398: [AFD, FORMATTING] - get rid of unused OskitDumpBuffer - make the code in AFD better conform to ROS coding guidelines - fix some MSVC compilation errors (still not fully compiling w...

by cmihail＠svn.reactos.org

Author: cmihail Date: Tue Jun 21 11:46:47 2011 New Revision: 52398 URL: http://svn.reactos.org/svn/reactos?rev=52398&view=rev Log: [AFD, FORMATTING] - get rid of unused OskitDumpBuffer - make the code in AFD better conform to ROS coding guidelines - fix some MSVC compilation errors (still not fully compiling with MSVC yet) [IP] - Add a sanity check in the TCPAcceptEventHandler Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/context.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive…

13 years, 6 months

[tkreuzer] 52397: [WINE] Add a hackfix for ntdll_winetest to fix compilation with MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Tue Jun 21 09:32:41 2011 New Revision: 52397 URL: http://svn.reactos.org/svn/reactos?rev=52397&view=rev Log: [WINE] Add a hackfix for ntdll_winetest to fix compilation with MSVC Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Tue Jun 21 09:32:41 2011 @@ -610,4 +610,7 @@ #endif /* STANDALONE */ +// hack for ntdll winetest (this is defined in excpt.h) +#undef exception_info + #endif /* __WINE_WINE_TEST_H */

13 years, 6 months

[cmihail] 52396: [lwIP] - Remove foreign identifier field from the tcp_pcb structure. This was added for some debugging purposes sometime ago but now it's useless and it was just polluting lwIP code.

by cmihail＠svn.reactos.org

Author: cmihail Date: Tue Jun 21 09:19:12 2011 New Revision: 52396 URL: http://svn.reactos.org/svn/reactos?rev=52396&view=rev Log: [lwIP] - Remove foreign identifier field from the tcp_pcb structure. This was added for some debugging purposes sometime ago but now it's useless and it was just polluting lwIP code. Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp.c [iso-8859-1] Tue Jun 21 09:19:12 2011 @@ -769,7 +769,7 @@ LWIP_ASSERT("tcp_slowtmr: active pcb->state != LISTEN\n", pcb->state != LISTEN); LWIP_ASSERT("tcp_slowtmr: active pcb->state != TIME-WAIT\n", pcb->state != TIME_WAIT); - LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: active pcb ports (%d -> %d) %d\n", pcb->local_port, pcb->remote_port, pcb->identifier)); + LWIP_DEBUGF(TCP_DEBUG, ("tcp_slowtmr: active pcb = 0x%x ports (%d -> %d)\n", pcb, pcb->local_port, pcb->remote_port)); pcb_remove = 0; pcb_reset = 0; Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/tcp_in.c [iso-8859-1] Tue Jun 21 09:19:12 2011 @@ -298,7 +298,7 @@ if (pcb != NULL) { - LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: pcb->id = %d is for active connection\n", pcb->identifier)); + LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: pcb = 0x%x is for active connection\n", pcb)); /* The incoming segment belongs to a connection. */ #if TCP_INPUT_DEBUG #if TCP_DEBUG @@ -535,7 +535,6 @@ for it. */ TCP_REG(&tcp_active_pcbs, npcb); - npcb->identifier = 21912; LWIP_DEBUGF(TCP_DEBUG, ("TCP new pcb created with %"U16_F" -> %"U16_F".\n", npcb->local_port, npcb->remote_port)); /* Parse any options in the SYN. */ @@ -683,8 +682,8 @@ pcb->state = ESTABLISHED; LWIP_DEBUGF(TCP_DEBUG, - ("[tcp_process] (SYN_SENT) TCP connection established %"U16_F" -> %"U16_F", %"U16_F"\n", - pcb->local_port , pcb->remote_port, pcb->identifier)); + ("[tcp_process] (SYN_SENT) TCP connection established %"U16_F" -> %"U16_F"\n", + pcb->local_port , pcb->remote_port)); #if TCP_CALCULATE_EFF_SEND_MSS pcb->mss = tcp_eff_send_mss(pcb->mss, &(pcb->remote_ip)); @@ -734,11 +733,11 @@ u16_t old_cwnd; pcb->state = ESTABLISHED; LWIP_DEBUGF(TCP_DEBUG, - ("[tcp_process] (SYN_RCVD) TCP connection established %"U16_F" -> %"U16_F" for %"U16_F"\n", - inseg.tcphdr->src, inseg.tcphdr->dest, pcb->identifier)); + ("[tcp_process] (SYN_RCVD) TCP connection established %"U16_F" -> %"U16_F"\n", + inseg.tcphdr->src, inseg.tcphdr->dest)); LWIP_DEBUGF(TCP_DEBUG, - ("[tcp_process] (SYN_RCVD) TCP local port = %"U16_F" and ID = %"U16_F"\n", - pcb->local_port, pcb->identifier)); + ("[tcp_process] (SYN_RCVD) TCP local port = %"U16_F"\n", + pcb->local_port)); #if LWIP_CALLBACK_API LWIP_ASSERT("pcb->accept != NULL", pcb->accept != NULL); Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/include/lwip/tcp.h [iso-8859-1] Tue Jun 21 09:19:12 2011 @@ -277,7 +277,6 @@ /* KEEPALIVE counter */ u8_t keep_cnt_sent; - u16_t identifier; }; struct tcp_pcb_listen {

13 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
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