Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 53019: [TCPIP] - Remove the extra debug prints since the bug has been fixed
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 13:50:00 2011 New Revision: 53019 URL: http://svn.reactos.org/svn/reactos?rev=53019&view=rev Log: [TCPIP] - Remove the extra debug prints since the bug has been fixed Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Mon Aug 1 13:50:00 2011 @@ -284,7 +284,6 @@ { /* The client specified an explicit port so we force a bind to this */ AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); - DbgPrint("Bind - Explicit port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff) @@ -300,7 +299,6 @@ { /* The client is trying to bind to a local address so allocate a port now too */ AddrFile->Port = TCPAllocatePort(0); - DbgPrint("Bind - Unspecified port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff) Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Mon Aug 1 13:50:00 2011 @@ -88,8 +88,6 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); - - DbgPrint("Listen - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -110,7 +108,6 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - DbgPrint("Listen - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 1 13:50:00 2011 @@ -773,8 +773,6 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); - - DbgPrint("Connect - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -805,7 +803,6 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); - DbgPrint("Connect - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF);

1 0

[cgutman] 53018: [AFD] - Use the correct access mode
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 12:41:31 2011 New Revision: 53018 URL: http://svn.reactos.org/svn/reactos?rev=53018&view=rev Log: [AFD] - Use the correct access mode Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Aug 1 12:41:31 2011 @@ -156,7 +156,7 @@ if( MapBuf[i].Mdl ) { AFD_DbgPrint(MID_TRACE,("Probe and lock pages\n")); _SEH2_TRY { - MmProbeAndLockPages( MapBuf[i].Mdl, KernelMode, + MmProbeAndLockPages( MapBuf[i].Mdl, UserMode, Write ? IoModifyAccess : IoReadAccess ); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { LockFailed = TRUE;

1 0

[cgutman] 53017: [TCPIP] - Cancel the disconnect timer if the disconnect is cancelled
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 04:06:55 2011 New Revision: 53017 URL: http://svn.reactos.org/svn/reactos?rev=53017&view=rev Log: [TCPIP] - Cancel the disconnect timer if the disconnect is cancelled Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Aug 1 04:06:55 2011 @@ -120,6 +120,7 @@ PTRANSPORT_CONTEXT TranContext; PFILE_OBJECT FileObject; UCHAR MinorFunction; + PCONNECTION_ENDPOINT Connection; BOOLEAN DequeuedIrp = TRUE; IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -171,7 +172,16 @@ break; case TDI_DISCONNECT: + Connection = (PCONNECTION_ENDPOINT)TranContext->Handle.ConnectionContext; + DequeuedIrp = TCPRemoveIRP(TranContext->Handle.ConnectionContext, Irp); + if (DequeuedIrp) + { + if (KeCancelTimer(&Connection->DisconnectTimer)) + { + DereferenceObject(Connection); + } + } break; default:

1 0

[cgutman] 53016: [AFD] - Cancel the in-flight disconnect IRP during socket closure [TCPIP] - Make a disconnect IRP cancelable
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 03:54:19 2011 New Revision: 53016 URL: http://svn.reactos.org/svn/reactos?rev=53016&view=rev Log: [AFD] - Cancel the in-flight disconnect IRP during socket closure [TCPIP] - Make a disconnect IRP cancelable Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/include/afd.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 1 03:54:19 2011 @@ -436,6 +436,7 @@ InFlightRequest[1] = &FCB->ReceiveIrp; InFlightRequest[2] = &FCB->SendIrp; InFlightRequest[3] = &FCB->ConnectIrp; + InFlightRequest[4] = &FCB->DisconnectIrp; /* Cancel our pending requests */ for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) { Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Aug 1 03:54:19 2011 @@ -108,7 +108,7 @@ #define FUNCTION_CLOSE 6 #define MAX_FUNCTIONS 7 -#define IN_FLIGHT_REQUESTS 4 +#define IN_FLIGHT_REQUESTS 5 #define EXTRA_LOCK_BUFFERS 2 /* Number of extra buffers needed * for ancillary data on packet Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Mon Aug 1 03:54:19 2011 @@ -543,15 +543,22 @@ Status = STATUS_INVALID_PARAMETER; goto done; } - - Status = TCPDisconnect( - TranContext->Handle.ConnectionContext, - DisReq->RequestFlags, - DisReq->RequestSpecific, - DisReq->RequestConnectionInformation, - DisReq->ReturnConnectionInformation, - DispDataRequestComplete, - Irp ); + + Status = DispPrepareIrpForCancel + (TranContext->Handle.ConnectionContext, + Irp, + (PDRIVER_CANCEL)DispCancelRequest); + + if (NT_SUCCESS(Status)) + { + Status = TCPDisconnect(TranContext->Handle.ConnectionContext, + DisReq->RequestFlags, + DisReq->RequestSpecific, + DisReq->RequestConnectionInformation, + DisReq->ReturnConnectionInformation, + DispDataRequestComplete, + Irp); + } done: if (Status != STATUS_PENDING) {

1 0

[arty] 53015: [RTL] Implemenet SwapSplayLinks, return 'NewElement' correctly when inserting. Thanks to Alex Ionescu for helping out with this patch.
by arty＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: arty Date: Mon Aug 1 03:23:53 2011 New Revision: 53015 URL: http://svn.reactos.org/svn/reactos?rev=53015&view=rev Log: [RTL] Implemenet SwapSplayLinks, return 'NewElement' correctly when inserting. Thanks to Alex Ionescu for helping out with this patch. Modified: trunk/reactos/lib/rtl/generictable.c trunk/reactos/lib/rtl/splaytree.c Modified: trunk/reactos/lib/rtl/generictable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/generictable.c?rev… ============================================================================== --- trunk/reactos/lib/rtl/generictable.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/generictable.c [iso-8859-1] Mon Aug 1 03:23:53 2011 @@ -213,7 +213,7 @@ Table->TableRoot = RtlSplay(NewNode); /* Return status */ - if (NewElement) *NewElement = (SearchResult == TableFoundNode); + if (NewElement) *NewElement = (SearchResult != TableFoundNode); /* Return pointer to user data */ return &((PTABLE_ENTRY_HEADER)NewNode)->UserData; @@ -300,7 +300,7 @@ /* Get the splay links and table search result immediately */ Result = RtlpFindGenericTableNodeOrParent(Table, Buffer, &NodeOrParent); - if ((Result == TableEmptyTree) || (Result != TableFoundNode)) + if (Result != TableFoundNode) { /* Nothing to delete */ return FALSE; Modified: trunk/reactos/lib/rtl/splaytree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/splaytree.c?rev=53… ============================================================================== --- trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/splaytree.c [iso-8859-1] Mon Aug 1 03:23:53 2011 @@ -13,13 +13,134 @@ #define NDEBUG #include <debug.h> +//#define VERIFY_SWAP_SPLAY_LINKS + /* FUNCTIONS ***************************************************************/ +static +VOID +FixupChildLinks(PRTL_SPLAY_LINKS Links, BOOLEAN Root, BOOLEAN LeftChild) +{ + if (RtlLeftChild(Links)) { + RtlInsertAsLeftChild(Links, RtlLeftChild(Links)); + } + if (RtlRightChild(Links)) { + RtlInsertAsRightChild(Links, RtlRightChild(Links)); + } + if (!Root) { + if (LeftChild) { + RtlInsertAsLeftChild(RtlParent(Links), Links); + } else { + RtlInsertAsRightChild(RtlParent(Links), Links); + } + } +} + +/* + +Given the tree: + D + B F +A C E G + +Swap(Q,S): + +Q S Q.P Q.L Q.R S.P S.L S.R +A C S.P S.L S.R Q.P Q.L Q.R +B A S S.L S.R Q.P Q Q.R +B C S S.L S.R Q.P Q.L Q +D A S.P S.L S.R S Q.L Q.R +D B S S.L S.R S Q Q.R +D F S S.L S.R S Q.L Q + +When Q is the immediate parent of S, + Set Q's parent to S, and the proper child ptr of S to Q +When Q is the root, + Set S's parent to S + */ + +static VOID SwapSplayLinks(PRTL_SPLAY_LINKS LinkA, PRTL_SPLAY_LINKS LinkB) { - DPRINT1("UNIMPLEMENTED!\n"); + if (RtlParent(LinkA) == LinkB || RtlIsRoot(LinkB)) { + PRTL_SPLAY_LINKS Tmp = LinkA; + LinkA = LinkB; + LinkB = Tmp; + } + + { + RTL_SPLAY_LINKS Ta = *LinkA, Tb = *LinkB; + BOOLEAN RootA = RtlIsRoot(LinkA), + LeftA = RtlIsLeftChild(LinkA), + LeftB = RtlIsLeftChild(LinkB); + *LinkB = Ta; *LinkA = Tb; + + // A was parent of B is a special case: A->Parent is now B + if (RtlParent(&Tb) == LinkA) { + if (!RootA) { + if (LeftA) { + RtlInsertAsLeftChild(RtlParent(&Ta), LinkB); + } else { + RtlInsertAsRightChild(RtlParent(&Ta), LinkB); + } + } + if (LeftB) { + RtlInsertAsLeftChild(LinkB, LinkA); + } else { + RtlInsertAsRightChild(LinkB, LinkA); + } + } + + FixupChildLinks(LinkA, FALSE, LeftB); + FixupChildLinks(LinkB, RootA, LeftA); + + // A was root is a special case: B->Parent is now B + if (RootA) + RtlParent(LinkB) = LinkB; + +#ifdef VERIFY_SWAP_SPLAY_LINKS + // Verify the distinct cases of node swap + if (RootA) { + if (RtlParent(&Tb) == LinkA) { + // LinkA = D, LinkB = B + // D B S S.L S.R S Q Q.R + ASSERT(RtlParent(LinkA) == LinkB); + ASSERT(RtlLeftChild(LinkA) == RtlLeftChild(&Tb)); + ASSERT(RtlRightChild(LinkA) == RtlRightChild(&Tb)); + ASSERT(RtlParent(LinkB) == LinkB); + ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); + ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); + } else { + // LinkA = D, LinkB = A + // D A S.P S.L S.R S Q.L Q.R + ASSERT(RtlParent(LinkA) == RtlParent(&Tb)); + ASSERT(RtlLeftChild(LinkA) == RtlLeftChild(&Tb)); + ASSERT(RtlRightChild(LinkA) == RtlRightChild(&Tb)); + ASSERT(RtlParent(LinkB) == LinkB); + ASSERT(RtlLeftChild(LinkB) == RtlLeftChild(&Ta)); + ASSERT(RtlRightChild(LinkB) == RtlRightChild(&Ta)); + } + } else { + if (RtlParent(&Tb) == LinkA) { + // LinkA = B, LinkB = A + // B A S S.L S.R Q.P Q Q.R + ASSERT(RtlParent(LinkA) == LinkB); + ASSERT(RtlLeftChild(LinkA) == RtlLeftChild(&Tb)); + ASSERT(RtlRightChild(LinkA) == RtlRightChild(&Tb)); + ASSERT(RtlParent(LinkB) == RtlParent(&Ta)); + ASSERT(RtlLeftChild(LinkB) == (LeftB ? LinkA : RtlLeftChild(&Ta))); + ASSERT(RtlRightChild(LinkB) == (LeftB ? RtlRightChild(&Ta) : LinkA)); + } else { + // LinkA = A, LinkB = C + // A C S.P S.L S.R Q.P Q.L Q.R + ASSERT(!memcmp(LinkA, &Tb, sizeof(Tb))); + ASSERT(!memcmp(LinkB, &Ta, sizeof(Ta))); + } + } +#endif + } } /* @@ -513,6 +634,7 @@ } /* Return the root entry */ + ASSERT(RtlIsRoot(N)); return N; }

1 0

[cgutman] 53014: [OSKITTCP] - Force the connection to be closed immediately - Hopefully will fix the random bind issues caused by oskit becoming out of sync with the rest of the IP library
by cgutman＠svn.reactos.org 01 Aug '11

01 Aug '11

Author: cgutman Date: Mon Aug 1 03:13:18 2011 New Revision: 53014 URL: http://svn.reactos.org/svn/reactos?rev=53014&view=rev Log: [OSKITTCP] - Force the connection to be closed immediately - Hopefully will fix the random bind issues caused by oskit becoming out of sync with the rest of the IP library Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Mon Aug 1 03:13:18 2011 @@ -294,11 +294,17 @@ int OskitTCPClose( PCONNECTION_ENDPOINT connection ) { int error; - - OSKLock(); - if (connection->SocketContext) - { - error = soclose(connection->SocketContext); + struct socket *socket; + + OSKLock(); + socket = connection->SocketContext; + if (socket) + { + /* HACK: Force abortive close by changing SO_LINGER settings */ + socket->so_options |= SO_LINGER; + socket->so_linger = 0; + + error = soclose(socket); } else {

1 0

[cgutman] 53013: [TCPIP] - Add a couple more debug prints
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 23:32:38 2011 New Revision: 53013 URL: http://svn.reactos.org/svn/reactos?rev=53013&view=rev Log: [TCPIP] - Add a couple more debug prints Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Jul 31 23:32:38 2011 @@ -284,6 +284,7 @@ { /* The client specified an explicit port so we force a bind to this */ AddrFile->Port = TCPAllocatePort(Address->Address[0].Address[0].sin_port); + DbgPrint("Bind - Explicit port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff) @@ -299,6 +300,7 @@ { /* The client is trying to bind to a local address so allocate a port now too */ AddrFile->Port = TCPAllocatePort(0); + DbgPrint("Bind - Unspecified port %d\n", AddrFile->Port); /* Check for bind success */ if (AddrFile->Port == 0xffff)

1 0

[rharabien] 53012: [INETCPL] - Add missing security propsheet to Polish translation. Should be synced to WINE. Spotted by Adam Stachowicz.
by rharabien＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: rharabien Date: Sun Jul 31 23:00:20 2011 New Revision: 53012 URL: http://svn.reactos.org/svn/reactos?rev=53012&view=rev Log: [INETCPL] - Add missing security propsheet to Polish translation. Should be synced to WINE. Spotted by Adam Stachowicz. Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] Sun Jul 31 23:00:20 2011 @@ -70,6 +70,24 @@ END +/* "Security" propsheet */ +IDD_SECURITY DIALOG 0, 0, 320, 220 +STYLE WS_CAPTION | WS_CHILD | WS_DISABLED +FONT 8, "MS Shell Dlg" +CAPTION "BezpieczeÅstwo" +BEGIN + + CONTROL "Listview", IDC_SEC_LISTVIEW, "SysListView32", + LVS_ICON | LVS_ALIGNLEFT | LVS_AUTOARRANGE | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_VSCROLL, + 4, 4, 312, 58 + LTEXT "", IDC_SEC_ZONE_INFO, 4, 68, 312, 20 + GROUPBOX "", IDC_SEC_GROUP, 4, 88, 312, 126 + CONTROL "trackbar", IDC_SEC_TRACKBAR, "msctls_trackbar32", + TBS_VERT | TBS_AUTOTICKS | TBS_BOTH | TBS_REVERSED, 8, 98, 32, 100 + LTEXT "", IDC_SEC_LEVEL, 48, 102, 180, 12 + LTEXT "", IDC_SEC_LEVEL_INFO, 48, 114, 260, 80 +END + /* "Content" propsheet */ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED

1 0

[rharabien] 53011: [INETCPL] - Add Polish language to build. Spotted by Adam Stachowicz
by rharabien＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: rharabien Date: Sun Jul 31 22:50:05 2011 New Revision: 53011 URL: http://svn.reactos.org/svn/reactos?rev=53011&view=rev Log: [INETCPL] - Add Polish language to build. Spotted by Adam Stachowicz Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Sun Jul 31 22:50:05 2011 @@ -30,6 +30,7 @@ #include "lang/ko-KR.rc" #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" +#include "lang/pl-PL.rc" #include "lang/pt-PT.rc" #include "lang/ru-RU.rc" #include "lang/Sr.rc" Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] Sun Jul 31 22:50:05 2011 @@ -1,7 +1,7 @@ /* * Internet control panel applet * - * Copyright 2010 £ukasz Wojni³owicz + * Copyright 2010 Åukasz WojniÅowicz * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -23,24 +23,27 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT +/* UTF-8 */ +#pragma code_page(65001) + /* "General" propsheet */ IDD_GENERAL DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Ogólne" +CAPTION "OgÃ³lne" BEGIN GROUPBOX " Strona domowa ", IDC_STATIC, 4, 4, 312, 52 - LTEXT "Mo¿esz wybraæ adres strony, która bêdzie twoj¹ stron¹ domow¹.", + LTEXT "MoÅ¼esz wybraÄ adres strony, ktÃ³ra bÄdzie twojÄ stronÄ domowÄ.", IDC_STATIC, 58, 10, 252, 10 EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL - PUSHBUTTON "U¿yj &bie¿¹cej", IDC_HOME_CURRENT, 58, 36, 80, 14 - PUSHBUTTON "U¿yj d&omylnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 - PUSHBUTTON "U¿yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Historia przegl¹dania ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "Mo¿esz usun¹æ przechowywane strony, ciasteczka i inne dane.", + PUSHBUTTON "UÅ¼yj &bieÅ¼Äcej", IDC_HOME_CURRENT, 58, 36, 80, 14 + PUSHBUTTON "UÅ¼yj d&omyÅlnej", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "UÅ¼yj pu&stej", IDC_HOME_BLANK, 230, 36, 80, 14 + GROUPBOX " Historia przeglÄdania ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "MoÅ¼esz usunÄÄ przechowywane strony, ciasteczka i inne dane.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "&Usuñ pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&UsuÅ pliki...", IDC_HISTORY_DELETE, 144, 86, 80, 14 PUSHBUTTON "Ustawie&nia...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END @@ -49,21 +52,21 @@ IDD_DELETE_HISTORY DIALOG 0, 0, 250, 250 STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU FONT 8, "MS Shell Dlg" -CAPTION "Usuwanie historii przegl¹dania" +CAPTION "Usuwanie historii przeglÄdania" BEGIN - AUTOCHECKBOX "Tymczasowe pliki internetowe\nKopie stron sieci Web, obrazów i certyfikatów.", + AUTOCHECKBOX "Tymczasowe pliki internetowe\nKopie stron sieci Web, obrazÃ³w i certyfikatÃ³w.", IDC_DELETE_TEMP_FILES, 10, 8, 230, 30, BS_TOP | BS_MULTILINE AUTOCHECKBOX "Pliki cookies\nPliki przechowywane na komputerze przez witryny sieci Web w celu zapisania preferencji takich jak informacje logowania.", IDC_DELETE_COOKIES, 10, 38, 230, 30, BS_TOP | BS_MULTILINE AUTOCHECKBOX "Historia\nLista odwiedzonych witryn sieci Web.", IDC_DELETE_HISTORY, 10, 68, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Dane formularzy\nZapisane informacje, które zosta³y wpisane w formularzach.", + AUTOCHECKBOX "Dane formularzy\nZapisane informacje, ktÃ³re zostaÅy wpisane w formularzach.", IDC_DELETE_FORM_DATA, 10, 98, 230, 30, BS_TOP | BS_MULTILINE - AUTOCHECKBOX "Has³a\nHas³a uzupe³niane automatycznie po zalogowaniu siê do wczeniej odwiedzonej witryny Web.", + AUTOCHECKBOX "HasÅa\nHasÅa uzupeÅniane automatycznie po zalogowaniu siÄ do wczeÅniej odwiedzonej witryny Web.", IDC_DELETE_PASSWORDS, 10, 128, 230, 30, BS_TOP | BS_MULTILINE DEFPUSHBUTTON "Anuluj", IDCANCEL, 185, 230, 60, 15, WS_GROUP - PUSHBUTTON "Usuñ", IDOK, 120, 230, 60, 15, WS_GROUP + PUSHBUTTON "UsuÅ", IDOK, 120, 230, 60, 15, WS_GROUP END @@ -71,11 +74,11 @@ IDD_CONTENT DIALOG 0, 0, 320, 220 STYLE WS_CAPTION | WS_CHILD | WS_DISABLED FONT 8, "MS Shell Dlg" -CAPTION "Zawartoæ" +CAPTION "ZawartoÅÄ" BEGIN GROUPBOX " Certyfikaty ", IDC_STATIC, 4, 4, 312, 50 - LTEXT "Certyfikaty s¹ u¿ywane do twojej osobistej identyfikacji oraz do identyfikacji wydawców i urzêdów certyfikuj¹cych.", + LTEXT "Certyfikaty sÄ uÅ¼ywane do twojej osobistej identyfikacji oraz do identyfikacji wydawcÃ³w i urzÄdÃ³w certyfikujÄcych.", IDC_STATIC, 58, 14, 252, 18 PUSHBUTTON "Certyfikaty...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Wydawcy...", IDC_CERT_PUBLISHER, 230, 34, 80, 14

1 0

[cgutman] 53010: [IP] - Add some temporary debug prints to troubleshoot some seemingly random bind failures
by cgutman＠svn.reactos.org 31 Jul '11

31 Jul '11

Author: cgutman Date: Sun Jul 31 22:32:18 2011 New Revision: 53010 URL: http://svn.reactos.org/svn/reactos?rev=53010&view=rev Log: [IP] - Add some temporary debug prints to troubleshoot some seemingly random bind failures Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Sun Jul 31 22:32:18 2011 @@ -88,6 +88,8 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); + + DbgPrint("Listen - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -108,6 +110,7 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + DbgPrint("Listen - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF); Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Jul 31 22:32:18 2011 @@ -773,6 +773,8 @@ Status = TCPTranslateError(OskitTCPBind(Connection, &AddressToBind, sizeof(AddressToBind))); + + DbgPrint("Connect - Explicit bind on port %d returned 0x%x\n", Connection->AddressFile->Port, Status); } else { @@ -803,6 +805,7 @@ { /* Allocate the port in the port bitmap */ Connection->AddressFile->Port = TCPAllocatePort(LocalAddress.Address[0].Address[0].sin_port); + DbgPrint("Connect - Implicit bind on port %d\n", Connection->AddressFile->Port); /* This should never fail */ ASSERT(Connection->AddressFile->Port != 0xFFFF);

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs