Ros-diffs June 2011

ros-diffs@reactos.org

25 participants
460 discussions

[cmihail] 52385: [lwIP] Fix the nasty crash on socket closure bug. The bug was due to corrupting memory by wrongly assuming the LISTEN pcb had send, receive and error callbacks.

by cmihail＠svn.reactos.org

Author: cmihail Date: Mon Jun 20 14:49:58 2011 New Revision: 52385 URL: http://svn.reactos.org/svn/reactos?rev=52385&view=rev Log: [lwIP] Fix the nasty crash on socket closure bug. The bug was due to corrupting memory by wrongly assuming the LISTEN pcb had send, receive and error callbacks. Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Jun 20 14:49:58 2011 @@ -330,20 +330,16 @@ LibTCPListenCallback(void *arg) { struct listen_callback_msg *msg = arg; - void *p; ASSERT(msg); DbgPrint("[lwIP, LibTCPListenCallback] Called\n"); - - p = msg->Pcb->callback_arg; + msg->NewPcb = tcp_listen_with_backlog(msg->Pcb, msg->Backlog); if (msg->NewPcb) { - tcp_arg(msg->NewPcb, p); tcp_accept(msg->NewPcb, InternalAcceptEventHandler); - tcp_err(msg->NewPcb, InternalErrorEventHandler); } DbgPrint("[lwIP, LibTCPListenCallback] Done\n"); @@ -641,9 +637,18 @@ DbgPrint("[lwIP, LibTCPClose] pcb->state = %s\n", tcp_state_str[pcb->state]); tcp_arg(pcb, NULL); - tcp_recv(pcb, NULL); - tcp_sent(pcb, NULL); - tcp_err(pcb, NULL); + + /* + if this pcb is not in LISTEN state than it has + valid recv, send and err callbacks to cancel + */ + if (pcb->state != LISTEN) + { + tcp_recv(pcb, NULL); + tcp_sent(pcb, NULL); + tcp_err(pcb, NULL); + } + tcp_accept(pcb, NULL); DbgPrint("[lwIP, LibTCPClose] Attempting to allocate memory for msg\n");

13 years, 6 months

[tkreuzer] 52384: [CRT] Fix call_ebp_func, spotted by Thomas Faber

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 20 13:34:19 2011 New Revision: 52384 URL: http://svn.reactos.org/svn/reactos?rev=52384&view=rev Log: [CRT] Fix call_ebp_func, spotted by Thomas Faber Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Mon Jun 20 13:34:19 2011 @@ -50,10 +50,11 @@ #ifdef _MSC_VER __asm { + mov eax, func push ebx push ebp mov ebp, _ebp - call func + call eax pop ebp pop ebx mov result, eax

13 years, 6 months

[tkreuzer] 52383: [ITSS] Link to itss_guid

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 20 13:30:40 2011 New Revision: 52383 URL: http://svn.reactos.org/svn/reactos?rev=52383&view=rev Log: [ITSS] Link to itss_guid Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt Modified: trunk/reactos/dll/win32/itss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/itss/CMakeLists.… ============================================================================== --- trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/itss/CMakeLists.txt [iso-8859-1] Mon Jun 20 13:30:40 2011 @@ -22,6 +22,9 @@ set_module_type(itss win32dll) target_link_libraries(itss uuid wine) +if(MSVC) + target_link_libraries(itss itss_guid) +endif() add_importlibs(itss urlmon

13 years, 6 months

[tkreuzer] 52382: [WINE] add inline version of ffs

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 20 13:15:58 2011 New Revision: 52382 URL: http://svn.reactos.org/svn/reactos?rev=52382&view=rev Log: [WINE] add inline version of ffs Modified: trunk/reactos/include/reactos/wine/port.h Modified: trunk/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/port.… ============================================================================== --- trunk/reactos/include/reactos/wine/port.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/port.h [iso-8859-1] Mon Jun 20 13:15:58 2011 @@ -315,6 +315,17 @@ #endif /* __i386___ && __GNUC__ */ +#if defined(_MSC_VER) +__forceinline +int +ffs(int mask) +{ + long index; + if (_BitScanForward(&index, mask) == 0) return 0; + return index; +} +#endif + #else /* NO_LIBWINE_PORT */ #define __WINE_NOT_PORTABLE(func) func##_is_not_portable func##_is_not_portable

13 years, 6 months

[cmihail] 52381: [TCPIP] [FORMATTING] Backup copy and formatting.

by cmihail＠svn.reactos.org

Author: cmihail Date: Mon Jun 20 12:59:27 2011 New Revision: 52381 URL: http://svn.reactos.org/svn/reactos?rev=52381&view=rev Log: [TCPIP] [FORMATTING] Backup copy and formatting. Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.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/drivers/network/tcpip/tcpip/fileobjs.c branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip.c 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/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/bind.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -69,6 +69,7 @@ if ( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + if ( !(BindReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/listen.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -55,7 +55,7 @@ AFD_DbgPrint(MID_TRACE,("Socket Address (K) %x (U) %x\n", &ListenReceive->Address, Qelt->ConnInfo->RemoteAddress)); - + DbgPrint("[SatisfyPreAccept] Called\n"); DbgPrint("[SatisfyPreAccept] Giving SEQ %d to userland\n", Qelt->Seq); DbgPrint("[SatisfyPreAccept] Socket Address (K) %x (U) %x\n", &ListenReceive->Address, @@ -97,12 +97,16 @@ DbgPrint("IPAddr->Address[0].Address[0].sin_addr %x\n", IPAddr->Address[0].Address[0].in_addr); - if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); + if ( Irp->MdlAddress ) + UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); Irp->IoStatus.Information = ((PCHAR)&IPAddr[1]) - ((PCHAR)ListenReceive); Irp->IoStatus.Status = STATUS_SUCCESS; (void)IoSetCancelRoutine(Irp, NULL); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); + + DbgPrint("[SatisfyPreAccept] Leaving\n"); + return STATUS_SUCCESS; } @@ -192,8 +196,7 @@ Status = TdiBuildNullConnectionInfo( &Qelt->ConnInfo, AddressType ); if( NT_SUCCESS(Status) ) { - TaCopyTransportAddressInPlace - ( Qelt->ConnInfo->RemoteAddress, + TaCopyTransportAddressInPlace( Qelt->ConnInfo->RemoteAddress, FCB->ListenIrp.ConnectionReturnInfo->RemoteAddress ); InsertTailList( &FCB->PendingConnections, &Qelt->ListEntry ); } @@ -203,20 +206,22 @@ if ( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ) && !IsListEmpty( &FCB->PendingConnections ) ) { - PLIST_ENTRY PendingIrp = - RemoveHeadList( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ); + PLIST_ENTRY PendingIrp = RemoveHeadList( &FCB->PendingIrpList[FUNCTION_PREACCEPT] ); PLIST_ENTRY PendingConn = FCB->PendingConnections.Flink; - SatisfyPreAccept( CONTAINING_RECORD( PendingIrp, IRP, + + SatisfyPreAccept( CONTAINING_RECORD( PendingIrp, IRP, Tail.Overlay.ListEntry ), CONTAINING_RECORD( PendingConn, AFD_TDI_OBJECT_QELT, ListEntry ) ); } /* Launch new accept socket */ + DbgPrint("[AFD, ListenComplete] Getting warm connection socket\n"); Status = WarmSocketForConnection( FCB ); if (NT_SUCCESS(Status)) { + DbgPrint("[AFD, ListenComplete] Done getting warm connection socket\n"); Status = TdiBuildNullConnectionInfoInPlace(FCB->ListenIrp.ConnectionCallInfo, FCB->LocalAddress->Address[0].AddressType); ASSERT(Status == STATUS_SUCCESS); @@ -225,6 +230,7 @@ FCB->LocalAddress->Address[0].AddressType); ASSERT(Status == STATUS_SUCCESS); + DbgPrint("[AFD, ListenComplete] callings TdiListen\n"); Status = TdiListen( &FCB->ListenIrp.InFlightRequest, FCB->Connection.Object, &FCB->ListenIrp.ConnectionCallInfo, @@ -262,8 +268,8 @@ PAFD_FCB FCB = FileObject->FsContext; PAFD_LISTEN_DATA ListenReq; - AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); - DbgPrint("[AfdListenSocket] Called on %x\n", FCB); + AFD_DbgPrint(MID_TRACE,("Called on 0x%x\n", FCB)); + DbgPrint("[AfdListenSocket] Called on 0x%x\n", FCB); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); @@ -282,12 +288,11 @@ FCB->DelayedAccept = ListenReq->UseDelayedAcceptance; AFD_DbgPrint(MID_TRACE,("ADDRESSFILE: %x\n", FCB->AddressFile.Handle)); - DbgPrint("[AfdListenSocket] ADDRESSFILE: %x\n", FCB->AddressFile.Handle); Status = WarmSocketForConnection( FCB ); AFD_DbgPrint(MID_TRACE,("Status from warmsocket %x\n", Status)); - DbgPrint("[AfdListenSocket] Status from warmsocket %x\n", Status); + DbgPrint("[AfdListenSocket] Status from warmsocket 0x%x\n", Status); if ( !NT_SUCCESS(Status) ) return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); @@ -322,7 +327,7 @@ Status = STATUS_SUCCESS; AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - DbgPrint("[AfdListenSocket] Returning %x\n", Status); + DbgPrint("[AfdListenSocket] Returning 0x%x\n", Status); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); } @@ -380,14 +385,18 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_DEVICE_EXTENSION DeviceExt = (PAFD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - PAFD_FCB FCB = FileObject->FsContext; + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; PAFD_ACCEPT_DATA AcceptData = Irp->AssociatedIrp.SystemBuffer; PLIST_ENTRY PendingConn; AFD_DbgPrint(MID_TRACE,("Called\n")); - DbgPrint("[AfdAccept] Called\n"); - - if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); + DbgPrint("[AfdAccept] Called...\n"); + + if (!SocketAcquireStateLock(FCB)) + { + DbgPrint("[AfdAccept] Lost socket\n"); + return LostSocket( Irp ); + } for( PendingConn = FCB->PendingConnections.Flink; PendingConn != &FCB->PendingConnections; @@ -446,7 +455,7 @@ } } - DbgPrint("[AfdAccept] Done"); + DbgPrint("[AfdAccept] Done\n"); return UnlockAndMaybeComplete( FCB, STATUS_UNSUCCESSFUL, Irp, 0 ); } Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/main.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -50,7 +50,7 @@ PIO_STACK_LOCATION IrpSp) { PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; UINT BufferSize = IrpSp->Parameters.DeviceIoControl.OutputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -75,7 +75,7 @@ PIO_STACK_LOCATION IrpSp) { PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; PVOID DisconnectOptions = LockRequest(Irp, IrpSp); UINT DisconnectOptionsSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; @@ -93,7 +93,9 @@ } FCB->DisconnectOptions = ExAllocatePool(PagedPool, DisconnectOptionsSize); - if (!FCB->DisconnectOptions) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); + + if (!FCB->DisconnectOptions) + return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); RtlCopyMemory(FCB->DisconnectOptions, DisconnectOptions, @@ -110,8 +112,8 @@ PIO_STACK_LOCATION IrpSp) { PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; - PUINT DisconnectOptionsSize = LockRequest(Irp, IrpSp); + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; + PUINT DisconnectOptionsSize = (PUINT)LockRequest(Irp, IrpSp); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -130,7 +132,9 @@ } FCB->DisconnectOptions = ExAllocatePool(PagedPool, *DisconnectOptionsSize); - if (!FCB->DisconnectOptions) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); + + if (!FCB->DisconnectOptions) + return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); FCB->DisconnectOptionsSize = *DisconnectOptionsSize; @@ -142,7 +146,7 @@ PIO_STACK_LOCATION IrpSp) { PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; UINT BufferSize = IrpSp->Parameters.DeviceIoControl.OutputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -185,7 +189,9 @@ } FCB->DisconnectData = ExAllocatePool(PagedPool, DisconnectDataSize); - if (!FCB->DisconnectData) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); + + if (!FCB->DisconnectData) + return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); RtlCopyMemory(FCB->DisconnectData, DisconnectData, @@ -222,7 +228,9 @@ } FCB->DisconnectData = ExAllocatePool(PagedPool, *DisconnectDataSize); - if (!FCB->DisconnectData) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); + + if (!FCB->DisconnectData) + return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); FCB->DisconnectDataSize = *DisconnectDataSize; @@ -299,6 +307,8 @@ AFD_DbgPrint(MID_TRACE,("About to allocate the new FCB\n")); FCB = ExAllocatePool(NonPagedPool, sizeof(AFD_FCB)); + RtlZeroMemory(FCB, sizeof(AFD_FCB)); + if( FCB == NULL ) { Irp->IoStatus.Status = STATUS_NO_MEMORY; @@ -337,6 +347,7 @@ FCB->TdiDeviceName.MaximumLength = FCB->TdiDeviceName.Length; FCB->TdiDeviceName.Buffer = ExAllocatePool( NonPagedPool, FCB->TdiDeviceName.Length ); + RtlZeroMemory(FCB->TdiDeviceName.Buffer, FCB->TdiDeviceName.Length); if( !FCB->TdiDeviceName.Buffer ) { @@ -393,7 +404,7 @@ PIO_STACK_LOCATION IrpSp) { PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; PLIST_ENTRY CurrentEntry, NextEntry; UINT Function; PIRP CurrentIrp; @@ -431,7 +442,7 @@ PIO_STACK_LOCATION IrpSp) { PFILE_OBJECT FileObject = IrpSp->FileObject; - PAFD_FCB FCB = FileObject->FsContext; + PAFD_FCB FCB = (PAFD_FCB)FileObject->FsContext; UINT i; PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS]; PAFD_TDI_OBJECT_QELT Qelt; @@ -448,9 +459,6 @@ DbgPrint("[AFD, AfdCloseSocket] Setting closed state\n"); FCB->State = SOCKET_STATE_CLOSED; - FCB->PollState = AFD_EVENT_CLOSE; - FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; //I think we can return success here - PollReeval( FCB->DeviceExt, FCB->FileObject ); InFlightRequest[0] = &FCB->ListenIrp; InFlightRequest[1] = &FCB->ReceiveIrp; @@ -689,173 +697,176 @@ #endif AFD_DbgPrint(MID_TRACE,("AfdDispatch: %d\n", IrpSp->MajorFunction)); - if( IrpSp->MajorFunction != IRP_MJ_CREATE) { - AFD_DbgPrint(MID_TRACE,("FO %x, IrpSp->FO %x\n", - FileObject, IrpSp->FileObject)); - ASSERT(FileObject == IrpSp->FileObject); + + if( IrpSp->MajorFunction != IRP_MJ_CREATE) + { + AFD_DbgPrint(MID_TRACE,("FO %x, IrpSp->FO %x\n", + FileObject, IrpSp->FileObject)); + ASSERT(FileObject == IrpSp->FileObject); } Irp->IoStatus.Information = 0; switch(IrpSp->MajorFunction) { - /* opening and closing handles to the device */ - case IRP_MJ_CREATE: - /* Mostly borrowed from the named pipe file system */ - return AfdCreateSocket(DeviceObject, Irp, IrpSp); - - case IRP_MJ_CLOSE: - /* Ditto the borrowing */ - return AfdCloseSocket(DeviceObject, Irp, IrpSp); - - case IRP_MJ_CLEANUP: - return AfdCleanupSocket(DeviceObject, Irp, IrpSp); - - /* write data */ - case IRP_MJ_WRITE: - return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, TRUE ); - - /* read data */ - case IRP_MJ_READ: - return AfdConnectedSocketReadData( DeviceObject, Irp, IrpSp, TRUE ); - - case IRP_MJ_DEVICE_CONTROL: - { - switch( IrpSp->Parameters.DeviceIoControl.IoControlCode ) { - case IOCTL_AFD_BIND: - return AfdBindSocket( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_CONNECT: - return AfdStreamSocketConnect( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_START_LISTEN: - return AfdListenSocket( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_RECV: - return AfdConnectedSocketReadData( DeviceObject, Irp, IrpSp, - FALSE ); - - case IOCTL_AFD_SELECT: - return AfdSelect( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_EVENT_SELECT: - return AfdEventSelect( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_ENUM_NETWORK_EVENTS: - return AfdEnumEvents( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_RECV_DATAGRAM: - return AfdPacketSocketReadData( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_SEND: - return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, - FALSE ); - - case IOCTL_AFD_SEND_DATAGRAM: - return AfdPacketSocketWriteData( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_GET_INFO: - return AfdGetInfo( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_SET_INFO: - return AfdSetInfo( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_GET_CONTEXT_SIZE: - return AfdGetContextSize( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_GET_CONTEXT: - return AfdGetContext( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_SET_CONTEXT: - return AfdSetContext( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_WAIT_FOR_LISTEN: - return AfdWaitForListen( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_ACCEPT: - return AfdAccept( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_DISCONNECT: - return AfdDisconnect( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_GET_SOCK_NAME: - return AfdGetSockName( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_GET_PEER_NAME: - return AfdGetPeerName( DeviceObject, Irp, IrpSp ); - - case IOCTL_AFD_GET_CONNECT_DATA: - return AfdGetConnectData(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_CONNECT_DATA: - return AfdSetConnectData(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_DISCONNECT_DATA: - return AfdSetDisconnectData(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_GET_DISCONNECT_DATA: - return AfdGetDisconnectData(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_CONNECT_DATA_SIZE: - return AfdSetConnectDataSize(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_DISCONNECT_DATA_SIZE: - return AfdSetDisconnectDataSize(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_CONNECT_OPTIONS: - return AfdSetConnectOptions(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_DISCONNECT_OPTIONS: - return AfdSetDisconnectOptions(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_GET_CONNECT_OPTIONS: - return AfdGetConnectOptions(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_GET_DISCONNECT_OPTIONS: - return AfdGetDisconnectOptions(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_CONNECT_OPTIONS_SIZE: - return AfdSetConnectOptionsSize(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_SET_DISCONNECT_OPTIONS_SIZE: - return AfdSetDisconnectOptionsSize(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_GET_TDI_HANDLES: - return AfdGetTdiHandles(DeviceObject, Irp, IrpSp); - - case IOCTL_AFD_DEFER_ACCEPT: - DbgPrint("IOCTL_AFD_DEFER_ACCEPT is UNIMPLEMENTED!\n"); - break; - - case IOCTL_AFD_GET_PENDING_CONNECT_DATA: - DbgPrint("IOCTL_AFD_GET_PENDING_CONNECT_DATA is UNIMPLEMENTED!\n"); - break; - - case IOCTL_AFD_VALIDATE_GROUP: - DbgPrint("IOCTL_AFD_VALIDATE_GROUP is UNIMPLEMENTED!\n"); - break; - - default: - Status = STATUS_NOT_SUPPORTED; - DbgPrint("Unknown IOCTL (0x%x)\n", - IrpSp->Parameters.DeviceIoControl.IoControlCode); - break; - } - break; - } - -/* unsupported operations */ - default: - { - Status = STATUS_NOT_IMPLEMENTED; - AFD_DbgPrint(MIN_TRACE, - ("Irp: Unknown Major code was %x\n", - IrpSp->MajorFunction)); - break; - } + /* opening and closing handles to the device */ + case IRP_MJ_CREATE: + /* Mostly borrowed from the named pipe file system */ + return AfdCreateSocket(DeviceObject, Irp, IrpSp); + + case IRP_MJ_CLOSE: + /* Ditto the borrowing */ + return AfdCloseSocket(DeviceObject, Irp, IrpSp); + + case IRP_MJ_CLEANUP: + return AfdCleanupSocket(DeviceObject, Irp, IrpSp); + + /* write data */ + case IRP_MJ_WRITE: + return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, TRUE ); + + /* read data */ + case IRP_MJ_READ: + return AfdConnectedSocketReadData( DeviceObject, Irp, IrpSp, TRUE ); + + case IRP_MJ_DEVICE_CONTROL: + { + switch( IrpSp->Parameters.DeviceIoControl.IoControlCode ) + { + case IOCTL_AFD_BIND: + return AfdBindSocket( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_CONNECT: + return AfdStreamSocketConnect( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_START_LISTEN: + return AfdListenSocket( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_RECV: + return AfdConnectedSocketReadData( DeviceObject, Irp, IrpSp, + FALSE ); + + case IOCTL_AFD_SELECT: + return AfdSelect( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_EVENT_SELECT: + return AfdEventSelect( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_ENUM_NETWORK_EVENTS: + return AfdEnumEvents( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_RECV_DATAGRAM: + return AfdPacketSocketReadData( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_SEND: + return AfdConnectedSocketWriteData( DeviceObject, Irp, IrpSp, + FALSE ); + + case IOCTL_AFD_SEND_DATAGRAM: + return AfdPacketSocketWriteData( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_GET_INFO: + return AfdGetInfo( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_SET_INFO: + return AfdSetInfo( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_GET_CONTEXT_SIZE: + return AfdGetContextSize( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_GET_CONTEXT: + return AfdGetContext( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_SET_CONTEXT: + return AfdSetContext( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_WAIT_FOR_LISTEN: + return AfdWaitForListen( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_ACCEPT: + return AfdAccept( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_DISCONNECT: + return AfdDisconnect( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_GET_SOCK_NAME: + return AfdGetSockName( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_GET_PEER_NAME: + return AfdGetPeerName( DeviceObject, Irp, IrpSp ); + + case IOCTL_AFD_GET_CONNECT_DATA: + return AfdGetConnectData(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_CONNECT_DATA: + return AfdSetConnectData(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_DISCONNECT_DATA: + return AfdSetDisconnectData(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_GET_DISCONNECT_DATA: + return AfdGetDisconnectData(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_CONNECT_DATA_SIZE: + return AfdSetConnectDataSize(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_DISCONNECT_DATA_SIZE: + return AfdSetDisconnectDataSize(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_CONNECT_OPTIONS: + return AfdSetConnectOptions(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_DISCONNECT_OPTIONS: + return AfdSetDisconnectOptions(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_GET_CONNECT_OPTIONS: + return AfdGetConnectOptions(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_GET_DISCONNECT_OPTIONS: + return AfdGetDisconnectOptions(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_CONNECT_OPTIONS_SIZE: + return AfdSetConnectOptionsSize(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_SET_DISCONNECT_OPTIONS_SIZE: + return AfdSetDisconnectOptionsSize(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_GET_TDI_HANDLES: + return AfdGetTdiHandles(DeviceObject, Irp, IrpSp); + + case IOCTL_AFD_DEFER_ACCEPT: + DbgPrint("IOCTL_AFD_DEFER_ACCEPT is UNIMPLEMENTED!\n"); + break; + + case IOCTL_AFD_GET_PENDING_CONNECT_DATA: + DbgPrint("IOCTL_AFD_GET_PENDING_CONNECT_DATA is UNIMPLEMENTED!\n"); + break; + + case IOCTL_AFD_VALIDATE_GROUP: + DbgPrint("IOCTL_AFD_VALIDATE_GROUP is UNIMPLEMENTED!\n"); + break; + + default: + Status = STATUS_NOT_SUPPORTED; + DbgPrint("Unknown IOCTL (0x%x)\n", + IrpSp->Parameters.DeviceIoControl.IoControlCode); + break; + } + break; + } + + /* unsupported operations */ + default: + { + Status = STATUS_NOT_IMPLEMENTED; + AFD_DbgPrint(MIN_TRACE, ("Irp: Unknown Major code was %x\n", + IrpSp->MajorFunction)); + break; + } } AFD_DbgPrint(MID_TRACE, ("Returning %x\n", Status)); + Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/read.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -49,7 +49,8 @@ static VOID RefillSocketBuffer( PAFD_FCB FCB ) { NTSTATUS Status; - if( !FCB->ReceiveIrp.InFlightRequest ) { + if( !FCB->ReceiveIrp.InFlightRequest && + !(FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_ABORT)) ) { AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, @@ -216,7 +217,8 @@ } } - if( FCB->Recv.Content - FCB->Recv.BytesUsed ) { + if( FCB->Recv.Content - FCB->Recv.BytesUsed && + IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV]) ) { FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS; PollReeval( FCB->DeviceExt, FCB->FileObject ); @@ -576,7 +578,7 @@ } } - if( !IsListEmpty( &FCB->DatagramList ) ) { + if( !IsListEmpty( &FCB->DatagramList ) && IsListEmpty(&FCB->PendingIrpList[FUNCTION_RECV]) ) { AFD_DbgPrint(MID_TRACE,("Signalling\n")); FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollStatus[FD_READ_BIT] = STATUS_SUCCESS; Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/select.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -287,8 +287,8 @@ Status = ObReferenceObjectByHandle( (PVOID)EventSelectInfo-> EventObject, FILE_ALL_ACCESS, - NULL, - KernelMode, + ExEventObjectType, + UserMode, (PVOID *)&FCB->EventSelect, NULL ); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/afd/afd/write.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -328,8 +328,7 @@ if (SpaceAvail < SendReq->BufferArray[i].len) { - if (FCB->Send.BytesUsed + TotalBytesCopied + - SendReq->BufferArray[i].len > FCB->Send.Size) + if (TotalBytesCopied + SendReq->BufferArray[i].len > FCB->Send.Size) { UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -229,8 +229,7 @@ /* Try canceling the request */ Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; - if (TCPAbortListenForSocket(Connection->AddressFile->Listener, - Connection)) + if (TCPAbortListenForSocket(Connection->AddressFile->Listener, Connection)) { Irp->IoStatus.Information = 0; IRPFinish(Irp, STATUS_CANCELLED); @@ -267,16 +266,17 @@ * Status of operation */ { - PTDI_REQUEST_KERNEL_ASSOCIATE Parameters; - PTRANSPORT_CONTEXT TranContext; - PIO_STACK_LOCATION IrpSp; - PCONNECTION_ENDPOINT Connection, LastConnection; - PFILE_OBJECT FileObject; - PADDRESS_FILE AddrFile = NULL; - NTSTATUS Status; - KIRQL OldIrql; + PTDI_REQUEST_KERNEL_ASSOCIATE Parameters; + PTRANSPORT_CONTEXT TranContext; + PIO_STACK_LOCATION IrpSp; + PCONNECTION_ENDPOINT Connection, LastConnection; + PFILE_OBJECT FileObject; + PADDRESS_FILE AddrFile = NULL; + NTSTATUS Status; + KIRQL OldIrql; TI_DbgPrint(DEBUG_IRP, ("[TCPIP, DispTdiAssociateAddress] Called\n")); + DbgPrint("[TCPIP, DispTdiAssociateAddress] Called\n"); IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -354,17 +354,20 @@ LockObjectAtDpcLevel(AddrFile); - /* Add connection endpoint to the address file */ - ReferenceObject(Connection); - if (AddrFile->Connection == NULL) - AddrFile->Connection = Connection; - else - { - LastConnection = AddrFile->Connection; - while (LastConnection->Next != NULL) - LastConnection = LastConnection->Next; - LastConnection->Next = Connection; - } + DbgPrint("[TCPIP, DispTdiAssociateAddress] Associating AddressFile = 0x%x with Connection = 0x%x\n", + AddrFile, Connection); + + /* Add connection endpoint to the address file */ + ReferenceObject(Connection); + if (AddrFile->Connection == NULL) + AddrFile->Connection = Connection; + else + { + LastConnection = AddrFile->Connection; + while (LastConnection->Next != NULL) + LastConnection = LastConnection->Next; + LastConnection->Next = Connection; + } ReferenceObject(AddrFile); Connection->AddressFile = AddrFile; @@ -374,7 +377,99 @@ ObDereferenceObject(FileObject); + DbgPrint("[TCPIP, DispTdiAssociateAddress] Leaving\n"); + return STATUS_SUCCESS; +} + +NTSTATUS DispTdiDisassociateAddress( + PIRP Irp) +/* + * FUNCTION: TDI_DISASSOCIATE_ADDRESS handler + * ARGUMENTS: + * Irp = Pointer to an I/O request packet + * RETURNS: + * Status of operation + */ +{ + PCONNECTION_ENDPOINT Connection, LastConnection; + PTRANSPORT_CONTEXT TranContext; + PIO_STACK_LOCATION IrpSp; + KIRQL OldIrql; + NTSTATUS Status; + + TI_DbgPrint(DEBUG_IRP, ("Called.\n")); + DbgPrint("[TCPIP, DispTdiDisassociateAddress] Called\n"); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + /* Get associated connection endpoint file object. Quit if none exists */ + + TranContext = IrpSp->FileObject->FsContext; + if (!TranContext) + { + TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); + return STATUS_INVALID_PARAMETER; + } + + Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + if (!Connection) + { + TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); + return STATUS_INVALID_PARAMETER; + } + + LockObject(Connection, &OldIrql); + + if (!Connection->AddressFile) + { + UnlockObject(Connection, OldIrql); + TI_DbgPrint(MID_TRACE, ("No address file is asscociated.\n")); + return STATUS_INVALID_PARAMETER; + } + + LockObjectAtDpcLevel(Connection->AddressFile); + + /* Unlink this connection from the address file */ + if (Connection->AddressFile->Connection == Connection) + { + Connection->AddressFile->Connection = Connection->Next; + DereferenceObject(Connection); + Status = STATUS_SUCCESS; + } + else + { + LastConnection = Connection->AddressFile->Connection; + while (LastConnection->Next != Connection && LastConnection->Next != NULL) + LastConnection = LastConnection->Next; + if (LastConnection->Next == Connection) + { + LastConnection->Next = Connection->Next; + DereferenceObject(Connection); + Status = STATUS_SUCCESS; + } + else + { + Status = STATUS_INVALID_PARAMETER; + } + } + + UnlockObjectFromDpcLevel(Connection->AddressFile); + + if (Status == STATUS_SUCCESS) + { + DbgPrint("[TCPIP, DispTdiDisassociateAddress] Dissasociating AddressFile = 0x%x from Connection = 0x%x\n", + Connection->AddressFile, Connection); + /* Remove the address file from this connection */ + DereferenceObject(Connection->AddressFile); + Connection->AddressFile = NULL; + } + + UnlockObject(Connection, OldIrql); + + DbgPrint("[TCPIP, DispTdiDisassociateAddress] Leaving. Status = 0x%x\n", Status); + + return Status; } @@ -441,90 +536,6 @@ return Status; } - -NTSTATUS DispTdiDisassociateAddress( - PIRP Irp) -/* - * FUNCTION: TDI_DISASSOCIATE_ADDRESS handler - * ARGUMENTS: - * Irp = Pointer to an I/O request packet - * RETURNS: - * Status of operation - */ -{ - PCONNECTION_ENDPOINT Connection, LastConnection; - PTRANSPORT_CONTEXT TranContext; - PIO_STACK_LOCATION IrpSp; - KIRQL OldIrql; - NTSTATUS Status; - - TI_DbgPrint(DEBUG_IRP, ("Called.\n")); - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - - /* Get associated connection endpoint file object. Quit if none exists */ - - TranContext = IrpSp->FileObject->FsContext; - if (!TranContext) { - TI_DbgPrint(MID_TRACE, ("Bad transport context.\n")); - return STATUS_INVALID_PARAMETER; - } - - Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; - if (!Connection) { - TI_DbgPrint(MID_TRACE, ("No connection endpoint file object.\n")); - return STATUS_INVALID_PARAMETER; - } - - LockObject(Connection, &OldIrql); - - if (!Connection->AddressFile) { - UnlockObject(Connection, OldIrql); - TI_DbgPrint(MID_TRACE, ("No address file is asscociated.\n")); - return STATUS_INVALID_PARAMETER; - } - - LockObjectAtDpcLevel(Connection->AddressFile); - - /* Unlink this connection from the address file */ - if (Connection->AddressFile->Connection == Connection) - { - Connection->AddressFile->Connection = Connection->Next; - DereferenceObject(Connection); - Status = STATUS_SUCCESS; - } - else - { - LastConnection = Connection->AddressFile->Connection; - while (LastConnection->Next != Connection && LastConnection->Next != NULL) - LastConnection = LastConnection->Next; - if (LastConnection->Next == Connection) - { - LastConnection->Next = Connection->Next; - DereferenceObject(Connection); - Status = STATUS_SUCCESS; - } - else - { - Status = STATUS_INVALID_PARAMETER; - } - } - - UnlockObjectFromDpcLevel(Connection->AddressFile); - - if (Status == STATUS_SUCCESS) - { - /* Remove the address file from this connection */ - DereferenceObject(Connection->AddressFile); - Connection->AddressFile = NULL; - } - - UnlockObject(Connection, OldIrql); - - return Status; -} - - NTSTATUS DispTdiDisconnect( PIRP Irp) /* @@ -650,6 +661,8 @@ if ( NT_SUCCESS(Status) && !Connection->AddressFile->Listener ) { Connection->AddressFile->Listener = TCPAllocateConnectionEndpoint( NULL ); + DbgPrint("[TCPIP, DispTdiListen] Connection = 0x%x, Connection->AddressFile->Listener = 0x%x\n", + Connection, Connection->AddressFile->Listener); if ( !Connection->AddressFile->Listener ) Status = STATUS_NO_MEMORY; @@ -657,7 +670,7 @@ if ( NT_SUCCESS(Status) ) { Connection->AddressFile->Listener->AddressFile = - Connection->AddressFile; + Connection->AddressFile; Status = TCPSocket( Connection->AddressFile->Listener, Connection->AddressFile->Family, Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -256,6 +256,8 @@ } RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); + DbgPrint("[TCPIP, FileOpenAddress] Allocated AddressFile = 0x%x, sizeof(ADDRESS_FILE) = %d\n", + AddrFile, sizeof(ADDRESS_FILE)); AddrFile->RefCount = 1; AddrFile->Free = AddrFileFree; @@ -395,18 +397,22 @@ LockObject(AddrFile, &OldIrql); + DbgPrint("[TCPIP, FileCloseAddress] AddrFile->RefCount = %d before TCPClose\n", AddrFile->RefCount); + /* We have to close this listener because we started it */ if ( AddrFile->Listener ) { AddrFile->Listener->AddressFile = NULL; + + //DbgPrint("[TCPIP, FileCloseAddress] Calling TCPClose( 0x%x )\n", AddrFile->Listener); TCPClose( AddrFile->Listener ); } - DbgPrint("[TCPIP, FileCloseAddress] AddrFile->RefCount = %d\n", AddrFile->RefCount); - UnlockObject(AddrFile, OldIrql); DereferenceObject(AddrFile); + + DbgPrint("[TCPIP, FileCloseAddress] AddrFile->RefCount = %d after TCPClose\n", AddrFile->RefCount); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); DbgPrint("[TCPIP, FileCloseAddress] Leaving\n"); @@ -439,6 +445,7 @@ return STATUS_NO_MEMORY; Status = TCPSocket( Connection, AF_INET, SOCK_STREAM, IPPROTO_TCP ); + if (!NT_SUCCESS(Status)) { Modified: branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/drivers/n… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -105,144 +105,161 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PFILE_FULL_EA_INFORMATION EaInfo; - PTRANSPORT_CONTEXT Context; - PIO_STACK_LOCATION IrpSp; - PTA_IP_ADDRESS Address; - TDI_REQUEST Request; - PVOID ClientContext; - NTSTATUS Status; - ULONG Protocol; - - TI_DbgPrint(DEBUG_IRP, ("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp)); - - EaInfo = Irp->AssociatedIrp.SystemBuffer; - - /* Parameter check */ - /* No EA information means that we're opening for SET/QUERY_INFORMATION - * style calls. */ - - /* Allocate resources here. We release them again if something failed */ - Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(TRANSPORT_CONTEXT), - TRANS_CONTEXT_TAG); - if (!Context) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return STATUS_INSUFFICIENT_RESOURCES; - } - - Context->CancelIrps = FALSE; - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - IrpSp->FileObject->FsContext = Context; - Request.RequestContext = Irp; - - /* Branch to the right handler */ - if (EaInfo && - (EaInfo->EaNameLength == TDI_TRANSPORT_ADDRESS_LENGTH) && - (RtlCompareMemory - (&EaInfo->EaName, TdiTransportAddress, - TDI_TRANSPORT_ADDRESS_LENGTH) == TDI_TRANSPORT_ADDRESS_LENGTH)) { - /* This is a request to open an address */ - - - /* XXX This should probably be done in IoCreateFile() */ - /* Parameter checks */ - - Address = (PTA_IP_ADDRESS)(EaInfo->EaName + EaInfo->EaNameLength + 1); //0-term - - if ((EaInfo->EaValueLength < sizeof(TA_IP_ADDRESS)) || - (Address->TAAddressCount != 1) || - (Address->Address[0].AddressLength < TDI_ADDRESS_LENGTH_IP) || - (Address->Address[0].AddressType != TDI_ADDRESS_TYPE_IP)) { - TI_DbgPrint(MIN_TRACE, ("Parameters are invalid:\n")); - TI_DbgPrint(MIN_TRACE, ("AddressCount: %d\n", Address->TAAddressCount)); - if( Address->TAAddressCount == 1 ) { - TI_DbgPrint(MIN_TRACE, ("AddressLength: %\n", - Address->Address[0].AddressLength)); - TI_DbgPrint(MIN_TRACE, ("AddressType: %\n", - Address->Address[0].AddressType)); - } - ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); - return STATUS_INVALID_PARAMETER; + PFILE_FULL_EA_INFORMATION EaInfo; + PTRANSPORT_CONTEXT Context; + PIO_STACK_LOCATION IrpSp; + PTA_IP_ADDRESS Address; + TDI_REQUEST Request; + PVOID ClientContext; + NTSTATUS Status; + ULONG Protocol; + + TI_DbgPrint(DEBUG_IRP, ("Called. DeviceObject is at (0x%X), IRP is at (0x%X).\n", DeviceObject, Irp)); + + EaInfo = Irp->AssociatedIrp.SystemBuffer; + + /* Parameter check */ + /* No EA information means that we're opening for SET/QUERY_INFORMATION + * style calls. */ + + /* Allocate resources here. We release them again if something failed */ + Context = ExAllocatePoolWithTag(NonPagedPool, sizeof(TRANSPORT_CONTEXT), + TRANS_CONTEXT_TAG); + if (!Context) + { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return STATUS_INSUFFICIENT_RESOURCES; } - /* Open address file object */ - - /* Protocol depends on device object so find the protocol */ - if (DeviceObject == TCPDeviceObject) - Protocol = IPPROTO_TCP; - else if (DeviceObject == UDPDeviceObject) - Protocol = IPPROTO_UDP; - else if (DeviceObject == IPDeviceObject) - Protocol = IPPROTO_RAW; - else if (DeviceObject == RawIPDeviceObject) { - Status = TiGetProtocolNumber(&IrpSp->FileObject->FileName, &Protocol); - if (!NT_SUCCESS(Status)) { - TI_DbgPrint(MIN_TRACE, ("Raw IP protocol number is invalid.\n")); + Context->CancelIrps = FALSE; + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + IrpSp->FileObject->FsContext = Context; + Request.RequestContext = Irp; + + /* Branch to the right handler */ + if (EaInfo && + (EaInfo->EaNameLength == TDI_TRANSPORT_ADDRESS_LENGTH) && + (RtlCompareMemory(&EaInfo->EaName, TdiTransportAddress, + TDI_TRANSPORT_ADDRESS_LENGTH) == TDI_TRANSPORT_ADDRESS_LENGTH)) + { + /* This is a request to open an address */ + + + /* XXX This should probably be done in IoCreateFile() */ + /* Parameter checks */ + + Address = (PTA_IP_ADDRESS)(EaInfo->EaName + EaInfo->EaNameLength + 1); //0-term + + if ((EaInfo->EaValueLength < sizeof(TA_IP_ADDRESS)) || + (Address->TAAddressCount != 1) || + (Address->Address[0].AddressLength < TDI_ADDRESS_LENGTH_IP) || + (Address->Address[0].AddressType != TDI_ADDRESS_TYPE_IP)) + { + TI_DbgPrint(MIN_TRACE, ("Parameters are invalid:\n")); + TI_DbgPrint(MIN_TRACE, ("AddressCount: %d\n", Address->TAAddressCount)); + if( Address->TAAddressCount == 1 ) + { + TI_DbgPrint(MIN_TRACE, ("AddressLength: %\n", + Address->Address[0].AddressLength)); + TI_DbgPrint(MIN_TRACE, ("AddressType: %\n", + Address->Address[0].AddressType)); + } + + ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); + return STATUS_INVALID_PARAMETER; + } + + /* Open address file object */ + + /* Protocol depends on device object so find the protocol */ + if (DeviceObject == TCPDeviceObject) + Protocol = IPPROTO_TCP; + else if (DeviceObject == UDPDeviceObject) + Protocol = IPPROTO_UDP; + else if (DeviceObject == IPDeviceObject) + Protocol = IPPROTO_RAW; + else if (DeviceObject == RawIPDeviceObject) + { + Status = TiGetProtocolNumber(&IrpSp->FileObject->FileName, &Protocol); + if (!NT_SUCCESS(Status)) + { + TI_DbgPrint(MIN_TRACE, ("Raw IP protocol number is invalid.\n")); + ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); + return STATUS_INVALID_PARAMETER; + } + } + else + { + TI_DbgPrint(MIN_TRACE, ("Invalid device object at (0x%X).\n", DeviceObject)); + ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); + return STATUS_INVALID_PARAMETER; + } + + Status = FileOpenAddress(&Request, Address, Protocol, NULL); + if (NT_SUCCESS(Status)) + { + IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; + Context->Handle.AddressHandle = Request.Handle.AddressHandle; + } + + } + else if (EaInfo && + (EaInfo->EaNameLength == TDI_CONNECTION_CONTEXT_LENGTH) && + (RtlCompareMemory + (&EaInfo->EaName, TdiConnectionContext, + TDI_CONNECTION_CONTEXT_LENGTH) == + TDI_CONNECTION_CONTEXT_LENGTH)) + { + /* This is a request to open a connection endpoint */ + + /* Parameter checks */ + + if (EaInfo->EaValueLength < sizeof(PVOID)) + { + TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); + ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); + return STATUS_INVALID_PARAMETER; + } + + /* Can only do connection oriented communication using TCP */ + + if (DeviceObject != TCPDeviceObject) + { + TI_DbgPrint(MIN_TRACE, ("Bad device object.\n")); + ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); + return STATUS_INVALID_PARAMETER; + } + + ClientContext = *((PVOID*)(EaInfo->EaName + EaInfo->EaNameLength)); + + /* Open connection endpoint file object */ + + Status = FileOpenConnection(&Request, ClientContext); + if (NT_SUCCESS(Status)) + { + IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONNECTION_FILE; + Context->Handle.ConnectionContext = Request.Handle.ConnectionContext; + } + } + else + { + /* This is a request to open a control connection */ + Status = FileOpenControlChannel(&Request); + if (NT_SUCCESS(Status)) + { + IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONTROL_CHANNEL_FILE; + Context->Handle.ControlChannel = Request.Handle.ControlChannel; + } + } + + if (!NT_SUCCESS(Status)) ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); - return STATUS_INVALID_PARAMETER; - } - } else { - TI_DbgPrint(MIN_TRACE, ("Invalid device object at (0x%X).\n", DeviceObject)); - ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); - return STATUS_INVALID_PARAMETER; - } - - Status = FileOpenAddress(&Request, Address, Protocol, NULL); - if (NT_SUCCESS(Status)) { - IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; - Context->Handle.AddressHandle = Request.Handle.AddressHandle; - } - - } else if (EaInfo && - (EaInfo->EaNameLength == TDI_CONNECTION_CONTEXT_LENGTH) && - (RtlCompareMemory - (&EaInfo->EaName, TdiConnectionContext, - TDI_CONNECTION_CONTEXT_LENGTH) == - TDI_CONNECTION_CONTEXT_LENGTH)) { - /* This is a request to open a connection endpoint */ - - /* Parameter checks */ - - if (EaInfo->EaValueLength < sizeof(PVOID)) { - TI_DbgPrint(MIN_TRACE, ("Parameters are invalid.\n")); - ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); - return STATUS_INVALID_PARAMETER; - } - - /* Can only do connection oriented communication using TCP */ - - if (DeviceObject != TCPDeviceObject) { - TI_DbgPrint(MIN_TRACE, ("Bad device object.\n")); - ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); - return STATUS_INVALID_PARAMETER; - } - - ClientContext = *((PVOID*)(EaInfo->EaName + EaInfo->EaNameLength)); - - /* Open connection endpoint file object */ - - Status = FileOpenConnection(&Request, ClientContext); - if (NT_SUCCESS(Status)) { - IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONNECTION_FILE; - Context->Handle.ConnectionContext = Request.Handle.ConnectionContext; - } - } else { - /* This is a request to open a control connection */ - Status = FileOpenControlChannel(&Request); - if (NT_SUCCESS(Status)) { - IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONTROL_CHANNEL_FILE; - Context->Handle.ControlChannel = Request.Handle.ControlChannel; - } - } - - if (!NT_SUCCESS(Status)) - ExFreePoolWithTag(Context, TRANS_CONTEXT_TAG); - - TI_DbgPrint(DEBUG_IRP, ("Leaving. Status = (0x%X).\n", Status)); - - Irp->IoStatus.Status = Status; - return Status; + + TI_DbgPrint(DEBUG_IRP, ("Leaving. Status = (0x%X).\n", Status)); + + Irp->IoStatus.Status = Status; + return Status; } Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -101,7 +101,7 @@ { Bucket = CONTAINING_RECORD(ListEntry, TDI_BUCKET, Entry); - if( Bucket->AssociatedEndpoint == Connection ) + if (Bucket->AssociatedEndpoint == Connection) { DereferenceObject(Bucket->AssociatedEndpoint); RemoveEntryList( &Bucket->Entry ); 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… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -77,7 +77,7 @@ ReferenceObject(Connection); - DbgPrint("Flushing recv/all with status: 0x%x\n", Status); + DbgPrint("[IP, FlushAllQueues] Flushing recv/all with status: 0x%x\n", Status); while ((Entry = ExInterlockedRemoveHeadList(&Connection->ReceiveRequest, &Connection->Lock))) { @@ -102,8 +102,10 @@ Bucket->Status = Status; Bucket->Information = 0; - - //DereferenceObject(Bucket->AssociatedEndpoint); + + DbgPrint("[IP, FlushAllQueues] Flushing Listen request for Connection = 0x%x\n", Bucket->AssociatedEndpoint); + + DereferenceObject(Bucket->AssociatedEndpoint); CompleteBucket(Connection, Bucket, TRUE); } @@ -178,9 +180,6 @@ Bucket->Status = Status; Bucket->Information = 0; - - DbgPrint("[IP, TCPAcceptEventHandler] Associated with: 0x%x\n", - Bucket->AssociatedEndpoint->SocketContext); DbgPrint("[IP, TCPAcceptEventHandler] Completing accept event %x\n", Status); @@ -194,7 +193,6 @@ LockObject(Bucket->AssociatedEndpoint, &OldIrql); /* free previously created socket context (we don't use it, we use newpcb) */ - //LibTCPClose(Bucket->AssociatedEndpoint->SocketContext); OldSocketContext = Bucket->AssociatedEndpoint->SocketContext; Bucket->AssociatedEndpoint->SocketContext = newpcb; Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -81,11 +81,11 @@ LockObject(Connection, &OldIrql); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSocket] Called: Connection %x, Family %d, Type %d, " - "Proto %d\n", - Connection, Family, Type, Proto)); - DbgPrint("[IP, TCPSocket] Called: Connection %x, Family %d, Type %d, " - "Proto %d\n", - Connection, Family, Type, Proto); + "Proto %d, sizeof(CONNECTION_ENDPOINT) = %d\n", + Connection, Family, Type, Proto, sizeof(CONNECTION_ENDPOINT))); + DbgPrint("[IP, TCPSocket] Called: Connection 0x%x, Family %d, Type %d, " + "Proto %d, sizeof(CONNECTION_ENDPOINT) = %d\n", + Connection, Family, Type, Proto, sizeof(CONNECTION_ENDPOINT)); Connection->SocketContext = LibTCPSocket(Connection); if (Connection->SocketContext) @@ -93,12 +93,45 @@ else Status = STATUS_INSUFFICIENT_RESOURCES; + DbgPrint("[IP, TCPSocket] Connection->SocketContext = 0x%x\n", Connection->SocketContext); + UnlockObject(Connection, OldIrql); TI_DbgPrint(DEBUG_TCP,("[IP, TCPSocket] Leaving. Status = 0x%x\n", Status)); DbgPrint("[IP, TCPSocket] Leaving. Status = 0x%x\n", Status); return Status; +} + +NTSTATUS TCPClose +( PCONNECTION_ENDPOINT Connection ) +{ + KIRQL OldIrql; + PVOID Socket; + + LockObject(Connection, &OldIrql); + Socket = Connection->SocketContext; + Connection->SocketContext = NULL; + + DbgPrint("[IP, TCPClose] Called\n"); + + /* We should not be associated to an address file at this point */ + ASSERT(!Connection->AddressFile); + + /* Don't try to close again if the other side closed us already */ + if (Socket) + { + FlushAllQueues(Connection, STATUS_CANCELLED); + LibTCPClose(Socket); + } + + UnlockObject(Connection, OldIrql); + + DereferenceObject(Connection); + + DbgPrint("[IP, TCPClose] Leaving. Connection->RefCount = %d\n", Connection->RefCount); + + return STATUS_SUCCESS; } VOID TCPReceive(PIP_INTERFACE Interface, PIP_PACKET IPPacket) @@ -333,34 +366,6 @@ return Status; } -NTSTATUS TCPClose -( PCONNECTION_ENDPOINT Connection ) -{ - KIRQL OldIrql; - PVOID Socket; - - LockObject(Connection, &OldIrql); - Socket = Connection->SocketContext; - Connection->SocketContext = NULL; - - /* We should not be associated to an address file at this point */ - ASSERT(!Connection->AddressFile); - - /* Don't try to close again if the other side closed us already */ - if (Socket) - { - FlushAllQueues(Connection, STATUS_CANCELLED); - - LibTCPClose(Socket); - } - - UnlockObject(Connection, OldIrql); - - DereferenceObject(Connection); - - return STATUS_SUCCESS; -} - NTSTATUS TCPReceiveData ( PCONNECTION_ENDPOINT Connection, PNDIS_BUFFER Buffer, Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/core/ipv4/ip.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -251,6 +251,8 @@ IP_STATS_INC(ip.recv); snmp_inc_ipinreceives(); + + DbgPrint("ip_input: called\n"); /* identify the IP header */ iphdr = (struct ip_hdr *)p->payload; @@ -488,7 +490,7 @@ if (raw_input(p, inp) == 0) #endif /* LWIP_RAW */ { - + DbgPrint("ip_input: choosing protocol\n"); switch (IPH_PROTO(iphdr)) { #if LWIP_UDP case IP_PROTO_UDP: @@ -502,6 +504,7 @@ #if LWIP_TCP case IP_PROTO_TCP: snmp_inc_ipindelivers(); + DbgPrint("ip_input: sending data to tcp_input\n"); tcp_input(p, inp); break; #endif /* LWIP_TCP */ 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] Mon Jun 20 12:59:27 2011 @@ -139,7 +139,7 @@ { err_t err; - LWIP_DEBUGF(TCP_DEBUG, ("tcp_close_shutdown: called on pcb %x\n", pcb)); + LWIP_DEBUGF(TCP_DEBUG, ("tcp_close_shutdown: called on pcb 0x%x\n", pcb)); if (rst_on_unacked_data && (pcb->state != LISTEN)) { if ((pcb->refused_data != NULL) || (pcb->rcv_wnd != TCP_WND)) { @@ -181,6 +181,7 @@ break; case LISTEN: err = ERR_OK; + LWIP_DEBUGF(TCP_DEBUG, ("tcp_close_shutdown: Remove pcb from listen list and free\n")); tcp_pcb_remove(&tcp_listen_pcbs.pcbs, pcb); memp_free(MEMP_TCP_PCB_LISTEN, pcb); pcb = NULL; @@ -487,6 +488,8 @@ LWIP_UNUSED_ARG(backlog); LWIP_ERROR("tcp_listen: pcb already connected", pcb->state == CLOSED, return NULL); + DbgPrint("tcp_listen_with_backlog: sizeof(tcp_pcb_listen) = %d, %d\n", + sizeof(struct tcp_pcb_listen), (((sizeof(struct tcp_pcb_listen)) + MEM_ALIGNMENT - 1) & ~(MEM_ALIGNMENT-1))); /* already listening? */ if (pcb->state == LISTEN) { 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] Mon Jun 20 12:59:27 2011 @@ -107,8 +107,6 @@ iphdr = (struct ip_hdr *)p->payload; tcphdr = (struct tcp_hdr *)((u8_t *)p->payload + IPH_HL(iphdr) * 4); - - LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: called\n")); #if TCP_INPUT_DEBUG tcp_debug_print(tcphdr); @@ -177,22 +175,25 @@ flags = TCPH_FLAGS(tcphdr); tcplen = p->tot_len + ((flags & (TCP_FIN | TCP_SYN)) ? 1 : 0); + LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: called %"U16_F" -> %"U16_F"\n", tcphdr->src, tcphdr->dest)); + /* Demultiplex an incoming segment. First, we check if it is destined for an active connection. */ prev = NULL; - for(pcb = tcp_active_pcbs; pcb != NULL; pcb = pcb->next) { LWIP_ASSERT("tcp_input: active pcb->state != CLOSED", pcb->state != CLOSED); LWIP_ASSERT("tcp_input: active pcb->state != TIME-WAIT", pcb->state != TIME_WAIT); LWIP_ASSERT("tcp_input: active pcb->state != LISTEN", pcb->state != LISTEN); + if (pcb->remote_port == tcphdr->src && pcb->local_port == tcphdr->dest && ip_addr_cmp(&(pcb->remote_ip), &current_iphdr_src) && ip_addr_cmp(&(pcb->local_ip), &current_iphdr_dest)) { - + LWIP_DEBUGF(TCP_DEBUG, ("tcp_input: active pcb -> (localport, remoteport) = %"U16_F" -> %"U16_F"\n", pcb->local_port, pcb->remote_port)); + DbgPrint("tcp_input: pcb = 0x%x\n", pcb); /* Move this PCB to the front of the list so that subsequent lookups will be faster (we exploit locality in TCP segment arrivals). */ @@ -908,6 +909,8 @@ u32_t right_wnd_edge; u16_t new_tot_len; int found_dupack = 0; + + LWIP_DEBUGF(TCP_DEBUG, ("tcp_receive: called\n")); if (flags & TCP_ACK) { right_wnd_edge = pcb->snd_wnd + pcb->snd_wl2; @@ -1534,6 +1537,8 @@ tcp_ack_now(pcb); } } + + LWIP_DEBUGF(TCP_DEBUG, ("tcp_receive: done\n")); } /** Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Mon Jun 20 12:59:27 2011 @@ -128,7 +128,7 @@ err_t InternalAcceptEventHandler(void *arg, struct tcp_pcb *newpcb, err_t err) { - DbgPrint("[lwIP, InternalAcceptEventHandler] AcceptEvent (0x%x, 0x%x, %d)\n", + DbgPrint("[lwIP, InternalAcceptEventHandler] AcceptEvent arg = 0x%x, newpcb = 0x%x, err = %d\n", arg, newpcb, (unsigned int)err); /* Make sure the socket didn't get closed */ @@ -197,8 +197,12 @@ struct socket_callback_msg *msg = arg; ASSERT(msg); + + DbgPrint("[lwIP, LibTCPSocketCallback] Called\n"); msg->NewPcb = tcp_new(); + + DbgPrint("[lwIP, LibTCPSocketCallback] Assigned new pcb = 0x%x\n", msg->NewPcb); if (msg->NewPcb) { @@ -214,6 +218,8 @@ { struct socket_callback_msg *msg = ExAllocatePool(NonPagedPool, sizeof(struct socket_callback_msg)); void *ret; + + DbgPrint("[lwIP, LibTCPSocket] Called\n"); if (msg) { @@ -227,12 +233,16 @@ else ret = NULL; - DbgPrint("[lwIP, LibTCPSocket] (0x%x) = 0x%x\n", arg, ret); + DbgPrint("[lwIP, LibTCPSocket] Connection( 0x%x )->SocketContext = pcb( 0x%x )\n", arg, ret); + + DbgPrint("[lwIP, LibTCPSocket] Done\n"); ExFreePool(msg); return (struct tcp_pcb*)ret; } + + DbgPrint("[lwIP, LibTCPSocket] Done\n"); return NULL; } @@ -347,7 +357,7 @@ struct listen_callback_msg *msg; void *ret; - DbgPrint("[lwIP, LibTCPListen] Called\n"); + DbgPrint("[lwIP, LibTCPListen] Called on pcb = 0x%x\n", pcb); if (!pcb) return NULL; @@ -366,7 +376,8 @@ else ret = NULL; - DbgPrint("[lwIP, LibTCPListen] pcb = 0x%x \n", pcb); + DbgPrint("[lwIP, LibTCPListen] pcb = 0x%x, newpcb = 0x%x, sizeof(pcb) = %d \n", + pcb, ret, sizeof(struct tcp_pcb)); DbgPrint("[lwIP, LibTCPListen] Done\n"); @@ -617,7 +628,7 @@ struct close_callback_msg *msg; err_t ret; - DbgPrint("[lwIP, LibTCPClose] Called\n"); + DbgPrint("[lwIP, LibTCPClose] Called on pcb = 0x%x\n", pcb); if (!pcb) { @@ -626,7 +637,9 @@ } DbgPrint("[lwIP, LibTCPClose] Removing pcb callbacks\n"); - + + DbgPrint("[lwIP, LibTCPClose] pcb->state = %s\n", tcp_state_str[pcb->state]); + tcp_arg(pcb, NULL); tcp_recv(pcb, NULL); tcp_sent(pcb, NULL);

13 years, 6 months

[tkreuzer] 52380: [CRTDLL] - don't forward _fileinfo_dll to MSVCRT, this doesn't work and its not what MS crtdll does. - don't define _CRTIMP to _declspec(dllexport) - link to MSVCRT when compiling...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 20 12:41:32 2011 New Revision: 52380 URL: http://svn.reactos.org/svn/reactos?rev=52380&view=rev Log: [CRTDLL] - don't forward _fileinfo_dll to MSVCRT, this doesn't work and its not what MS crtdll does. - don't define _CRTIMP to _declspec(dllexport) - link to MSVCRT when compiling with MSVC - remove def file Removed: trunk/reactos/dll/win32/crtdll/crtdll.def Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt trunk/reactos/dll/win32/crtdll/crtdll.spec trunk/reactos/dll/win32/crtdll/dllmain.c trunk/reactos/include/crt/crtdefs.h trunk/reactos/include/crt/excpt.h Modified: trunk/reactos/dll/win32/crtdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/CMakeLists.txt [iso-8859-1] Mon Jun 20 12:41:32 2011 @@ -26,6 +26,7 @@ target_link_libraries(crtdll wine crt) if(MSVC) + add_importlibs(crtdll msvcrt) target_link_libraries(crtdll oldnames) endif() Removed: trunk/reactos/dll/win32/crtdll/crtdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.de… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.def [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.def (removed) @@ -1,530 +1,0 @@ - -LIBRARY crtdll.dll - -EXPORTS - ??2@YAPAXI@Z=msvcrt.??2@YAPAXI@Z @1 - ??3@YAXPAX@Z=msvcrt.??3@YAXPAX@Z @2 - ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z=msvcrt.?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z @3 - _CIacos=msvcrt._CIacos @4 - _CIasin=msvcrt._CIasin @5 - _CIatan=msvcrt._CIatan @6 - _CIatan2=msvcrt._CIatan2 @7 - _CIcos=msvcrt._CIcos @8 - _CIcosh=msvcrt._CIcosh @9 - _CIexp=msvcrt._CIexp @10 - _CIfmod=msvcrt._CIfmod @11 - _CIlog=msvcrt._CIlog @12 - _CIlog10=msvcrt._CIlog10 @13 - _CIpow=msvcrt._CIpow @14 - _CIsin=msvcrt._CIsin @15 - _CIsinh=msvcrt._CIsinh @16 - _CIsqrt=msvcrt._CIsqrt @17 - _CItan=msvcrt._CItan @18 - _CItanh=msvcrt._CItanh @19 - _HUGE_dll=msvcrt._HUGE @20 DATA - _XcptFilter=msvcrt._XcptFilter @21 - __GetMainArgs @22 - __argc_dll=msvcrt.__argc @23 DATA - __argv_dll=msvcrt.__argv @24 DATA - __dllonexit=msvcrt.__dllonexit @25 - __doserrno=msvcrt.__doserrno @26 - __fpecode=msvcrt.__fpecode @27 - __isascii=msvcrt.__isascii @28 - __iscsym=msvcrt.__iscsym @29 - __iscsymf=msvcrt.__iscsymf @30 - __mb_cur_max_dll=msvcrt.__mb_cur_max @31 DATA - __pxcptinfoptrs=msvcrt.__pxcptinfoptrs @32 - __threadhandle=msvcrt.__threadhandle @33 - __threadid=msvcrt.__threadid @34 - __toascii=msvcrt.__toascii @35 - _abnormal_termination=msvcrt._abnormal_termination @36 - _access=msvcrt._access @37 - _acmdln_dll=msvcrt._acmdln @38 DATA - _aexit_rtn_dll=msvcrt._aexit_rtn @39 DATA - _amsg_exit=msvcrt._amsg_exit @40 - _assert=msvcrt._assert @41 - _basemajor_dll=CRTDLL__basemajor_dll @42 DATA - _baseminor_dll=CRTDLL__baseminor_dll @43 DATA - _baseversion_dll=CRTDLL__baseversion_dll @44 DATA - _beep=msvcrt._beep @45 - _beginthread=msvcrt._beginthread @46 - _c_exit=msvcrt._c_exit @47 - _cabs=msvcrt._cabs @48 - _cexit=msvcrt._cexit @49 - _cgets=msvcrt._cgets @50 - _chdir=msvcrt._chdir @51 - _chdrive=msvcrt._chdrive @52 - _chgsign=msvcrt._chgsign @53 - _chmod=msvcrt._chmod @54 - _chsize=msvcrt._chsize @55 - _clearfp=msvcrt._clearfp @56 - _close=msvcrt._close @57 - _commit=msvcrt._commit @58 - _commode_dll=msvcrt._commode @59 DATA - _control87=msvcrt._control87 @60 - _controlfp=msvcrt._controlfp @61 - _copysign=msvcrt._copysign @62 - _cprintf=msvcrt._cprintf @63 - _cpumode_dll=CRTDLL__cpumode_dll @64 DATA - _cputs=msvcrt._cputs @65 - _creat=msvcrt._creat @66 - _cscanf=msvcrt._cscanf @67 - _ctype=msvcrt._ctype @68 DATA - _cwait=msvcrt._cwait @69 - _daylight_dll=msvcrt._daylight @70 DATA - _dup=msvcrt._dup @71 - _dup2=msvcrt._dup2 @72 - _ecvt=msvcrt._ecvt @73 - _endthread=msvcrt._endthread @74 - _environ_dll=msvcrt._environ @75 DATA - _eof=msvcrt._eof @76 - _errno=msvcrt._errno @77 - _except_handler2=msvcrt._except_handler2 @78 - _execl=msvcrt._execl @79 - _execle=msvcrt._execle @80 - _execlp=msvcrt._execlp @81 - _execlpe=msvcrt._execlpe @82 - _execv=msvcrt._execv @83 - _execve=msvcrt._execve @84 - _execvp=msvcrt._execvp @85 - _execvpe=msvcrt._execvpe @86 - _exit=msvcrt._exit @87 - _expand=msvcrt._expand @88 - _fcloseall=msvcrt._fcloseall @89 - _fcvt=msvcrt._fcvt @90 - _fdopen=msvcrt._fdopen @91 - _fgetchar=msvcrt._fgetchar @92 - _fgetwchar=msvcrt._fgetwchar @93 - _filbuf=msvcrt._filbuf @94 - _fileinfo_dll=msvcrt._fileinfo @95 DATA - _filelength=msvcrt._filelength @96 - _fileno=msvcrt._fileno @97 - _findclose=msvcrt._findclose @98 - _findfirst=msvcrt._findfirst @99 - _findnext=msvcrt._findnext @100 - _finite=msvcrt._finite @101 - _flsbuf=msvcrt._flsbuf @102 - _flushall=msvcrt._flushall @103 - _fmode_dll=msvcrt._fmode @104 DATA - _fpclass=msvcrt._fpclass @105 - _fpieee_flt=msvcrt._fpieee_flt @106 - _fpreset=msvcrt._fpreset @107 - _fputchar=msvcrt._fputchar @108 - _fputwchar=msvcrt._fputwchar @109 - _fsopen=msvcrt._fsopen @110 - _fstat=CRTDLL__fstat @111 - _ftime=msvcrt._ftime @112 - _ftol=msvcrt._ftol @113 - _fullpath=msvcrt._fullpath @114 - _futime=msvcrt._futime @115 - _gcvt=msvcrt._gcvt @116 - _get_osfhandle=msvcrt._get_osfhandle @117 - _getch=msvcrt._getch @118 - _getche=msvcrt._getche @119 - _getcwd=msvcrt._getcwd @120 - _getdcwd=msvcrt._getdcwd @121 - _getdiskfree=msvcrt._getdiskfree @122 - _getdllprocaddr=msvcrt._getdllprocaddr @123 - _getdrive=msvcrt._getdrive @124 - _getdrives=msvcrt._getdrives @125 - _getpid=msvcrt._getpid @126 - _getsystime=msvcrt._getsystime @127 - _getw=msvcrt._getw @128 - _global_unwind2=msvcrt._global_unwind2 @129 - _heapchk=msvcrt._heapchk @130 - _heapmin=msvcrt._heapmin @131 - _heapset=msvcrt._heapset @132 - _heapwalk=msvcrt._heapwalk @133 - _hypot=msvcrt._hypot @134 - _initterm=msvcrt._initterm @135 - _iob=msvcrt._iob @136 DATA - _isatty=msvcrt._isatty @137 - _isctype=msvcrt._isctype @138 - _ismbbalnum=msvcrt._ismbbalnum @139 - _ismbbalpha=msvcrt._ismbbalpha @140 - _ismbbgraph=msvcrt._ismbbgraph @141 - _ismbbkalnum=msvcrt._ismbbkalnum @142 - _ismbbkana=msvcrt._ismbbkana @143 - _ismbbkpunct=msvcrt._ismbbkpunct @144 - _ismbblead=msvcrt._ismbblead @145 - _ismbbprint=msvcrt._ismbbprint @146 - _ismbbpunct=msvcrt._ismbbpunct @147 - _ismbbtrail=msvcrt._ismbbtrail @148 - _ismbcalpha=msvcrt._ismbcalpha @149 - _ismbcdigit=msvcrt._ismbcdigit @150 - _ismbchira=msvcrt._ismbchira @151 - _ismbckata=msvcrt._ismbckata @152 - _ismbcl0=msvcrt._ismbcl0 @153 - _ismbcl1=msvcrt._ismbcl1 @154 - _ismbcl2=msvcrt._ismbcl2 @155 - _ismbclegal=msvcrt._ismbclegal @156 - _ismbclower=msvcrt._ismbclower @157 - _ismbcprint=msvcrt._ismbcprint @158 - _ismbcspace=msvcrt._ismbcspace @159 - _ismbcsymbol=msvcrt._ismbcsymbol @160 - _ismbcupper=msvcrt._ismbcupper @161 - _ismbslead=msvcrt._ismbslead @162 - _ismbstrail=msvcrt._ismbstrail @163 - _isnan=msvcrt._isnan @164 - _itoa=msvcrt._itoa @165 - _itow=msvcrt._itow @166 - _j0=msvcrt._j0 @167 - _j1=msvcrt._j1 @168 - _jn=msvcrt._jn @169 - _kbhit=msvcrt._kbhit @170 - _lfind=msvcrt._lfind @171 - _loaddll=msvcrt._loaddll @172 - _local_unwind2=msvcrt._local_unwind2 @173 - _locking=msvcrt._locking @174 - _logb=msvcrt._logb @175 - _lrotl=msvcrt._lrotl @176 - _lrotr=msvcrt._lrotr @177 - _lsearch=msvcrt._lsearch @178 - _lseek=msvcrt._lseek @179 - _ltoa=msvcrt._ltoa @180 - _ltow=msvcrt._ltow @181 - _makepath=msvcrt._makepath @182 - _matherr=msvcrt._matherr @183 - _mbbtombc=msvcrt._mbbtombc @184 - _mbbtype=msvcrt._mbbtype @185 - _mbccpy=msvcrt._mbccpy @186 - _mbcjistojms=msvcrt._mbcjistojms @187 - _mbcjmstojis=msvcrt._mbcjmstojis @188 - _mbclen=msvcrt._mbclen @189 - _mbctohira=msvcrt._mbctohira @190 - _mbctokata=msvcrt._mbctokata @191 - _mbctolower=msvcrt._mbctolower @192 - _mbctombb=msvcrt._mbctombb @193 - _mbctoupper=msvcrt._mbctoupper @194 - _mbctype=msvcrt._mbctype @195 DATA - _mbsbtype=msvcrt._mbsbtype @196 - _mbscat=msvcrt._mbscat @197 - _mbschr=msvcrt._mbschr @198 - _mbscmp=msvcrt._mbscmp @199 - _mbscpy=msvcrt._mbscpy @200 - _mbscspn=msvcrt._mbscspn @201 - _mbsdec=msvcrt._mbsdec @202 - _mbsdup=msvcrt._mbsdup @203 - _mbsicmp=msvcrt._mbsicmp @204 - _mbsinc=msvcrt._mbsinc @205 - _mbslen=msvcrt._mbslen @206 - _mbslwr=msvcrt._mbslwr @207 - _mbsnbcat=msvcrt._mbsnbcat @208 - _mbsnbcmp=msvcrt._mbsnbcmp @209 - _mbsnbcnt=msvcrt._mbsnbcnt @210 - _mbsnbcpy=msvcrt._mbsnbcpy @211 - _mbsnbicmp=msvcrt._mbsnbicmp @212 - _mbsnbset=msvcrt._mbsnbset @213 - _mbsncat=msvcrt._mbsncat @214 - _mbsnccnt=msvcrt._mbsnccnt @215 - _mbsncmp=msvcrt._mbsncmp @216 - _mbsncpy=msvcrt._mbsncpy @217 - _mbsnextc=msvcrt._mbsnextc @218 - _mbsnicmp=msvcrt._mbsnicmp @219 - _mbsninc=msvcrt._mbsninc @220 - _mbsnset=msvcrt._mbsnset @221 - _mbspbrk=msvcrt._mbspbrk @222 - _mbsrchr=msvcrt._mbsrchr @223 - _mbsrev=msvcrt._mbsrev @224 - _mbsset=msvcrt._mbsset @225 - _mbsspn=msvcrt._mbsspn @226 - _mbsspnp=msvcrt._mbsspnp @227 - _mbsstr=msvcrt._mbsstr @228 - _mbstok=msvcrt._mbstok @229 - _mbstrlen=msvcrt._mbstrlen @230 - _mbsupr=msvcrt._mbsupr @231 - _memccpy=msvcrt._memccpy @232 - _memicmp=msvcrt._memicmp @233 - _mkdir=msvcrt._mkdir @234 - _mktemp=msvcrt._mktemp @235 - _msize=msvcrt._msize @236 - _nextafter=msvcrt._nextafter @237 - _onexit=msvcrt._onexit @238 - _open=msvcrt._open @239 - _open_osfhandle=msvcrt._open_osfhandle @240 - _osmajor_dll=CRTDLL__osmajor_dll @241 DATA - _osminor_dll=CRTDLL__osminor_dll @242 DATA - _osmode_dll=CRTDLL__osmode_dll @243 DATA - _osver_dll=msvcrt._osver @244 DATA - _osversion_dll=CRTDLL__osversion_dll @245 DATA - _pclose=msvcrt._pclose @246 - _pctype_dll=msvcrt._pctype @247 DATA - _pgmptr_dll=msvcrt._pgmptr @248 DATA - _pipe=msvcrt._pipe @249 - _popen=msvcrt._popen @250 - _purecall=msvcrt._purecall @251 - _putch=msvcrt._putch @252 - _putenv=msvcrt._putenv @253 - _putw=msvcrt._putw @254 - _pwctype_dll=msvcrt._pwctype @255 DATA - _read=msvcrt._read @256 - _rmdir=msvcrt._rmdir @257 - _rmtmp=msvcrt._rmtmp @258 - _rotl=msvcrt._rotl @259 - _rotr=msvcrt._rotr @260 - _scalb=msvcrt._scalb @261 - _searchenv=msvcrt._searchenv @262 - _seterrormode=msvcrt._seterrormode @263 - _setjmp=msvcrt._setjmp @264 - _setmode=msvcrt._setmode @265 - _setsystime=msvcrt._setsystime @266 - _sleep=msvcrt._sleep @267 - _snprintf=msvcrt._snprintf @268 - _snwprintf=msvcrt._snwprintf @269 - _sopen=msvcrt._sopen @270 - _spawnl=msvcrt._spawnl @271 - _spawnle=msvcrt._spawnle @272 - _spawnlp=msvcrt._spawnlp @273 - _spawnlpe=msvcrt._spawnlpe @274 - _spawnv=msvcrt._spawnv @275 - _spawnve=msvcrt._spawnve @276 - _spawnvp=msvcrt._spawnvp @277 - _spawnvpe=msvcrt._spawnvpe @278 - _splitpath=msvcrt._splitpath @279 - _stat=CRTDLL__stat @280 - _statusfp=msvcrt._statusfp @281 - _strcmpi=msvcrt._strcmpi @282 - _strdate=msvcrt._strdate @283 - _strdec @284 - _strdup=msvcrt._strdup @285 - _strerror=msvcrt._strerror @286 - _stricmp=msvcrt._stricmp @287 - _stricoll=msvcrt._stricoll @288 - _strinc @289 - _strlwr=msvcrt._strlwr @290 - _strncnt @291 - _strnextc @292 - _strnicmp=msvcrt._strnicmp @293 - _strninc @294 - _strnset=msvcrt._strnset @295 - _strrev=msvcrt._strrev @296 - _strset=msvcrt._strset @297 - _strspnp @298 - _strtime=msvcrt._strtime @299 - _strupr=msvcrt._strupr @300 - _swab=msvcrt._swab @301 - _sys_errlist=msvcrt._sys_errlist @302 DATA - _sys_nerr_dll=msvcrt._sys_nerr @303 DATA - _tell=msvcrt._tell @304 - _tempnam=msvcrt._tempnam @305 - _timezone_dll=msvcrt._timezone @306 DATA - _tolower=msvcrt._tolower @307 - _toupper=msvcrt._toupper @308 - _tzname=msvcrt._tzname @309 DATA - _tzset=msvcrt._tzset @310 - _ultoa=msvcrt._ultoa @311 - _ultow=msvcrt._ultow @312 - _umask=msvcrt._umask @313 - _ungetch=msvcrt._ungetch @314 - _unlink=msvcrt._unlink @315 - _unloaddll=msvcrt._unloaddll @316 - _utime=msvcrt._utime @317 - _vsnprintf=msvcrt._vsnprintf @318 - _vsnwprintf=msvcrt._vsnwprintf @319 - _wcsdup=msvcrt._wcsdup @320 - _wcsicmp=msvcrt._wcsicmp @321 - _wcsicoll=msvcrt._wcsicoll @322 - _wcslwr=msvcrt._wcslwr @323 - _wcsnicmp=msvcrt._wcsnicmp @324 - _wcsnset=msvcrt._wcsnset @325 - _wcsrev=msvcrt._wcsrev @326 - _wcsset=msvcrt._wcsset @327 - _wcsupr=msvcrt._wcsupr @328 - _winmajor_dll=msvcrt._winmajor @329 DATA - _winminor_dll=msvcrt._winminor @330 DATA - _winver_dll=msvcrt._winver @331 DATA - _write=msvcrt._write @332 - _wtoi=msvcrt._wtoi @333 - _wtol=msvcrt._wtol @334 - _y0=msvcrt._y0 @335 - _y1=msvcrt._y1 @336 - _yn=msvcrt._yn @337 - abort=msvcrt.abort @338 - abs=msvcrt.abs @339 - acos=msvcrt.acos @340 - asctime=msvcrt.asctime @341 - asin=msvcrt.asin @342 - atan=msvcrt.atan @343 - atan2=msvcrt.atan2 @344 - atexit=msvcrt.atexit @345 - atof=msvcrt.atof @346 - atoi=msvcrt.atoi @347 - atol=msvcrt.atol @348 - bsearch=msvcrt.bsearch @349 - calloc=msvcrt.calloc @350 - ceil=msvcrt.ceil @351 - clearerr=msvcrt.clearerr @352 - clock=msvcrt.clock @353 - cos=msvcrt.cos @354 - cosh=msvcrt.cosh @355 - ctime=msvcrt.ctime @356 - difftime=msvcrt.difftime @357 - div=msvcrt.div @358 - exit=msvcrt.exit @359 - exp=msvcrt.exp @360 - fabs=msvcrt.fabs @361 - fclose=msvcrt.fclose @362 - feof=msvcrt.feof @363 - ferror=msvcrt.ferror @364 - fflush=msvcrt.fflush @365 - fgetc=msvcrt.fgetc @366 - fgetpos=msvcrt.fgetpos @367 - fgets=msvcrt.fgets @368 - fgetwc=msvcrt.fgetwc @369 - floor=msvcrt.floor @370 - fmod=msvcrt.fmod @371 - fopen=msvcrt.fopen @372 - fprintf=msvcrt.fprintf @373 - fputc=msvcrt.fputc @374 - fputs=msvcrt.fputs @375 - fputwc=msvcrt.fputwc @376 - fread=msvcrt.fread @377 - free=msvcrt.free @378 - freopen=msvcrt.freopen @379 - frexp=msvcrt.frexp @380 - fscanf=msvcrt.fscanf @381 - fseek=msvcrt.fseek @382 - fsetpos=msvcrt.fsetpos @383 - ftell=msvcrt.ftell @384 - fwprintf=msvcrt.fwprintf @385 - fwrite=msvcrt.fwrite @386 - fwscanf=msvcrt.fwscanf @387 - getc=msvcrt.getc @388 - getchar=msvcrt.getchar @389 - getenv=msvcrt.getenv @390 - gets=msvcrt.gets @391 - gmtime=msvcrt.gmtime @392 - is_wctype=msvcrt.is_wctype @393 - isalnum=msvcrt.isalnum @394 - isalpha=msvcrt.isalpha @395 - iscntrl=msvcrt.iscntrl @396 - isdigit=msvcrt.isdigit @397 - isgraph=msvcrt.isgraph @398 - isleadbyte=msvcrt.isleadbyte @399 - islower=msvcrt.islower @400 - isprint=msvcrt.isprint @401 - ispunct=msvcrt.ispunct @402 - isspace=msvcrt.isspace @403 - isupper=msvcrt.isupper @404 - iswalnum=msvcrt.iswalnum @405 - iswalpha=msvcrt.iswalpha @406 - iswascii=msvcrt.iswascii @407 - iswcntrl=msvcrt.iswcntrl @408 - iswctype=msvcrt.iswctype @409 - iswdigit=msvcrt.iswdigit @410 - iswgraph=msvcrt.iswgraph @411 - iswlower=msvcrt.iswlower @412 - iswprint=msvcrt.iswprint @413 - iswpunct=msvcrt.iswpunct @414 - iswspace=msvcrt.iswspace @415 - iswupper=msvcrt.iswupper @416 - iswxdigit=msvcrt.iswxdigit @417 - isxdigit=msvcrt.isxdigit @418 - labs=msvcrt.labs @419 - ldexp=msvcrt.ldexp @420 - ldiv=msvcrt.ldiv @421 - localeconv=msvcrt.localeconv @422 - localtime=msvcrt.localtime @423 - log=msvcrt.log @424 - log10=msvcrt.log10 @425 - longjmp=msvcrt.longjmp @426 - malloc=msvcrt.malloc @427 - mblen=msvcrt.mblen @428 - mbstowcs=msvcrt.mbstowcs @429 - mbtowc=msvcrt.mbtowc @430 - memchr=msvcrt.memchr @431 - memcmp=msvcrt.memcmp @432 - memcpy=msvcrt.memcpy @433 - memmove=msvcrt.memmove @434 - memset=msvcrt.memset @435 - mktime=msvcrt.mktime @436 - modf=msvcrt.modf @437 - perror=msvcrt.perror @438 - pow=msvcrt.pow @439 - printf=msvcrt.printf @440 - putc=msvcrt.putc @441 - putchar=msvcrt.putchar @442 - puts=msvcrt.puts @443 - qsort=msvcrt.qsort @444 - raise=msvcrt.raise @445 - rand=msvcrt.rand @446 - realloc=msvcrt.realloc @447 - remove=msvcrt.remove @448 - rename=msvcrt.rename @449 - rewind=msvcrt.rewind @450 - scanf=msvcrt.scanf @451 - setbuf=msvcrt.setbuf @452 - setlocale=msvcrt.setlocale @453 - setvbuf=msvcrt.setvbuf @454 - signal=msvcrt.signal @455 - sin=msvcrt.sin @456 - sinh=msvcrt.sinh @457 - sprintf=msvcrt.sprintf @458 - sqrt=msvcrt.sqrt @459 - srand=msvcrt.srand @460 - sscanf=msvcrt.sscanf @461 - strcat=msvcrt.strcat @462 - strchr=msvcrt.strchr @463 - strcmp=msvcrt.strcmp @464 - strcoll=msvcrt.strcoll @465 - strcpy=msvcrt.strcpy @466 - strcspn=msvcrt.strcspn @467 - strerror=msvcrt.strerror @468 - strftime=msvcrt.strftime @469 - strlen=msvcrt.strlen @470 - strncat=msvcrt.strncat @471 - strncmp=msvcrt.strncmp @472 - strncpy=msvcrt.strncpy @473 - strpbrk=msvcrt.strpbrk @474 - strrchr=msvcrt.strrchr @475 - strspn=msvcrt.strspn @476 - strstr=msvcrt.strstr @477 - strtod=msvcrt.strtod @478 - strtok=msvcrt.strtok @479 - strtol=msvcrt.strtol @480 - strtoul=msvcrt.strtoul @481 - strxfrm=msvcrt.strxfrm @482 - swprintf=msvcrt.swprintf @483 - swscanf=msvcrt.swscanf @484 - system=msvcrt.system @485 - tan=msvcrt.tan @486 - tanh=msvcrt.tanh @487 - time=msvcrt.time @488 - tmpfile=msvcrt.tmpfile @489 - tmpnam=msvcrt.tmpnam @490 - tolower=msvcrt.tolower @491 - toupper=msvcrt.toupper @492 - towlower=msvcrt.towlower @493 - towupper=msvcrt.towupper @494 - ungetc=msvcrt.ungetc @495 - ungetwc=msvcrt.ungetwc @496 - vfprintf=msvcrt.vfprintf @497 - vfwprintf=msvcrt.vfwprintf @498 - vprintf=msvcrt.vprintf @499 - vsprintf=msvcrt.vsprintf @500 - vswprintf=msvcrt.vswprintf @501 - vwprintf=msvcrt.vwprintf @502 - wcscat=msvcrt.wcscat @503 - wcschr=msvcrt.wcschr @504 - wcscmp=msvcrt.wcscmp @505 - wcscoll=msvcrt.wcscoll @506 - wcscpy=msvcrt.wcscpy @507 - wcscspn=msvcrt.wcscspn @508 - wcsftime=msvcrt.wcsftime @509 - wcslen=msvcrt.wcslen @510 - wcsncat=msvcrt.wcsncat @511 - wcsncmp=msvcrt.wcsncmp @512 - wcsncpy=msvcrt.wcsncpy @513 - wcspbrk=msvcrt.wcspbrk @514 - wcsrchr=msvcrt.wcsrchr @515 - wcsspn=msvcrt.wcsspn @516 - wcsstr=msvcrt.wcsstr @517 - wcstod=msvcrt.wcstod @518 - wcstok=msvcrt.wcstok @519 - wcstol=msvcrt.wcstol @520 - wcstombs=msvcrt.wcstombs @521 - wcstoul=msvcrt.wcstoul @522 - wcsxfrm=msvcrt.wcsxfrm @523 - wctomb=msvcrt.wctomb @524 - wprintf=msvcrt.wprintf @525 - wscanf=msvcrt.wscanf @526 Modified: trunk/reactos/dll/win32/crtdll/crtdll.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/crtdll.sp… ============================================================================== --- trunk/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/crtdll.spec [iso-8859-1] Mon Jun 20 12:41:32 2011 @@ -94,7 +94,7 @@ @ cdecl _fgetchar() msvcrt._fgetchar @ cdecl _fgetwchar() msvcrt._fgetwchar @ cdecl _filbuf(ptr) msvcrt._filbuf - @ extern _fileinfo_dll msvcrt._fileinfo + @ extern _fileinfo_dll @ cdecl _filelength(long) msvcrt._filelength @ cdecl _fileno(ptr) msvcrt._fileno @ cdecl _findclose(long) msvcrt._findclose Modified: trunk/reactos/dll/win32/crtdll/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/crtdll/dllmain.c… ============================================================================== --- trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/crtdll/dllmain.c [iso-8859-1] Mon Jun 20 12:41:32 2011 @@ -46,6 +46,7 @@ unsigned int CRTDLL__osminor_dll; unsigned int CRTDLL__osmode_dll; unsigned int CRTDLL__osversion_dll; +int _fileinfo_dll; extern char* _acmdln; /* pointer to ascii command line */ extern wchar_t* _wcmdln; /* pointer to wide character command line */ Modified: trunk/reactos/include/crt/crtdefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/crtdefs.h?rev=… ============================================================================== --- trunk/reactos/include/crt/crtdefs.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/crtdefs.h [iso-8859-1] Mon Jun 20 12:41:32 2011 @@ -52,7 +52,7 @@ #ifndef _CRTIMP #ifdef CRTDLL /* Defined for ntdll, crtdll, msvcrt, etc */ - #define _CRTIMP __declspec(dllexport) + #define _CRTIMP #elif defined(_DLL) #define _CRTIMP __declspec(dllimport) #else /* !CRTDLL && !_DLL */ Modified: trunk/reactos/include/crt/excpt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/excpt.h?rev=52… ============================================================================== --- trunk/reactos/include/crt/excpt.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/excpt.h [iso-8859-1] Mon Jun 20 12:41:32 2011 @@ -44,18 +44,17 @@ _CRTIMP EXCEPTION_DISPOSITION __cdecl __C_specific_handler (struct _EXCEPTION_RECORD *_ExceptionRecord,void *_EstablisherFrame,struct _CONTEXT *_ContextRecord,struct _DISPATCHER_CONTEXT *_DispatcherContext); #endif -#ifdef _MSC_VER // HACK!!! +#ifdef _MSC_VER #define GetExceptionCode _exception_code #define exception_code _exception_code #define GetExceptionInformation (struct _EXCEPTION_POINTERS *)_exception_info #define exception_info (struct _EXCEPTION_POINTERS *)_exception_info #define AbnormalTermination _abnormal_termination #define abnormal_termination _abnormal_termination -#endif - unsigned long __cdecl _exception_code(void); void *__cdecl _exception_info(void); int __cdecl _abnormal_termination(void); +#endif #define EXCEPTION_EXECUTE_HANDLER 1 #define EXCEPTION_CONTINUE_SEARCH 0

13 years, 6 months

[tkreuzer] 52379: [CRT] Implement call_ebp_func for msvc

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 20 11:27:55 2011 New Revision: 52379 URL: http://svn.reactos.org/svn/reactos?rev=52379&view=rev Log: [CRT] Implement call_ebp_func for msvc Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c Modified: trunk/reactos/lib/sdk/crt/except/cppexcept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/cppexce… ============================================================================== --- trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/except/cppexcept.c [iso-8859-1] Mon Jun 20 11:27:55 2011 @@ -41,24 +41,39 @@ EXCEPTION_REGISTRATION_RECORD* nested_frame, int nested_trylevel ); /* call a function with a given ebp */ -static inline void *call_ebp_func( void *func, void *ebp ) -{ - void *ret; +#ifdef _MSC_VER +#pragma warning(disable:4731) // don't warn about modification of ebp +#endif +static inline void *call_ebp_func( void *func, void *_ebp ) +{ + void *result; +#ifdef _MSC_VER + __asm + { + push ebx + push ebp + mov ebp, _ebp + call func + pop ebp + pop ebx + mov result, eax + } +#else int dummy; -#ifdef _MSC_VER -#pragma message ("call_ebp_func is unimplemented for MSC") -#else __asm__ __volatile__ ("pushl %%ebx\n\t" "pushl %%ebp\n\t" "movl %4,%%ebp\n\t" "call *%%eax\n\t" "popl %%ebp\n\t" "popl %%ebx" - : "=a" (ret), "=S" (dummy), "=D" (dummy) - : "0" (func), "1" (ebp) : "ecx", "edx", "memory" ); -#endif - return ret; -} + : "=a" (result), "=S" (dummy), "=D" (dummy) + : "0" (func), "1" (_ebp) : "ecx", "edx", "memory" ); +#endif + return result; +} +#ifdef _MSC_VER +#pragma warning(default:4731) +#endif /* call a copy constructor */ static inline void call_copy_ctor( void *func, void *this, void *src, int has_vbase )

13 years, 6 months

[cgutman] 52378: [NTOSKRNL] - Use PoCallDriver when sending a power IRP

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jun 20 10:54:00 2011 New Revision: 52378 URL: http://svn.reactos.org/svn/reactos?rev=52378&view=rev Log: [NTOSKRNL] - Use PoCallDriver when sending a power IRP Modified: trunk/reactos/ntoskrnl/po/power.c Modified: trunk/reactos/ntoskrnl/po/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/power.c?rev=52… ============================================================================== --- trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/power.c [iso-8859-1] Mon Jun 20 10:54:00 2011 @@ -574,7 +574,7 @@ *pIrp = Irp; IoSetCompletionRoutine(Irp, PopRequestPowerIrpCompletion, RequestPowerItem, TRUE, TRUE, TRUE); - IoCallDriver(TopDeviceObject, Irp); + PoCallDriver(TopDeviceObject, Irp); /* Always return STATUS_PENDING. The completion routine * will call CompletionFunction and complete the Irp.

13 years, 6 months

[tkreuzer] 52377: [DOSKEY] Fix copy paste bug. Patch by r3ddr4g0n

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 20 09:18:42 2011 New Revision: 52377 URL: http://svn.reactos.org/svn/reactos?rev=52377&view=rev Log: [DOSKEY] Fix copy paste bug. Patch by r3ddr4g0n Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c [iso-8859-1] Mon Jun 20 09:18:42 2011 @@ -209,7 +209,7 @@ pExpungeConsoleCommandHistoryW = (ExpungeConsoleCommandHistoryW_t)GetProcAddress( hKernel32, "ExpungeConsoleCommandHistoryW"); assert(pGetConsoleCommandHistoryW && pGetConsoleCommandHistoryLengthW && - pSetConsoleNumberOfCommandsW && pSetConsoleNumberOfCommandsW); + pSetConsoleNumberOfCommandsW && pExpungeConsoleCommandHistoryW); /* Skip the application name */ GetArg(&pArgStart, &pArgEnd);

13 years, 6 months

[osiejka] 52376: [UTF8] - Convert format, fdebug, ntvdm and win32csr polish locale to UTF-8; - Clean up remainder of #pragma definitions in individual language rc files. This should prevent bugs li...

by osiejka＠svn.reactos.org

Author: osiejka Date: Sun Jun 19 22:55:34 2011 New Revision: 52376 URL: http://svn.reactos.org/svn/reactos?rev=52376&view=rev Log: [UTF8] - Convert format, fdebug, ntvdm and win32csr polish locale to UTF-8; - Clean up remainder of #pragma definitions in individual language rc files. This should prevent bugs like one with chineese locale in calc; - Move bulgarian and romanian locales, already converted to UTF-8 to proper section in module rc file; Modified: trunk/reactos/base/applications/calc/resource.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/hy-AM.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/notepad/rsrc.rc trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/system/format/lang/pl-PL.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/winlogon/lang/ro-RO.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/boot/freeldr/fdebug/fdebug.rc trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc trunk/reactos/dll/cpl/console/lang/ro-RO.rc trunk/reactos/dll/cpl/desk/lang/ro-RO.rc trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc trunk/reactos/dll/cpl/input/lang/ro-RO.rc trunk/reactos/dll/cpl/intl/lang/ro-RO.rc trunk/reactos/dll/cpl/joy/lang/ro-RO.rc trunk/reactos/dll/cpl/main/lang/ro-RO.rc trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc trunk/reactos/dll/win32/browseui/lang/bg-BG.rc trunk/reactos/dll/win32/devmgr/devmgr.rc trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc trunk/reactos/dll/win32/modemui/lang/ro-RO.rc trunk/reactos/dll/win32/modemui/modemui.rc trunk/reactos/dll/win32/msgina/lang/ro-RO.rc trunk/reactos/dll/win32/msgina/msgina.rc trunk/reactos/dll/win32/newdev/lang/ro-RO.rc trunk/reactos/dll/win32/newdev/rsrc.rc trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc trunk/reactos/dll/win32/syssetup/syssetup.rc trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc trunk/reactos/subsystems/ntvdm/rsrc.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc Modified: trunk/reactos/base/applications/calc/resource.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -60,7 +60,6 @@ #include "lang/sv-SE.rc" #include "lang/th-TH.rc" - // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) STRINGTABLE DISCARDABLE BEGIN @@ -13,5 +11,3 @@ IDS_ERROR_NOCLASS, "Nu s-a putut iniÅ£ializa clasa de ferestre." IDS_ERROR_BADCMD, "Niciun font specificat.\nSintaxÄ:\n fontview.exe <fiÈier font>" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -89,5 +89,3 @@ VK_F1, IDM_HELP_CONTENTS, VIRTKEY, NOINVERT VK_F2, IDM_GAME_NEW, VIRTKEY, NOINVERT END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -62,5 +62,3 @@ BEGIN IDS_APP_TITLE "LupÄ" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -280,5 +280,3 @@ BEGIN IDS_APPNAME "Gestionarul de servicii ReactOS" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… ============================================================================== --- trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mspaint/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -204,5 +204,3 @@ IDS_FILESIZE, "%d bytes" IDS_PRINTRES, "%d x %d pixels per meter" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/notepad/lang/hy-AM.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/hy-AM.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -186,5 +186,3 @@ STRING_CR, "ÕÕ¡Õ¯Õ«Õ¶Õ¿Õ¸Õ·" STRING_LINE_COLUMN, "Line %d, column %d" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -202,5 +202,3 @@ STRING_CR, "Mac" STRING_LINE_COLUMN, "Linie %d, coloanÄ %d" END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -52,7 +52,6 @@ #include "lang/nl-NL.rc" #include "lang/no-NO.rc" #include "lang/pt-PT.rc" - #include "lang/sk-SK.rc" #include "lang/sl-SI.rc" #include "lang/sv-SE.rc" Modified: trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -5,5 +5,3 @@ IDS_DESCRIPTION "Ecran de veghe SiglÄ" IDS_TEXT "Acest ecran de veghe nu are opÈiuni." END - -#pragma code_page(default) Modified: trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ja-JP.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -4,7 +4,6 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_JPN) #ifdef _WIN32 LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT -#pragma code_page(65001) #endif //_WIN32 #define IDS_PHYSICAL_MEMORY_AVAILABLE 1067 ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -4,7 +4,6 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL -#pragma code_page(65001) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -652,8 +651,6 @@ IDS_Running "RuleazÄ" END - -#pragma code_page(1252) #endif // Romanian resources ///////////////////////////////////////////////////////////////////////////// Modified: trunk/reactos/base/system/format/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/pl… ============================================================================== --- trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,57 +1,57 @@ -#include "resource.h" /* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ + * translated by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN -STRING_HELP, "Sposób u¿ycia: %s wolumin: [-FS:syst-plik] [-V:etykieta] [-Q] [-A:rozmiar] [-C]\n\n\ - [wolumin:] Okrela literê dysku przeznaczonego do formatowania.\n\ - -FS:syst-plik Okrela rodzaj systemu plików (%s).\n\ - -V:etykieta Okrela etykietê woluminu.\n\ +STRING_HELP, "SposÃ³b uÅ¼ycia: %s wolumin: [-FS:syst-plik] [-V:etykieta] [-Q] [-A:rozmiar] [-C]\n\n\ + [wolumin:] OkreÅla literÄ dysku przeznaczonego do formatowania.\n\ + -FS:syst-plik OkreÅla rodzaj systemu plikÃ³w (%s).\n\ + -V:etykieta OkreÅla etykietÄ woluminu.\n\ -Q Przeprowadza szybkie formatowanie.\n\ - -A:rozmiar Zastêpuje domylny rozmiar jednostki alokacji. Dla zastosowañ\n\ - ogólnych zaleca siê u¿ywanie ustawieñ domylnych.\n\ - System NTFS obs³uguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ + -A:rozmiar ZastÄpuje domyÅlny rozmiar jednostki alokacji. Dla zastosowaÅ\n\ + ogÃ³lnych zaleca siÄ uÅ¼ywanie ustawieÅ domyÅlnych.\n\ + System NTFS obsÅuguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ 16 KB, 32 KB, 64 KB.\n\ - System FAT obs³uguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ + System FAT obsÅuguje rozmiary: 512, 1024, 2048, 4096, 8192,\n\ 16 KB, 32 KB, 64 KB, 128 KB, 256 KB.\n\ - Kompresja NTFS nie jest obs³ugiwana dla jednostek alokacji\n\ - wiêkszych ni¿ 4096 bajtów.\n\ - -C Pliki utworzone na nowym woluminie bêd¹ domylnie poddane\n\ + Kompresja NTFS nie jest obsÅugiwana dla jednostek alokacji\n\ + wiÄkszych niÅ¼ 4096 bajtÃ³w.\n\ + -C Pliki utworzone na nowym woluminie bÄdÄ domyÅlnie poddane\n\ kompresji.\n\n" -STRING_COMPLETE "%lu procent ukoñczone.\r" +STRING_COMPLETE "%lu procent ukoÅczone.\r" -STRING_FORMAT_FAIL "FormatEx nie móg³ zakoñczyæ dzia³ania pomylnie.\n\n" +STRING_FORMAT_FAIL "FormatEx nie mÃ³gÅ zakoÅczyÄ dziaÅania pomyÅlnie.\n\n" STRING_NO_SUPPORT "Operacja niewspierana" -STRING_FMIFS_FAIL "Nie mo¿na zlokalizowaæ punktów wejciowych FMIFS.\n\n" +STRING_FMIFS_FAIL "Nie moÅ¼na zlokalizowaÄ punktÃ³w wejÅciowych FMIFS.\n\n" -STRING_UNKNOW_ARG "Nieprawid³owy parametr: %s\n" +STRING_UNKNOW_ARG "NieprawidÅowy parametr: %s\n" -STRING_DRIVE_PARM "Brakuj¹cy wymagany parametr dysku.\n\n" +STRING_DRIVE_PARM "BrakujÄcy wymagany parametr dysku.\n\n" -STRING_ERROR_DRIVE_TYPE "Nie mo¿na okreliæ rodzaju dysku" +STRING_ERROR_DRIVE_TYPE "Nie moÅ¼na okreÅliÄ rodzaju dysku" -STRING_INSERT_DISK "W³ó¿ nowy dysk do napêdu %C:\ni nacinij Enter, gdy bêdzie gotowe..." +STRING_INSERT_DISK "WÅÃ³Å¼ nowy dysk do napÄdu %C:\ni naciÅnij Enter..." -STRING_NO_VOLUME "Nie mo¿na odczytaæ woluminu" +STRING_NO_VOLUME "Nie moÅ¼na odczytaÄ woluminu" -STRING_NO_VOLUME_SIZE "Nie mo¿na odczytaæ rozmiaru woluminu" +STRING_NO_VOLUME_SIZE "Nie moÅ¼na odczytaÄ rozmiaru woluminu" -STRING_FILESYSTEM "Rodzaj systemu plików to %s.\n" +STRING_FILESYSTEM "Rodzaj systemu plikÃ³w to %s.\n" -STRING_LABEL_NAME_EDIT "Podaj aktualn¹ etykietê woluminu dla dysku %C: " +STRING_LABEL_NAME_EDIT "Podaj aktualnÄ etykietÄ woluminu dla dysku %C: " -STRING_ERROR_LABEL "Nieprawid³owa etykieta woluminu zosta³a wpisana dla tego dysku.\n" +STRING_ERROR_LABEL "NieprawidÅowa etykieta woluminu zostaÅa wpisana dla tego dysku.\n" -STRING_YN_FORMAT "\\OSTRZE¯ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ -W STACJI %C: ZOSTAN¥ UTRACONE!\nCzy kontynuowaæ formatowanie (T/N)? " +STRING_YN_FORMAT "\\OSTRZEÅ»ENIE: WSZYSTKIE DANE NA NIEWYJMOWALNYM DYSKU\n\ +W STACJI %C: ZOSTANÄ UTRACONE!\nCzy kontynuowaÄ formatowanie (T/N)? " STRING_YES_NO_FAQ "TN" @@ -59,17 +59,17 @@ STRING_FAST_FMT "Szybkie formatowanie" -STRING_CREATE_FSYS "Tworzenie struktury systemu plików.\n" +STRING_CREATE_FSYS "Tworzenie struktury systemu plikÃ³w.\n" -STRING_FMT_COMPLETE "Formatowanie ukoñczone.\n" +STRING_FMT_COMPLETE "Formatowanie ukoÅczone.\n" -STRING_VOL_COMPRESS "Wolumin nie obs³uguje kompresji.\n" +STRING_VOL_COMPRESS "Wolumin nie obsÅuguje kompresji.\n" -STRING_ENTER_LABEL "Podaj etykietê woluminu (11 znaków, ENTER = bez etykiety) " +STRING_ENTER_LABEL "Podaj etykietÄ woluminu (11 znakÃ³w, ENTER = bez etykiety) " -STRING_NO_LABEL "Nie mo¿na zmieniæ etykiety woluminu" +STRING_NO_LABEL "Nie moÅ¼na zmieniÄ etykiety woluminu" -STRING_FREE_SPACE "\n%I64d bajtów ca³kowitego miejsca na dysku.\n%I64d bajtów dostêpnych na dysku.\n" +STRING_FREE_SPACE "\n%I64d bajtÃ³w caÅkowitego miejsca na dysku.\n%I64d bajtÃ³w dostÄpnych na dysku.\n" STRING_SERIAL_NUMBER "\nNumer seryjny woluminu to %04X-%04X\n" END Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… ============================================================================== --- trunk/reactos/base/system/format/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/format/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -14,11 +14,11 @@ #include "lang/it-IT.rc" #include "lang/lt-LT.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/es-ES.rc" // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -44,5 +42,3 @@ BEGIN IDS_FAILEDACTIVATEUSERSHELL "Winlogon nu a putut porni nucleul sistemului!" END - -#pragma code_page(default) Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… ============================================================================== --- trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -19,7 +19,6 @@ #include "lang/lt-LT.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/ro-RO.rc" #include "lang/sv-SE.rc" #include "lang/sk-SK.rc" #include "lang/zh-CN.rc" @@ -27,5 +26,6 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/boot/freeldr/fdebug/fdebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/fdebug… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/fdebug.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -17,11 +17,11 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/tr-TR.rc" // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/p… ============================================================================== --- trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/fdebug/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,10 +1,10 @@ ///////////////////////////////////////////////////////////////////////////// // Polish (P.L.) resources // 2005 Emil Kaczmarek +// UTF-8 conversion by Caemyr (May, 2011) #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_POLISH, SUBLANG_DEFAULT -#pragma code_page(1250) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -16,17 +16,17 @@ BEGIN POPUP "&Plik" BEGIN - MENUITEM "P&o³¹cz", IDM_FILE_CONNECT - MENUITEM "&Roz³¹cz", IDM_FILE_DISCONNECT, GRAYED + MENUITEM "P&oÅÄcz", IDM_FILE_CONNECT + MENUITEM "&RozÅÄcz", IDM_FILE_DISCONNECT, GRAYED MENUITEM SEPARATOR - MENUITEM "&Wyczyæ wywietlacz", IDM_FILE_CLEARDISPLAY + MENUITEM "&WyczyÅÄ wyÅwietlacz", IDM_FILE_CLEARDISPLAY MENUITEM SEPARATOR MENUITEM "Ro&zpocznij zrzut", IDM_FILE_STARTCAPTURE MENUITEM "Za&trzymaj zrzut", IDM_FILE_STOPCAPTURE, GRAYED MENUITEM SEPARATOR MENUITEM "Lo&kalne Echo", IDM_FILE_LOCALECHO MENUITEM SEPARATOR - MENUITEM "&Wyjcie", IDM_EXIT + MENUITEM "&WyjÅcie", IDM_EXIT END POPUP "Po&moc" BEGIN @@ -132,12 +132,12 @@ IDD_CONNECTION DIALOGEX DISCARDABLE 0, 0, 196, 100 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Opcje po³¹czenia" +CAPTION "Opcje poÅÄczenia" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Wprowad port COM (np. COM1):",IDC_STATIC,7,7,108,8 + LTEXT "WprowadÅº port COM (np. COM1):",IDC_STATIC,7,7,108,8 EDITTEXT IDC_COMPORT,7,17,182,14,ES_AUTOHSCROLL - LTEXT "Wprowad szybkoæ portu w bodach (np. 115200):",IDC_STATIC,7,38,114, + LTEXT "WprowadÅº szybkoÅÄ portu w bodach (np. 115200):",IDC_STATIC,7,38,114, 8 EDITTEXT IDC_BAUTRATE,7,48,182,14,ES_AUTOHSCROLL DEFPUSHBUTTON "OK",IDOK,45,79,50,14 @@ -146,12 +146,12 @@ IDD_CAPTURE DIALOGEX DISCARDABLE 0, 0, 251, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Przechwyæ plik" +CAPTION "PrzechwyÄ plik" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Nazwa pliku zrzutu:",IDC_STATIC,7,17,62,8 EDITTEXT IDC_CAPTUREFILENAME,7,26,181,14,ES_AUTOHSCROLL - PUSHBUTTON "Przeg&l¹daj",IDC_BROWSE,194,26,50,14 + PUSHBUTTON "Przeg&lÄdaj",IDC_BROWSE,194,26,50,14 DEFPUSHBUTTON "OK",IDOK,139,74,50,14 PUSHBUTTON "Anuluj",IDCANCEL,194,74,50,14 END @@ -172,7 +172,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_LICENSE "Ten program nale¿y do wolnego oprogramowania; mo¿esz go rozpowszechniaæ i/lub modyfikowaæ w zgodzie z zasadami licencji GNU GPL w formie w jakiej zosta³y opublikowane przez fundacjê Free Software Foundation; albo w wersji 2 Licencji albo (tu masz wybór) w jakiejkolwiek póniejszej wersji.\r\n\r\nRozpowszechniaj¹c ten program mamy nadziejê, ¿e bêdzie u¿yteczny, ale BEZ ¯ADNEJ GWARANCJI; nawet bez zak³adanej gwarancji HANDLOWOCI, a w szczególnym przypadku zdatnoci. Aby poznaæ wiêcej szczegó³ów, zajrzyj do licencji GNU.\r\n\r\nKopia licencji GNU GPL powinna byæ dostarczona razem z tym programem; jeli tak nie jest, napisz list do fundacji na adres: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." + IDS_LICENSE "Ten program naleÅ¼y do wolnego oprogramowania; moÅ¼esz go rozpowszechniaÄ i/lub modyfikowaÄ w zgodzie z zasadami licencji GNU GPL w formie w jakiej zostaÅy opublikowane przez fundacjÄ Free Software Foundation; albo w wersji 2 Licencji albo (tu masz wybÃ³r) w jakiejkolwiek pÃ³Åºniejszej wersji.\r\n\r\nRozpowszechniajÄc ten program mamy nadziejÄ, Å¼e bÄdzie uÅ¼yteczny, ale BEZ Å»ADNEJ GWARANCJI; nawet bez zakÅadanej gwarancji HANDLOWOÅCI, a w szczegÃ³lnym przypadku zdatnoÅci. Aby poznaÄ wiÄcej szczegÃ³ÅÃ³w, zajrzyj do licencji GNU.\r\n\r\nKopia licencji GNU GPL powinna byÄ dostarczona razem z tym programem; jeÅli tak nie jest, napisz list do fundacji na adres: Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." END @@ -190,4 +190,3 @@ ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED - Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/access/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/access/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -301,5 +301,3 @@ IDS_SECONDS "secunde" IDS_MINUTES "minute" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/console/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/ro-RO… ============================================================================== --- trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/console/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -146,5 +146,3 @@ IDS_SCREEN_TEXT "C:\\ReactOS> dir\nSYSTEM <DIR> 10-01-99 5:00\nSYSTEM32 <DIR> 10-01-99 5:00" IDS_RASTERFONTS "Fonturi raster" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/desk/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -265,5 +265,3 @@ IDS_APPLY_FAILED "Nu s-au putut aplica noile setÄri." IDS_APPLY_NEEDS_RESTART "Trebuie sÄ reporniÈi computerul pentru a aplica noile setÄri." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.… ============================================================================== --- trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/hdwwiz/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -145,5 +145,3 @@ IDS_SELECTWAYTITLE "Acest Expert vÄ poate ajuta sÄ instalaÈi alt hardware" IDS_HDTYPESTITLE "Din lista de mai jos, alegeÈi dispozitivul pe care vreÈi sÄ Ã®l instalaÈi." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/input/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -239,5 +239,3 @@ IDS_UZBEK_CYRILLIC_LAYOUT, "Uzbek Cyrillic" IDS_VIETNAMESE_LAYOUT, "Vietnamese" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/intl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/intl/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/intl/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -197,5 +197,3 @@ IDS_CPLNAME "OpÈiuni regionale" IDS_CPLDESCRIPTION "SetÄri limbi Èi formatare numere, valute, datÄ Èi timp." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/joy/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/joy/lang/ro-RO.rc?… ============================================================================== --- trunk/reactos/dll/cpl/joy/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/joy/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -82,5 +82,3 @@ IDS_CONTROLLER "Controlor" IDS_STATUS "Stare" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/main/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/ro-RO.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -170,5 +170,3 @@ IDS_OVERWRITE_TEXT "Numele de schemÄ ales este deja Ã®n folosinÈÄ. VreÈi sÄ suprascrieÈi schema actualÄ?" IDS_ANIMATE_CURSOR "Cursoare animate" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -267,5 +267,3 @@ 5853 "Intrare Ã®n ReactOS" 5854 "ReactOS Explorer" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/ro-R… ============================================================================== --- trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/powercfg/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -162,5 +162,3 @@ IDS_DEL_SCHEME "SunteÈi sigur cÄ vreÈi sÄ eliminaÈi aceastÄ schemÄ?" IDS_DEL_SCHEME_TITLE "Eliminare schemÄ" END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/ro-RO.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -288,5 +288,3 @@ IDS_WARNINITIALRANGE "The initial size of the paging file must not be smaller than 2 MB and must not exceed the available space on the selected drive." IDS_WARNMAXIMUMRANGE "The maximum size of the paging file must not be smaller than its initial size and must not exceed the available space on the selected drive." END - -#pragma code_page(default) Modified: trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/timedate/lang/ro-R… ============================================================================== --- trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/timedate/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -66,5 +66,3 @@ IDS_INETTIMESYNCING "AÈteptaÈi cÃ¢t ReactOS se sincronizeazÄ cu %s" IDS_INETTIMEERROR "A apÄrut o eroare cÃ¢t timp ReactOS se sincroniza cu %s" END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/browseui/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/lang/bg… ============================================================================== --- trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/lang/bg-BG.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -15,9 +15,6 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ - -/* UTF-8 */ -#pragma code_page(65001) LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT @@ -272,5 +269,3 @@ IDS_BACK "ÐÐ°Ð·Ð°Ð´" IDS_FORWARD "ÐÐ°Ð¿ÑÐµÐ´" END - - Modified: trunk/reactos/dll/win32/devmgr/devmgr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/devmgr.rc… ============================================================================== --- trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/devmgr.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -25,7 +25,6 @@ #include "lang/it-IT.rc" #include "lang/no-NO.rc" #include "lang/pt-BR.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" @@ -33,3 +32,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,8 +1,6 @@ // Romanian language resource file (Petru Dimitriu, 2009-07-15) LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) STRINGTABLE BEGIN @@ -229,5 +227,3 @@ ICON "", IDC_DEVICON, 7, 7, 20, 20 LTEXT "", IDC_DEVNAME, 37, 9, 174, 16, SS_NOPREFIX END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/modemui/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/modemui/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDM_MENU MENU BEGIN @@ -613,5 +611,3 @@ 6604 "Iugoslavia" 20013 "ID dispozitiv" END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/modemui/modemui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/modemui.… ============================================================================== --- trunk/reactos/dll/win32/modemui/modemui.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/modemui/modemui.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -17,10 +17,10 @@ #include "lang/en-US.rc" #include "lang/es-ES.rc" #include "lang/no-NO.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/msgina/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_STATUSWINDOW_DLG DIALOGEX 0,0,274,26 STYLE NOT WS_VISIBLE | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_BORDER | WS_CAPTION | WS_DLGFRAME | WS_POPUP @@ -57,5 +55,3 @@ IDS_ASKFORPASSWORD "Parola: " IDS_FORCELOGOFF "Aceasta ac?iune va Ã®nchide sesiunea utilizatorului curent ?i va pierde datele nesalvate de acesta. Sigur continua?i?" END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/msgina/msgina.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/msgina.rc… ============================================================================== --- trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msgina/msgina.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -20,7 +20,6 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" @@ -28,3 +27,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/newdev/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,6 +1,4 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | @@ -108,5 +106,3 @@ 179,11 LTEXT "DISPOZITIV NECUNOSCUT",IDC_DEVICE,148,53,147,12 END - -#pragma code_page(default) Modified: trunk/reactos/dll/win32/newdev/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/rsrc.rc?r… ============================================================================== --- trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -19,7 +19,6 @@ #include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/nl-NL.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" @@ -28,3 +27,4 @@ // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/ro… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/ro-RO.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -18,8 +18,6 @@ */ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL - -#pragma code_page(65001) IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU @@ -294,6 +292,3 @@ BEGIN IDS_STATUS_INSTALL_DEV "Instalare dispozitive..." END - -#pragma code_page(default) -/* EOF */ Modified: trunk/reactos/dll/win32/syssetup/syssetup.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/syssetu… ============================================================================== --- trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/syssetup.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -54,9 +54,9 @@ #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/zh-CN.rc" -#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" // UTF-8 #pragma code_page(65001) #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" Modified: trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/lang/pl-P… ============================================================================== --- trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,14 +1,14 @@ -#include "resource.h" /* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -*/ - + * translated by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * UTF-8 conversion by Caemyr (May, 2011) + */ + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT STRINGTABLE DISCARDABLE BEGIN STRING_WelcomeMsg, "Wirtualna maszyna DOS dla ReactOS.\n" -STRING_PromptMsg, "Wcinij r<cr> aby uruchomiæ, s<cr> aby wy³¹czyæ lub q<cr>, aby zakoñczyæ." +STRING_PromptMsg, "WciÅnij r<cr> aby uruchomiÄ, s<cr> aby wyÅÄczyÄ lub q<cr>, aby zakoÅczyÄ." END Modified: trunk/reactos/subsystems/ntvdm/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/rsrc.rc?r… ============================================================================== --- trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -14,7 +14,6 @@ #include "lang/ja-JP.rc" #include "lang/no-NO.rc" #include "lang/th-TH.rc" -#include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/sk-SK.rc" #include "lang/zh-CN.rc" @@ -22,5 +21,6 @@ // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -1,35 +1,37 @@ /* -* translated by xrogers (http://rogers.cyberdusk.pl/) -* xxrogers(a)users.sourceforge.net -* https://sourceforge.net/projects/reactospl -* translation update by Olaf Siejka (Caemyr), Apr 2011 -*/ + * translated by xrogers + * xxrogers(a)users.sourceforge.net + * https://sourceforge.net/projects/reactospl + * translation update by Olaf Siejka (Caemyr), Apr 2011 + * UTF-8 conversion by Caemyr (May, 2011) + */ + LANGUAGE LANG_POLISH, SUBLANG_DEFAULT IDD_END_NOW DIALOGEX DISCARDABLE 0, 0, 200, 95 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zakoñcz program - " +CAPTION "ZakoÅcz program - " FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Trwa zamykanie programu... Proszê czekaæ",IDC_STATIC,7,7,186,11 - CONTROL "Postêp",IDC_PROGRESS,"msctls_progress32",WS_BORDER, + LTEXT "Trwa zamykanie programu... ProszÄ czekaÄ",IDC_STATIC,7,7,186,11 + CONTROL "PostÄp",IDC_PROGRESS,"msctls_progress32",WS_BORDER, 7,20,186,13 - LTEXT "Jeli zdecydujesz siê zamkn¹æ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoñczyæ program, wcinij Zakoñcz teraz.", + LTEXT "JeÅli zdecydujesz siÄ zamknÄÄ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoÅczyÄ program, wciÅnij ZakoÅcz teraz.", IDC_STATIC,7,40,186,26 - DEFPUSHBUTTON "&Zakoñcz teraz",IDC_END_NOW,150,71,43,17 + DEFPUSHBUTTON "&ZakoÅcz teraz",IDC_END_NOW,150,71,43,17 END IDD_NOT_RESPONDING DIALOGEX DISCARDABLE 0, 0, 192, 122 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Zakoñcz program - " +CAPTION "ZakoÅcz program - " FONT 8, "MS Shell Dlg" BEGIN DEFPUSHBUTTON "Anuluj",IDCANCEL,142,98,43,17 - PUSHBUTTON "&Zakoñcz teraz",IDC_END_NOW,78,98,43,17 + PUSHBUTTON "&ZakoÅcz teraz",IDC_END_NOW,78,98,43,17 LTEXT "Wybrany program nie odpowiada",IDC_STATIC,7,7,178,8 - LTEXT "Aby powróciæ do ReactOS i sprawdziæ status programu, kliknij Anuluj", + LTEXT "Aby powrÃ³ciÄ do ReactOS i sprawdziÄ status programu, kliknij Anuluj", IDC_STATIC,7,26,178,16 - LTEXT "Jeli zdecydujesz siê zamkn¹æ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoñczyæ program, wcinij Zakoñcz teraz.", + LTEXT "JeÅli zdecydujesz siÄ zamknÄÄ program natychmiastowo, utracisz wszelkie niezapisane dane. Aby zakoÅczyÄ program, wciÅnij ZakoÅcz teraz.", IDC_STATIC,7,53,178,26 END @@ -45,20 +47,20 @@ BEGIN IDS_EDIT "Edytuj" IDS_MARK "Zaznacz" - IDS_COPY "Kopiuj\tWejd" + IDS_COPY "Kopiuj\tWejdÅº" IDS_PASTE "Wklej" IDS_SELECTALL "Zaznacz wszystko" - IDS_SCROLL "Przewiñ" - IDS_FIND "Znajd..." - IDS_DEFAULTS "Ustawienia domylne" - IDS_PROPERTIES "W³aciwoci" - IDS_SCROLLHERE "Przewiñ tutaj" - IDS_SCROLLTOP "Przewiñ na pocz¹tek" - IDS_SCROLLBOTTOM "Przewiñ na koniec" + IDS_SCROLL "PrzewiÅ" + IDS_FIND "ZnajdÅº..." + IDS_DEFAULTS "Ustawienia domyÅlne" + IDS_PROPERTIES "WÅaÅciwoÅci" + IDS_SCROLLHERE "PrzewiÅ tutaj" + IDS_SCROLLTOP "PrzewiÅ na poczÄtek" + IDS_SCROLLBOTTOM "PrzewiÅ na koniec" IDS_SCROLLPAGE_UP "Poprzednia strona" - IDS_SCROLLPAGE_DOWN "Nastêpna strona" - IDS_SCROLLUP "Przewiñ do góry" - IDS_SCROLLDOWN "Przewiñ na dó³" + IDS_SCROLLPAGE_DOWN "NastÄpna strona" + IDS_SCROLLUP "PrzewiÅ do gÃ³ry" + IDS_SCROLLDOWN "PrzewiÅ na dÃ³Å" IDS_COMMAND_PROMPT "Wiersz polecenia" END Modified: trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/rsrc.rc [iso-8859-1] Sun Jun 19 22:55:34 2011 @@ -15,7 +15,6 @@ #include "lang/it-IT.rc" #include "lang/ja-JP.rc" #include "lang/no-NO.rc" -#include "lang/pl-PL.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" #include "lang/zh-CN.rc" @@ -23,5 +22,6 @@ // UTF-8 #pragma code_page(65001) +#include "lang/pl-PL.rc" #include "lang/ru-RU.rc" #include "lang/uk-UA.rc"

13 years, 6 months

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