Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 71722: * Missed this bit.
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 11:58:22 2016 New Revision: 71722 URL: http://svn.reactos.org/svn/reactos?rev=71722&view=rev Log: * Missed this bit. Modified: trunk/reactos/dll/win32/usp10/shaping.c Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sat Jul 2 11:58:22 2016 @@ -365,7 +365,7 @@ 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000 }; -const unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_shaping_forms[256][4] = { { 0x0600, 0x0600, 0x0600, 0x0600 }, { 0x0601, 0x0601, 0x0601, 0x0601 },

1 0

[akhaldi] 71721: [USP10] Attempt to fix non PCH build.
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 11:55:26 2016 New Revision: 71721 URL: http://svn.reactos.org/svn/reactos?rev=71721&view=rev Log: [USP10] Attempt to fix non PCH build. Modified: trunk/reactos/dll/win32/usp10/bracket.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/shaping.c Modified: trunk/reactos/dll/win32/usp10/bracket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bracket.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/8.0.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = +const unsigned short /* DECLSPEC_HIDDEN */ bidi_bracket_table[768] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla… ============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -3,7 +3,7 @@ /* and from http://www.unicode.org/Public/8.0.0/ucd/IndicPositionalCategory.txt */ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3264] = +const unsigned short /* DECLSPEC_HIDDEN */ indic_syllabic_table[3264] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.… ============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/8.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_linebreak_table[7216] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sat Jul 2 11:55:26 2016 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/8.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2848] = +const unsigned short /* DECLSPEC_HIDDEN */ wine_shaping_table[2848] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160,

1 0

[akhaldi] 71720: [USP10] Sync with Wine Staging 1.9.11. CORE-11368
by akhaldi＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: akhaldi Date: Sat Jul 2 11:44:01 2016 New Revision: 71720 URL: http://svn.reactos.org/svn/reactos?rev=71720&view=rev Log: [USP10] Sync with Wine Staging 1.9.11. CORE-11368 Modified: trunk/reactos/dll/win32/usp10/bidi.c trunk/reactos/dll/win32/usp10/bracket.c trunk/reactos/dll/win32/usp10/breaking.c trunk/reactos/dll/win32/usp10/indicsyllable.c trunk/reactos/dll/win32/usp10/linebreak.c trunk/reactos/dll/win32/usp10/mirror.c trunk/reactos/dll/win32/usp10/opentype.c trunk/reactos/dll/win32/usp10/shape.c trunk/reactos/dll/win32/usp10/shaping.c trunk/reactos/dll/win32/usp10/usp10.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/usp10/bidi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bidi.c?rev… ============================================================================== --- trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bidi.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -47,7 +47,7 @@ #include "usp10_internal.h" -extern const unsigned short bidi_bracket_table[]; +extern const unsigned short bidi_bracket_table[] DECLSPEC_HIDDEN; WINE_DEFAULT_DEBUG_CHANNEL(bidi); @@ -960,6 +960,11 @@ plevel[j--] = baselevel; plevel[i] = baselevel; } + else if (pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || pcls[i] == RLO || + pcls[i] == PDF || pcls[i] == BN) + { + plevel[i] = i ? plevel[i - 1] : baselevel; + } if (i == eos && (pcls[i] == WS || pcls[i] == FSI || pcls[i] == LRI || pcls[i] == RLI || pcls[i] == PDI || pcls[i] == LRE || pcls[i] == RLE || pcls[i] == LRO || Modified: trunk/reactos/dll/win32/usp10/bracket.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/bracket.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/bracket.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/8.0.0/ucd/BidiBrackets.txt */ /* DO NOT EDIT!! */ -const unsigned short bidi_bracket_table[768] = +const unsigned short DECLSPEC_HIDDEN bidi_bracket_table[768] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/breaking.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/breaking.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/breaking.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); -extern const unsigned short wine_linebreak_table[]; +extern const unsigned short wine_linebreak_table[] DECLSPEC_HIDDEN; enum breaking_types { b_BK=1, b_CR, b_LF, b_CM, b_SG, b_GL, b_CB, b_SP, b_ZW, b_NL, b_WJ, b_JL, b_JV, b_JT, b_H2, b_H3, b_XX, b_OP, b_CL, b_CP, b_QU, b_NS, b_EX, b_SY, b_IS, b_PR, b_PO, b_NU, b_AL, b_ID, b_IN, b_HY, b_BB, b_BA, b_SA, b_AI, b_B2, b_HL, b_CJ, b_RI}; Modified: trunk/reactos/dll/win32/usp10/indicsyllable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/indicsylla… ============================================================================== --- trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/indicsyllable.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -3,7 +3,7 @@ /* and from http://www.unicode.org/Public/8.0.0/ucd/IndicPositionalCategory.txt */ /* DO NOT EDIT!! */ -const unsigned short indic_syllabic_table[3264] = +const unsigned short DECLSPEC_HIDDEN indic_syllabic_table[3264] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, 0x0110, Modified: trunk/reactos/dll/win32/usp10/linebreak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/linebreak.… ============================================================================== --- trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/linebreak.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/8.0.0/ucd/LineBreak.txt */ /* DO NOT EDIT!! */ -const unsigned short wine_linebreak_table[7216] = +const unsigned short DECLSPEC_HIDDEN wine_linebreak_table[7216] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, 0x0170, Modified: trunk/reactos/dll/win32/usp10/mirror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/mirror.c?r… ============================================================================== --- trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/mirror.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -5,7 +5,7 @@ #include <windef.h> #include <winnt.h> -const WCHAR wine_mirror_map[3292] = +const WCHAR DECLSPEC_HIDDEN wine_mirror_map[3292] = { /* index */ 0x01d8, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, 0x0100, Modified: trunk/reactos/dll/win32/usp10/opentype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/opentype.c… ============================================================================== --- trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/opentype.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -1178,7 +1178,7 @@ *devX = (desX * emHeight) / (double)lpotm->otmEMSquare; *devY = (desY * emHeight) / (double)lpotm->otmEMSquare; if (lplogfont->lfWidth) - FIXME("Font with lfWidth set no handled properly\n"); + FIXME("Font with lfWidth set not handled properly\n"); } static INT GPOS_get_value_record(WORD ValueFormat, const WORD data[], GPOS_ValueRecord *record) @@ -1481,7 +1481,7 @@ ma = (const GPOS_MarkArray*)((const BYTE*)mbpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return -1; } mr = &ma->MarkRecord[mark_index]; @@ -1551,7 +1551,7 @@ ma = (const GPOS_MarkArray*)((const BYTE*)mlpf1 + offset); if (mark_index > GET_BE_WORD(ma->MarkCount)) { - ERR("Mark index exeeded mark count\n"); + ERR("Mark index exceeded mark count\n"); return; } mr = &ma->MarkRecord[mark_index]; @@ -1561,7 +1561,7 @@ la = (const GPOS_LigatureArray*)((const BYTE*)mlpf1 + offset); if (ligature_index > GET_BE_WORD(la->LigatureCount)) { - ERR("Ligature index exeeded ligature count\n"); + ERR("Ligature index exceeded ligature count\n"); return; } offset = GET_BE_WORD(la->LigatureAttach[ligature_index]); Modified: trunk/reactos/dll/win32/usp10/shape.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shape.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shape.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -72,9 +72,9 @@ static void ShapeCharGlyphProp_Malayalam( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); static void ShapeCharGlyphProp_Khmer( HDC hdc, ScriptCache *psc, SCRIPT_ANALYSIS *psa, const WCHAR* pwcChars, const INT cChars, const WORD* pwGlyphs, const INT cGlyphs, WORD *pwLogClust, SCRIPT_CHARPROP *pCharProp, SCRIPT_GLYPHPROP *pGlyphProp ); -extern const unsigned short indic_syllabic_table[]; -extern const unsigned short wine_shaping_table[]; -extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4]; +extern const unsigned short indic_syllabic_table[] DECLSPEC_HIDDEN; +extern const unsigned short wine_shaping_table[] DECLSPEC_HIDDEN; +extern const unsigned short wine_shaping_forms[LAST_ARABIC_CHAR - FIRST_ARABIC_CHAR + 1][4] DECLSPEC_HIDDEN; enum joining_types { jtU, Modified: trunk/reactos/dll/win32/usp10/shaping.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/shaping.c?… ============================================================================== --- trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/shaping.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -2,7 +2,7 @@ /* generated from http://www.unicode.org/Public/8.0.0/ucd/ArabicShaping.txt */ /* DO NOT EDIT!! */ -const unsigned short wine_shaping_table[2848] = +const unsigned short DECLSPEC_HIDDEN wine_shaping_table[2848] = { /* level 1 offsets */ 0x0100, 0x0110, 0x0110, 0x0120, 0x0130, 0x0140, 0x0150, 0x0160, @@ -365,7 +365,7 @@ 0x0000, 0x0001, 0x0001, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000 }; -const unsigned short wine_shaping_forms[256][4] = +const unsigned short DECLSPEC_HIDDEN wine_shaping_forms[256][4] = { { 0x0600, 0x0600, 0x0600, 0x0600 }, { 0x0601, 0x0601, 0x0601, 0x0601 }, Modified: trunk/reactos/dll/win32/usp10/usp10.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re… ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/usp10/usp10.c [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -289,7 +289,7 @@ { SCRIPT_UNDEFINED, 0, 0, 0} }; -/* the must be in order so that the index matches the Script value */ +/* this must be in order so that the index matches the Script value */ const scriptData scriptInformation[] = { {{SCRIPT_UNDEFINED, 0, 0, 0, 0, 0, 0, { 0,0,0,0,0,0,0,0,0,0,0}}, {LANG_NEUTRAL, 0, 0, 0, 0, ANSI_CHARSET, 0, 0, 0, 0, 0, 0, 0, 0, 0}, @@ -730,7 +730,7 @@ static const WCHAR chars[4] = {0x0020, 0x200B, 0xF71B, 0x0640}; /* U+0020: numeric space U+200B: zero width space - U+F71B: unknow char found by black box testing + U+F71B: unknown char found by black box testing U+0640: kashida */ WORD gi[4]; @@ -862,7 +862,7 @@ static WCHAR mirror_char( WCHAR ch ) { - extern const WCHAR wine_mirror_map[]; + extern const WCHAR wine_mirror_map[] DECLSPEC_HIDDEN; return ch + wine_mirror_map[wine_mirror_map[ch >> 8] + (ch & 0xff)]; } @@ -897,7 +897,7 @@ if (str[index] == 0x2212 || str[index] == 0x2044) return Script_Punctuation; - /* Currency Symboles by Unicode point */ + /* Currency Symbols by Unicode point */ switch (str[index]) { case 0x09f2: @@ -2281,8 +2281,8 @@ int item; HRESULT hr; - TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", - ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); + TRACE("(%p,%d,%d,0x%08x,%s,%d,%d,%d)\n", + ssa, iX, iY, uOptions, wine_dbgstr_rect(prc), iMinSel, iMaxSel, fDisabled); if (!(analysis = ssa)) return E_INVALIDARG; if (!(analysis->dwFlags & SSA_GLYPHS)) return E_INVALIDARG; @@ -2754,8 +2754,8 @@ * use piAdvance to find the cluster we are looking at * Find the character that is the first character of the cluster * That is our base piCP - * If the script snaps to cluster boundries (Hebrew, Indic, Thai) then we - * are good Otherwise if the cluster is larger than 1 glyph we need to + * If the script snaps to cluster boundaries (Hebrew, Indic, Thai) then we + * are good. Otherwise if the cluster is larger than 1 glyph we need to * determine how far through the cluster to advance the cursor. */ HRESULT WINAPI ScriptXtoCP(int iX, @@ -2944,7 +2944,7 @@ * * PARAMS * chars [I] Array of characters. - * sa [I] String analysis. + * sa [I] Script analysis. * la [I] Array of logical attribute structures. * * RETURNS @@ -3248,7 +3248,7 @@ * PARAMS * hdc [I] Device context. * psc [I/O] Opaque pointer to a script cache. - * psa [I/O] String analysis. + * psa [I/O] Script analysis. * tagScript [I] The OpenType tag for the Script * tagLangSys [I] The OpenType tag for the Language * rcRangeChars[I] Array of Character counts in each range @@ -3472,8 +3472,8 @@ INT *lpDx; WORD *reordered_glyphs = (WORD *)pwGlyphs; - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", - hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, + TRACE("(%p, %p, %d, %d, %08x, %s, %p, %p, %d, %p, %d, %p, %p, %p)\n", + hdc, psc, x, y, fuOptions, wine_dbgstr_rect(lprc), psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, piAdvance, piJustify, pGoffset); if (!hdc || !psc) return E_INVALIDARG; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Jul 2 11:44:01 2016 @@ -193,7 +193,7 @@ reactos/dll/win32/updspapi # Synced to WineStaging-1.9.4 reactos/dll/win32/url # Synced to WineStaging-1.9.4 reactos/dll/win32/urlmon # Synced to WineStaging-1.9.4 -reactos/dll/win32/usp10 # Synced to WineStaging-1.9.4 +reactos/dll/win32/usp10 # Synced to WineStaging-1.9.11 reactos/dll/win32/uxtheme # Forked reactos/dll/win32/vbscript # Synced to WineStaging-1.9.4 reactos/dll/win32/version # Synced to WineStaging-1.9.4

1 0

[hbelusca] 71719: ReactOS 0.4.0 for CLT2016 was already released! Tag the branch.
by hbelusca＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: hbelusca Date: Sat Jul 2 11:28:52 2016 New Revision: 71719 URL: http://svn.reactos.org/svn/reactos?rev=71719&view=rev Log: ReactOS 0.4.0 for CLT2016 was already released! Tag the branch. Added: tags/ReactOS-0.4.0-CLT2016/ (props changed) - copied from r71718, branches/ReactOS-0.4.0-CLT2016/ Removed: branches/ReactOS-0.4.0-CLT2016/ Propchange: tags/ReactOS-0.4.0-CLT2016/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Sat Jul 2 11:28:52 2016 @@ -0,0 +1 @@ +/trunk:70000-70321,70323-70324,70328-70337,70339-70340,70347,70349,70354-70358,70360,70363,70369,70373,70375-70378,70381,70384-70385,70387-70389,70398,70400,70408,70424,70433-70437,70443,70445-70449,70454,70464,70468,70470,70477,70480,70482,70485-70487,70497,70499-70501,70507-70510,70512-70513,70523,70527-70530,70536-70537,70545-70548,70552-70554,70557-70558,70576-70578,70583,70597,70606,70627,70639,70641,70651,70655

1 0

[hbelusca] 71718: ReactOS 0.4.1 was already released! Tag the branch.
by hbelusca＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: hbelusca Date: Sat Jul 2 11:13:35 2016 New Revision: 71718 URL: http://svn.reactos.org/svn/reactos?rev=71718&view=rev Log: ReactOS 0.4.1 was already released! Tag the branch. Added: tags/ReactOS-0.4.1/ (props changed) - copied from r71717, branches/ros-branch-0_4_1/ Removed: branches/ros-branch-0_4_1/ Propchange: tags/ReactOS-0.4.1/ ------------------------------------------------------------------------------ svn:mergeinfo = /trunk:71217,71231,71245,71252,71255,71296,71307,71309,71318

1 0

[tfaber] 71717: [DNSAPI_APITEST] - Handle unexpected failures without crashing ROSTESTS-226
by tfaber＠svn.reactos.org 02 Jul '16

02 Jul '16

Author: tfaber Date: Sat Jul 2 08:49:07 2016 New Revision: 71717 URL: http://svn.reactos.org/svn/reactos?rev=71717&view=rev Log: [DNSAPI_APITEST] - Handle unexpected failures without crashing ROSTESTS-226 Modified: trunk/rostests/apitests/dnsapi/DnsQuery.c Modified: trunk/rostests/apitests/dnsapi/DnsQuery.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/dnsapi/DnsQuery.… ============================================================================== --- trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] (original) +++ trunk/rostests/apitests/dnsapi/DnsQuery.c [iso-8859-1] Sat Jul 2 08:49:07 2016 @@ -15,9 +15,9 @@ void TestHostName(void) { - DNS_STATUS dns_status = NO_ERROR; + DNS_STATUS dns_status; char host_name[255]; - PDNS_RECORD dp = NULL; + PDNS_RECORD dp; WCHAR host_nameW[255]; gethostname(host_name, sizeof(host_name)); @@ -33,25 +33,25 @@ //Testing HostName dns_status = DnsQuery_A(host_name, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //127.0.0.1 dns_status = DnsQuery_A("127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //Localhost strings dns_status = DnsQuery_A("LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_A("Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_A("localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_A failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //DnsQuery_W: //NULL @@ -74,25 +74,25 @@ //Testing HostName dns_status = DnsQuery_W(host_nameW, DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //127.0.0.1 dns_status = DnsQuery_W(L"127.0.0.1", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); //Localhost strings dns_status = DnsQuery_W(L"LocalHost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_W(L"Localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); dns_status = DnsQuery_W(L"localhost", DNS_TYPE_A, DNS_QUERY_STANDARD, 0, &dp, 0); ok(dns_status == NO_ERROR, "DnsQuery_W failed with error %lu\n", dns_status); - DnsRecordListFree(dp, DnsFreeRecordList); + if (dp != InvalidPointer) DnsRecordListFree(dp, DnsFreeRecordList); } START_TEST(DnsQuery)

1 0

[hbelusca] 71716: [TASKMGR] debug.c: - Don't hardcode the size of the string buffers. - Only use KEY_QUERY_VALUE right to query the values inside a registry key. - Fix size parameter value given to...
by hbelusca＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: hbelusca Date: Fri Jul 1 21:23:47 2016 New Revision: 71716 URL: http://svn.reactos.org/svn/reactos?rev=71716&view=rev Log: [TASKMGR] debug.c: - Don't hardcode the size of the string buffers. - Only use KEY_QUERY_VALUE right to query the values inside a registry key. - Fix size parameter value given to RegQueryValueEx. - Use ZeroMemory instead of memset(..., 0, ...) (heh, we're in Win32 guys!) - Close thread-and-process handles of the spawned debugger app. Modified: trunk/reactos/base/applications/taskmgr/debug.c Modified: trunk/reactos/base/applications/taskmgr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/debug.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/debug.c [iso-8859-1] Fri Jul 1 21:23:47 2016 @@ -42,31 +42,31 @@ if (dwProcessId == 0) return; - LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, 256); - LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, 256); + LoadStringW(hInst, IDS_MSG_WARNINGDEBUG, szTemp, ARRAYSIZE(szTemp)); + LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTempA, ARRAYSIZE(szTempA)); - if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO|MB_ICONWARNING) != IDYES) + if (MessageBoxW(hMainWnd, szTemp, szTempA, MB_YESNO | MB_ICONWARNING) != IDYES) { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); return; } - if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_READ, &hKey) != ERROR_SUCCESS) + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\AeDebug", 0, KEY_QUERY_VALUE, &hKey) != ERROR_SUCCESS) { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); return; } - dwDebuggerSize = 260; + dwDebuggerSize = sizeof(strDebugger); if (RegQueryValueExW(hKey, L"Debugger", NULL, NULL, (LPBYTE)strDebugger, &dwDebuggerSize) != ERROR_SUCCESS) { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); RegCloseKey(hKey); return; } @@ -76,22 +76,27 @@ hDebugEvent = CreateEventW(NULL, FALSE, FALSE, NULL); if (!hDebugEvent) { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); return; } wsprintfW(strDebugPath, strDebugger, dwProcessId, hDebugEvent); - memset(&pi, 0, sizeof(PROCESS_INFORMATION)); - memset(&si, 0, sizeof(STARTUPINFOW)); - si.cb = sizeof(STARTUPINFOW); + ZeroMemory(&pi, sizeof(pi)); + ZeroMemory(&si, sizeof(si)); + si.cb = sizeof(si); if (!CreateProcessW(NULL, strDebugPath, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { - GetLastErrorText(strErrorText, 260); - LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, 256); - MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK|MB_ICONSTOP); + GetLastErrorText(strErrorText, ARRAYSIZE(strErrorText)); + LoadStringW(hInst, IDS_MSG_UNABLEDEBUGPROCESS, szTemp, ARRAYSIZE(szTemp)); + MessageBoxW(hMainWnd, strErrorText, szTemp, MB_OK | MB_ICONSTOP); + } + else + { + CloseHandle(pi.hThread); + CloseHandle(pi.hProcess); } CloseHandle(hDebugEvent);

1 0

[spetreolle] 71715: [SECUR32] Enable LsaEnumerateLogonSessions and LsaGetLogonSessionData implemtations, used by VirtualBox guest additions. CORE-7424
by spetreolle＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: spetreolle Date: Fri Jul 1 19:55:32 2016 New Revision: 71715 URL: http://svn.reactos.org/svn/reactos?rev=71715&view=rev Log: [SECUR32] Enable LsaEnumerateLogonSessions and LsaGetLogonSessionData implemtations, used by VirtualBox guest additions. CORE-7424 Modified: trunk/reactos/dll/win32/secur32/lsalpc.c Modified: trunk/reactos/dll/win32/secur32/lsalpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/secur32/lsalpc.c… ============================================================================== --- trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/secur32/lsalpc.c [iso-8859-1] Fri Jul 1 19:55:32 2016 @@ -112,7 +112,6 @@ PULONG LogonSessionCount, PLUID *LogonSessionList) { -#if 1 LSA_API_MSG ApiMessage; NTSTATUS Status; @@ -146,10 +145,6 @@ *LogonSessionList = ApiMessage.EnumLogonSessions.Reply.LogonSessionBuffer; return Status; -#else - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -#endif } @@ -162,7 +157,6 @@ PLUID LogonId, PSECURITY_LOGON_SESSION_DATA *ppLogonSessionData) { -#if 1 LSA_API_MSG ApiMessage; PSECURITY_LOGON_SESSION_DATA SessionData; NTSTATUS Status; @@ -207,10 +201,19 @@ *ppLogonSessionData = SessionData; return Status; -#else +} + + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +LsaRegisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + HANDLE NotificationEventHandle) +{ UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; -#endif } @@ -219,24 +222,11 @@ */ NTSTATUS NTAPI -LsaRegisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, - HANDLE NotificationEventHandle) +LsaUnregisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, + HANDLE NotificationEventHandle) { UNIMPLEMENTED; return STATUS_NOT_IMPLEMENTED; } - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -LsaUnregisterPolicyChangeNotification(POLICY_NOTIFICATION_INFORMATION_CLASS InformationClass, - HANDLE NotificationEventHandle) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - /* EOF */

1 0

[hbelusca] 71714: [NTOS] The "BuildLab" string now contains the build number (date + revision number), together with the compiler version used to compile ReactOS. CORE-6611 CORE-7889 CORE-8877 [WIN...
by hbelusca＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: hbelusca Date: Fri Jul 1 19:45:39 2016 New Revision: 71714 URL: http://svn.reactos.org/svn/reactos?rev=71714&view=rev Log: [NTOS] The "BuildLab" string now contains the build number (date + revision number), together with the compiler version used to compile ReactOS. CORE-6611 CORE-7889 CORE-8877 [WIN32K] Now use the "BuildLab" string that is read from the registry to be displayed in the desktop watermark, instead of building it at run-time. Addendum to r71504, CORE-11349 Based on an idea by Mark Jansen (learn_more). Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/win32ss/user/ntuser/desktop.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=717… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Fri Jul 1 19:45:39 2016 @@ -57,7 +57,9 @@ ULONG CmNtCSDReleaseType; UNICODE_STRING CmVersionString; UNICODE_STRING CmCSDVersionString; -CHAR NtBuildLab[] = KERNEL_VERSION_BUILD_STR; + +CHAR NtBuildLab[] = KERNEL_VERSION_BUILD_STR "." + REACTOS_COMPILER_NAME "_" REACTOS_COMPILER_VERSION; /* Init flags and settings */ ULONG ExpInitializationPhase; Modified: trunk/reactos/win32ss/user/ntuser/desktop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/deskto… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/desktop.c [iso-8859-1] Fri Jul 1 19:45:39 2016 @@ -255,12 +255,17 @@ NTSTATUS Status; RTL_OSVERSIONINFOEXW VerInfo; + UNICODE_STRING BuildLabString; UNICODE_STRING CSDVersionString; -#if 0 - UNICODE_STRING CurBuildNmString; -#endif - RTL_QUERY_REGISTRY_TABLE VersionConfigurationTable[2] = - { + RTL_QUERY_REGISTRY_TABLE VersionConfigurationTable[] = + { + { + NULL, + RTL_QUERY_REGISTRY_DIRECT, + L"BuildLab", + &BuildLabString, + REG_NONE, NULL, 0 + }, { NULL, RTL_QUERY_REGISTRY_DIRECT, @@ -269,19 +274,10 @@ REG_NONE, NULL, 0 }, -#if 0 - { - NULL, - RTL_QUERY_REGISTRY_DIRECT, - L"CurrentBuildNumber", - &CurBuildNmString, - REG_NONE, NULL, 0 - }, -#endif - {0} }; + WCHAR BuildLabBuffer[256]; WCHAR VersionBuffer[256]; PWCHAR EndBuffer; @@ -295,9 +291,14 @@ RtlGetVersion((PRTL_OSVERSIONINFOW)&VerInfo); /* - * In kernel-mode, szCSDVersion is not initialized. Initialize it - * and query its value from the registry. + * - Retrieve the BuildLab string from the registry (set by the kernel). + * - In kernel-mode, szCSDVersion is not initialized. Initialize it + * and query its value from the registry. */ + RtlZeroMemory(BuildLabBuffer, sizeof(BuildLabBuffer)); + RtlInitEmptyUnicodeString(&BuildLabString, + BuildLabBuffer, + sizeof(BuildLabBuffer)); RtlZeroMemory(VerInfo.szCSDVersion, sizeof(VerInfo.szCSDVersion)); RtlInitEmptyUnicodeString(&CSDVersionString, VerInfo.szCSDVersion, @@ -310,9 +311,11 @@ if (!NT_SUCCESS(Status)) { /* Indicate nothing is there */ + BuildLabString.Length = 0; CSDVersionString.Length = 0; } - /* NULL-terminate */ + /* NULL-terminate the strings */ + BuildLabString.Buffer[BuildLabString.Length / sizeof(WCHAR)] = UNICODE_NULL; CSDVersionString.Buffer[CSDVersionString.Length / sizeof(WCHAR)] = UNICODE_NULL; EndBuffer = VersionBuffer; @@ -343,11 +346,9 @@ /* String for Safe Mode */ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, - L"ReactOS Version %S %S.%S_%S (NT %u.%u Build %u%s)\n", + L"ReactOS Version %S %wZ (NT %u.%u Build %u%s)\n", KERNEL_VERSION_STR, - KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry - REACTOS_COMPILER_NAME, - REACTOS_COMPILER_VERSION, + &BuildLabString, SharedUserData->NtMajorVersion, SharedUserData->NtMinorVersion, (VerInfo.dwBuildNumber & 0xFFFF), @@ -386,12 +387,10 @@ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, L"ReactOS Version %S\n" - L"Build %S.%S_%S\n" + L"Build %wZ\n" L"Reporting NT %u.%u (Build %u%s)\n", KERNEL_VERSION_STR, - KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry - REACTOS_COMPILER_NAME, - REACTOS_COMPILER_VERSION, + &BuildLabString, SharedUserData->NtMajorVersion, SharedUserData->NtMinorVersion, (VerInfo.dwBuildNumber & 0xFFFF), @@ -420,11 +419,9 @@ /* Fall-back string */ Status = RtlStringCchPrintfW(pwszzVersion, cchDest, - L"ReactOS Version %S %S.%S_%S\n", + L"ReactOS Version %S %wZ\n", KERNEL_VERSION_STR, - KERNEL_VERSION_BUILD_STR, // Same as the "BuildLab" string in the registry - REACTOS_COMPILER_NAME, - REACTOS_COMPILER_VERSION); + &BuildLabString); if (!NT_SUCCESS(Status)) { /* General failure, NULL-terminate the string */

1 0

[zhu] 71713: State variables implemented. A QueryNdisBuffer macro is expanded out in my code because I'm trying to chase down a page fault that happens during that particular call.
by zhu＠svn.reactos.org 01 Jul '16

01 Jul '16

Author: zhu Date: Fri Jul 1 19:37:51 2016 New Revision: 71713 URL: http://svn.reactos.org/svn/reactos?rev=71713&view=rev Log: State variables implemented. A QueryNdisBuffer macro is expanded out in my code because I'm trying to chase down a page fault that happens during that particular call. Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h Modified: branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/base/appli… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/base/applications/network/tcpserver/main.c [iso-8859-1] Fri Jul 1 19:37:51 2016 @@ -63,7 +63,7 @@ exit(1); } else { printf("Socket connection accepted\n"); - ret = recv(accepted, &buff[0], 256, MSG_OOB); + ret = recv(accepted, &buff[0], 256, 0); printf("Received %d bytes\n", ret); printf("Message: %s", &buff[0]); } Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c [iso-8859-1] Fri Jul 1 19:37:51 2016 @@ -30,11 +30,12 @@ static LIST_ENTRY AddressListHead; /* implementation in testing */ -PTCP_REQUEST +NTSTATUS PrepareIrpForCancel( PIRP Irp, PDRIVER_CANCEL CancelRoutine, - UCHAR CancelMode + UCHAR CancelMode, + UCHAR PendingMode ) { PIO_STACK_LOCATION IrpSp; @@ -51,21 +52,31 @@ Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_TCP_REQUEST); if (!Request) { - return NULL; - } - Request->PendingIrp = Irp; - Request->CancelMode = CancelMode; + DPRINT1("Allocation failed, out of memory\n"); + IoReleaseCancelSpinLock(OldIrql); + + return STATUS_NO_MEMORY; + } IrpSp = IoGetCurrentIrpStackLocation(Irp); Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; + + Request->PendingIrp = Irp; + Request->Context = Context; + Request->CancelMode = CancelMode; + Request->PendingMode = PendingMode; + + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); InsertTailList(&Context->RequestListHead, &Request->ListEntry); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoSetCancelRoutine(Irp, CancelRoutine); IoReleaseCancelSpinLock(OldIrql); DPRINT1("Prepared for cancel\n"); - - return Request; + + return STATUS_SUCCESS; } DPRINT1("Already cancelled\n"); @@ -75,7 +86,7 @@ Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; - return NULL; + return STATUS_CANCELLED; } /* implementation in testing */ @@ -89,13 +100,13 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; + PADDRESS_FILE AddressFile; PLIST_ENTRY Head; PLIST_ENTRY Entry; PTCP_REQUEST Request; - UCHAR MinorFunction; KIRQL OldIrql; - DPRINT1("IRP Cancel\n"); + DPRINT1("IRP Cancel on IRP at %08x\n", Irp); IoReleaseCancelSpinLock(Irp->CancelIrql); @@ -113,32 +124,13 @@ } TCP_CANCEL: - MinorFunction = IrpSp->MinorFunction; Irp->IoStatus.Status = STATUS_CANCELLED; Irp->IoStatus.Information = 0; - switch(MinorFunction) - { - case TDI_LISTEN: - DPRINT1("TDI_LISTEN Cancel\n"); - Context->AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; - break; - case TDI_SEND: - DPRINT1("TDI_SEND Cancel\n"); - break; - case TDI_CONNECT: - DPRINT1("TDI_CONNECT Cancel\n"); - break; - case TDI_RECEIVE: - DPRINT1("TDI_RECEIVE Cancel\n"); - break; - case TDI_DISCONNECT: - DPRINT1("TDI_DISCONNECT Cancel\n"); - break; - default: - DPRINT1("Invalid MinorFunction for TCP_CANCEL\n"); - goto FINISH; - } - + + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); + + AddressFile = Context->AddressFile; + DPRINT1("AddressFile at %08x\n", AddressFile); Head = &Context->RequestListHead; Entry = Head->Flink; while (Entry != Head) @@ -146,29 +138,65 @@ Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); if (Request->PendingIrp == Irp) { - DPRINT1("Found matching request\n"); switch (Request->CancelMode) { - case TCP_REQUEST_CANCEL_MODE_ABORT: + case TCP_REQUEST_CANCEL_MODE_ABORT : + if (Context->lwip_tcp_pcb == AddressFile->lwip_tcp_pcb) + { + AddressFile->lwip_tcp_pcb = NULL; + } tcp_abort(Context->lwip_tcp_pcb); + Context->lwip_tcp_pcb = NULL; + + RemoveEntryList(Entry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + if (!IsListEmpty(&Context->RequestListHead)) + { + DPRINT1("Aborting PCB with outstanding requests\n"); + } + break; - case TCP_REQUEST_CANCEL_MODE_CLOSE: + + case TCP_REQUEST_CANCEL_MODE_CLOSE : + if (Context->lwip_tcp_pcb == AddressFile->lwip_tcp_pcb) + { + AddressFile->lwip_tcp_pcb = NULL; + } tcp_close(Context->lwip_tcp_pcb); + Context->lwip_tcp_pcb = NULL; + + RemoveEntryList(Entry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + if (!IsListEmpty(&Context->RequestListHead)) + { + DPRINT1("Closing PCB with outstanding requests\n"); + } + + break; + + case TCP_REQUEST_CANCEL_MODE_PRESERVE : + RemoveEntryList(Entry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + break; + default : + DPRINT1("Invalid request cancel mode\n"); break; } - Context->lwip_tcp_pcb = NULL; - Request->PendingIrp = NULL; + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); goto FINISH; } Entry = Entry->Flink; } - DPRINT1("No matching TCP_REQUEST found\n"); + DPRINT1("Matching TCP_REQUEST not found\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); goto FINISH; DGRAM_CANCEL: DPRINT1("DGRAM_CANCEL\n"); FINISH: + DPRINT1("\n Minor Function: %08x\n", IrpSp->MinorFunction); + IoAcquireCancelSpinLock(&OldIrql); IoSetCancelRoutine(Irp, NULL); IoReleaseCancelSpinLock(OldIrql); @@ -193,6 +221,153 @@ _In_ PTDI_ADDRESS_IP Address) { return ((Address->in_addr == 0) || (Address->in_addr == 0xFFFFFFFF)); +} + +/* Implementation in testing */ +void +lwip_tcp_err_callback( + void *arg, + err_t err) +{ + PADDRESS_FILE AddressFile; + PTCP_CONTEXT Context; + PTCP_REQUEST Request; + PLIST_ENTRY Head; + PLIST_ENTRY HeadNest; + PLIST_ENTRY EntryNest; + PLIST_ENTRY Entry; + PLIST_ENTRY Temp; + PIRP Irp; + KIRQL OldIrql; + KIRQL CancelIrql; + + NTSTATUS Status; + + switch (err) + { + case ERR_ABRT : + DPRINT1("lwIP socket aborted\n"); + break; + case ERR_RST : + DPRINT1("lwIP socket reset\n"); + break; + case ERR_CLSD : + DPRINT1("lwIP socket closed\n"); + break; + case ERR_CONN : + DPRINT1("lwIP connection failed\n"); + break; + case ERR_ARG : + DPRINT1("lwIP invalid arguments\n"); + break; + case ERR_IF : + DPRINT1("Low=level error\n"); + break; + default : + DPRINT1("Unsupported lwIP error code: %d\n", err); + break; + } + + Status = STATUS_ADDRESS_CLOSED; + + switch (*((UCHAR*)arg)) + { + case TDI_TRANSPORT_ADDRESS_FILE : + AddressFile = (PADDRESS_FILE)arg; + DPRINT1("AddressFile at %08x\n", AddressFile); + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + + Head = &AddressFile->ContextListHead; + Entry = Head->Flink; + while (Entry != Head) + { + Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + + HeadNest = &Context->RequestListHead; + EntryNest = HeadNest->Flink; + while (EntryNest != HeadNest) + { + Request = CONTAINING_RECORD(EntryNest, TCP_REQUEST, ListEntry); + Irp = Request->PendingIrp; + if (Irp) + { + if (Irp->Cancel) + { + IoAcquireCancelSpinLock(&CancelIrql); + Irp->Cancel = FALSE; + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(CancelIrql); + } + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + } + Temp = EntryNest->Flink; + RemoveEntryList(EntryNest); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + EntryNest = Temp; + } + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + + if (Context->lwip_tcp_pcb != AddressFile->lwip_tcp_pcb) + { + tcp_close(Context->lwip_tcp_pcb); + } + Context->lwip_tcp_pcb = NULL; + + Entry = Entry->Flink; + } + + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + + AddressFile->lwip_tcp_pcb = NULL; + + return; + case TDI_CONNECTION_FILE : + Context = (PTCP_CONTEXT)arg; + DPRINT1("AddressFile at %08x\n", Context->AddressFile); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + + HeadNest = &Context->RequestListHead; + EntryNest = HeadNest->Flink; + while (EntryNest != HeadNest) + { + Request = CONTAINING_RECORD(EntryNest, TCP_REQUEST, ListEntry); + Irp = Request->PendingIrp; + if (Irp) + { + if (Irp->Cancel) + { + IoAcquireCancelSpinLock(&CancelIrql); + Irp->Cancel = FALSE; + IoSetCancelRoutine(Irp, NULL); + IoReleaseCancelSpinLock(CancelIrql); + } + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + } + Temp = EntryNest->Flink; + RemoveEntryList(EntryNest); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + EntryNest = Temp; + } + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + + if (Context->lwip_tcp_pcb != Context->AddressFile->lwip_tcp_pcb) + { + tcp_close(Context->lwip_tcp_pcb); + } + Context->lwip_tcp_pcb = NULL; + + return; + default : + DPRINT1("Invalid argument\n"); + return; + } } static @@ -302,71 +477,67 @@ struct tcp_pcb *newpcb, err_t err) { - PIRP Irp; KIRQL OldIrql; - PTCP_REQUEST Request; PADDRESS_FILE AddressFile; PTCP_CONTEXT Context; + PTCP_REQUEST Request; + PIRP Irp; + PIO_STACK_LOCATION IrpSp; PLIST_ENTRY Head; PLIST_ENTRY Entry; DPRINT1("lwIP TCP Accept Callback\n"); + IoAcquireCancelSpinLock(&OldIrql); AddressFile = (PADDRESS_FILE)arg; - if (AddressFile->TcpState != TCP_STATE_LISTENING) - { - DPRINT1("Accept callback on an address file that's not listening\n"); - return ERR_ABRT; - } - Head = &AddressFile->ConnectionContext->ListEntry; - Entry = Head->Blink; - Irp = NULL; + KeAcquireSpinLockAtDpcLevel(&AddressFile->ContextListLock); + + Head = &AddressFile->ContextListHead; + Entry = Head->Flink; while (Entry != Head) { Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); - if (Context->lwip_tcp_pcb == AddressFile->ConnectionContext->lwip_tcp_pcb) - { - if (IsListEmpty(&Context->RequestListHead)) + if (Context->TcpState == TCP_STATE_LISTENING) + { + KeReleaseSpinLockFromDpcLevel(&AddressFile->ContextListLock); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + + Context->lwip_tcp_pcb = newpcb; + Context->TcpState = TCP_STATE_ACCEPTED; + tcp_accepted(AddressFile->lwip_tcp_pcb); + Head = &Context->RequestListHead; + Entry = Head->Flink; + + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + Irp = Request->PendingIrp; + IrpSp = IoGetCurrentIrpStackLocation(Irp); + if (!Irp || IrpSp->MinorFunction != TDI_LISTEN) { - DPRINT1("Context has empty request list\n"); - return ERR_ABRT; - } - Request = CONTAINING_RECORD(Context->RequestListHead.Flink, - TCP_REQUEST, ListEntry); - Irp = Request->PendingIrp; - if (!Irp) - { - DPRINT1("Request has been cancelled\n"); - RemoveEntryList(&Request->ListEntry); + DPRINT1("Received callback for canceld TDI_LISTEN\n"); + RemoveEntryList(Entry); + Entry = Entry->Flink; ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_ABRT; } - break; - } - Entry = Entry->Blink; - } - if (!Irp) - { - DPRINT1("Could not find a listening tcp_pcb\n"); - return ERR_ABRT; - } - - IoAcquireCancelSpinLock(&OldIrql); - IoSetCancelRoutine(Irp, NULL); - Irp->Cancel = FALSE; + + IoSetCancelRoutine(Irp, NULL); + Irp->Cancel = FALSE; + + IoReleaseCancelSpinLock(OldIrql); + + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + return ERR_OK; + } + Entry = Entry->Flink; + } + + KeReleaseSpinLockFromDpcLevel(&AddressFile->ContextListLock); IoReleaseCancelSpinLock(OldIrql); - Context->lwip_tcp_pcb = newpcb; - tcp_accepted(AddressFile->ConnectionContext->lwip_tcp_pcb); - RemoveEntryList(&Request->ListEntry); - - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - - ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - return ERR_OK; + return ERR_ABRT; } /* implementation in testing */ @@ -379,34 +550,96 @@ ) { PTCP_REQUEST Request; + PTCP_CONTEXT Context; + PLIST_ENTRY Head; + PLIST_ENTRY Entry; + PLIST_ENTRY Temp; PIRP Irp; + PIO_STACK_LOCATION IrpSp; KIRQL OldIrql; + PVOID Buffer; + PTDI_REQUEST_KERNEL_SEND RequestInfo; + UINT Len; + + err_t lwip_err; + DPRINT1("lwIP TCP Sent Callback\n"); - Request = (PTCP_REQUEST)arg; - Irp = Request->PendingIrp; + Context = (PTCP_CONTEXT)arg; + IoAcquireCancelSpinLock(&OldIrql); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + + Head = &Context->RequestListHead; + Entry = Head->Flink; + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (Request->PendingMode == TCP_REQUEST_PENDING_SEND) + { + Irp = Request->PendingIrp; + Entry = Entry->Flink; + goto FOUND; + } + Entry = Entry->Flink; + } + DPRINT1("Matching TDI_SEND request not found\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); + return ERR_ABRT; +FOUND: if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); return ERR_ABRT; } - IoAcquireCancelSpinLock(&OldIrql); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; + IoSetCancelRoutine(Irp, NULL); Irp->Cancel = FALSE; - IoReleaseCancelSpinLock(OldIrql); - Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = len; + + RemoveEntryList(&Request->ListEntry); + + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + + lwip_err = ERR_OK; + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (Request->PendingMode == TCP_REQUEST_PENDING_SEND) + { + Irp = Request->PendingIrp; + if (!Irp) + { + Temp = Entry->Flink; + RemoveEntryList(Entry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + Entry = Temp; + continue; + } + NdisQueryBuffer(Irp->MdlAddress, &Buffer, &Len); + IrpSp = IoGetCurrentIrpStackLocation(Irp); + RequestInfo = (PTDI_REQUEST_KERNEL_SEND)&IrpSp->Parameters; + lwip_err = tcp_write(Context->lwip_tcp_pcb, Buffer, RequestInfo->SendLength, 0); + break; + } + Entry = Entry->Flink; + } + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - return ERR_OK; + return lwip_err; } /* This implementation does not take into account any flags */ @@ -432,6 +665,8 @@ INT RemainingSrceBytes; UCHAR *CurrentDestLocation; UCHAR *CurrentSrceLocation; + PLIST_ENTRY Head; + PLIST_ENTRY Entry; DPRINT1("lwIP TCP Receive Callback\n"); @@ -441,43 +676,98 @@ return ERR_ABRT; } - Request = (PTCP_REQUEST)arg; - Irp = Request->PendingIrp; + IoAcquireCancelSpinLock(&OldIrql); + + Context = (PTCP_CONTEXT)arg; + DPRINT1("Context at %08x\n", Context); + DPRINT1("AddressFile at %08x\n", Context->AddressFile); + if (!(Context->TcpState & TCP_STATE_RECEIVING)) + { + DPRINT1("Receive callback on connection that is not currently receiving\n"); + IoReleaseCancelSpinLock(OldIrql); + return ERR_ARG; + } + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + Head = &Context->RequestListHead; + Entry = Head->Flink; + Irp = NULL; + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (!Request->PendingIrp) + { + RemoveEntryList(Entry); + Entry = Entry->Flink; + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + continue; + } + if (Request->PendingMode == TCP_REQUEST_PENDING_RECEIVE) + { + Irp = Request->PendingIrp; + Entry = Entry->Flink; + break; + } + Entry = Entry->Flink; + } if (!Irp) { - DPRINT1("Callback on cancelled IRP\n"); + DPRINT1("Receive callback on cancelled IRP\n"); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); + return ERR_ABRT; + } + DPRINT1("IRP at %08x\n", Irp); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + + IoSetCancelRoutine(Irp, NULL); + Irp->Cancel = FALSE; + + if (Context->lwip_tcp_pcb != tpcb) + { + DPRINT1("Receive tcp_pcb mismatch\n"); + tcp_abort(tpcb); + RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - return ERR_ABRT; - } - IrpSp = IoGetCurrentIrpStackLocation(Irp); - Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; - if (Context->lwip_tcp_pcb != tpcb) - { - DPRINT1("Receive tcp_pcb mismatch\n"); - tcp_abort(tpcb); + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + return ERR_ABRT; } - if (!(Context->AddressFile->TcpState & (TCP_STATE_LISTENING|TCP_STATE_CONNECTED))) - { - DPRINT1("Invalid TCP state\n"); + if (!(Context->TcpState & (TCP_STATE_RECEIVING|TCP_STATE_ACCEPTED|TCP_STATE_CONNECTED))) + { + DPRINT1("Invalid TCP state: %08x\n", Context->TcpState); + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); + return ERR_ABRT; } - - IoAcquireCancelSpinLock(&OldIrql); - IoSetCancelRoutine(Irp, NULL); - Irp->Cancel = FALSE; - IoReleaseCancelSpinLock(OldIrql); Buffer = (PNDIS_BUFFER)Irp->MdlAddress; ReceiveInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; - NdisQueryBuffer(Buffer, &CurrentDestLocation, &RemainingDestBytes); + DPRINT1("NDIS Buffer: %08x\n", Buffer); + + if (Buffer->MdlFlags & (MDL_MAPPED_TO_SYSTEM_VA|MDL_SOURCE_IS_NONPAGED_POOL)) + { + DPRINT1("Option 0\n"); + CurrentDestLocation = Buffer->MappedSystemVa; + } + else + { + DPRINT1("Option 1\n"); + CurrentDestLocation = MmMapLockedPages(Buffer, KernelMode); + } +// CurrentDestLocation = MmGetSystemAddressForMdl(Buffer); + RemainingDestBytes = Buffer->ByteCount; +// NdisQueryBuffer(Buffer, &CurrentDestLocation, &RemainingDestBytes); DPRINT1("\n PTDI_REQUEST_KERNEL_RECEIVE->ReceiveLength = %d\n NDIS_BUFFER length = %d\n pbuf->tot_len = %d\n", ReceiveInfo->ReceiveLength, @@ -535,13 +825,26 @@ DPRINT1("Receive CopiedLength = %d\n", CopiedLength); tcp_recved(tpcb, CopiedLength); + + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + + while (Entry != Head) + { + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (Request->PendingMode == TCP_REQUEST_PENDING_RECEIVE) + { + tcp_recv(tpcb, lwip_tcp_receive_callback); + break; + } + } + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = CopiedLength; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - - RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_OK; } @@ -601,43 +904,65 @@ { PTCP_REQUEST Request; PTCP_CONTEXT Context; - PADDRESS_FILE AddressFile; - PIO_STACK_LOCATION IrpSp; PIRP Irp; KIRQL OldIrql; + PLIST_ENTRY Head; + PLIST_ENTRY Entry; DPRINT1("lwIP TCP Connected Callback\n"); - Request = (PTCP_REQUEST)arg; + IoAcquireCancelSpinLock(&OldIrql); + + Context = (PTCP_CONTEXT)arg; + Head = &Context->RequestListHead; + Entry = Head->Flink; + if (Head == Entry) + { + DPRINT1("Request list is empty\n"); + return ERR_ARG; + } + Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); + + KeAcquireSpinLockAtDpcLevel(&Request->Context->RequestListLock); + RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + + KeReleaseSpinLockFromDpcLevel(&Request->Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); + return ERR_ABRT; } - IrpSp = IoGetCurrentIrpStackLocation(Irp); - Context = (PTCP_CONTEXT)IrpSp->FileObject->FsContext; - AddressFile = Context->AddressFile; - if (AddressFile->TcpState != TCP_STATE_CONNECTING) - { - DPRINT1("Invalid TCP state\n"); - } - - IoAcquireCancelSpinLock(&OldIrql); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + + if (Context->TcpState != TCP_STATE_CONNECTING) + { + DPRINT1("Invalid TCP state: %d\n", Context->TcpState); + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + IoReleaseCancelSpinLock(OldIrql); + + return ERR_ABRT; + } + + Context->TcpState = TCP_STATE_CONNECTED; + IoSetCancelRoutine(Irp, NULL); Irp->Cancel = FALSE; + + RemoveEntryList(&Request->ListEntry); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); IoReleaseCancelSpinLock(OldIrql); - - AddressFile->TcpState = TCP_STATE_CONNECTED; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - - RemoveEntryList(&Request->ListEntry); - ExFreePoolWithTag(Request, TAG_TCP_REQUEST); return ERR_OK; } @@ -652,25 +977,10 @@ { PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); PADDRESS_FILE AddressFile; - PTCP_CONTEXT TcpContext; LIST_ENTRY* ListEntry; KIRQL OldIrql; -// ULONG *temp; - USHORT Port = 1; - -/* temp = (ULONG*)Address; - DPRINT1("\n TcpIpCreateAddress Input Dump\n %08x %08x %08x %08x\n", - temp[3], temp[2], - temp[1], temp[0]); - - temp = IrpSp->FileObject->FsContext; - if (temp) { - DPRINT1("\n IrpSp Dump\n %08x %08x %08x %08x\n %08x %08x %08x %08x\n", - temp[7], temp[6], temp[5], temp[4], - temp[3], temp[2], temp[1], temp[0]); - }*/ /* See if this port is already taken, and find a free one if needed. */ KeAcquireSpinLock(&AddressListLock, &OldIrql); @@ -744,10 +1054,12 @@ AddressFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*AddressFile), TAG_ADDRESS_FILE); if (!AddressFile) { + KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_NO_MEMORY; } RtlZeroMemory(AddressFile, sizeof(*AddressFile)); + AddressFile->Type = TDI_TRANSPORT_ADDRESS_FILE; AddressFile->RefCount = 1; RtlCopyMemory(&AddressFile->Address, Address, sizeof(*Address)); AddressFile->Protocol = Protocol; @@ -766,16 +1078,10 @@ ip_addr_t IpAddr; ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); - AddressFile->TcpState = TCP_STATE_CREATED; - TcpContext - = ExAllocatePoolWithTag(NonPagedPool, sizeof(TCP_CONTEXT), TAG_TCP_CONTEXT); - InitializeListHead(&TcpContext->ListEntry); - TcpContext->AddressFile = AddressFile; - TcpContext->Protocol = IPPROTO_TCP; - InitializeListHead(&TcpContext->RequestListHead); - TcpContext->lwip_tcp_pcb = tcp_new(); - AddressFile->ConnectionContext = TcpContext; AddressFile->ContextCount = 0; + AddressFile->lwip_tcp_pcb = tcp_new(); + tcp_arg(AddressFile->lwip_tcp_pcb, AddressFile); + tcp_err(AddressFile->lwip_tcp_pcb, lwip_tcp_err_callback); break; } case IPPROTO_UDP: @@ -848,10 +1154,13 @@ DPRINT1("Creating connection context for non-TCP protocoln"); return STATUS_INVALID_PARAMETER; } + Context->Type = TDI_CONNECTION_FILE; Context->Protocol = Protocol; RtlCopyMemory(&Context->RequestAddress, Address, sizeof(*Address)); + KeInitializeSpinLock(&Context->RequestListLock); InitializeListHead(&Context->RequestListHead); Context->lwip_tcp_pcb = NULL; + Context->TcpState = TCP_STATE_CREATED; IrpSp->FileObject->FsContext = (PVOID)Context; IrpSp->FileObject->FsContext2 = (PVOID)TDI_CONNECTION_FILE; @@ -890,25 +1199,26 @@ if (AddressFile->ContextCount != 0) { DPRINT1("Calling close on TCP address with open contexts\n"); + KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_INVALID_PARAMETER; } - if (AddressFile->ConnectionContext->lwip_tcp_pcb) + if (AddressFile->lwip_tcp_pcb) { - lwip_err = tcp_close(AddressFile->ConnectionContext->lwip_tcp_pcb); + lwip_err = tcp_close(AddressFile->lwip_tcp_pcb); if (lwip_err != ERR_OK) { DPRINT1("lwIP tcp_close error: %d", lwip_err); + KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_UNSUCCESSFUL; } - AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; } - ExFreePoolWithTag(AddressFile->ConnectionContext, TAG_TCP_CONTEXT); break; case IPPROTO_RAW : raw_remove(AddressFile->lwip_raw_pcb); break; default : DPRINT1("Unknown protocol\n"); + KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_INVALID_ADDRESS; } @@ -935,6 +1245,8 @@ PIRP Irp; PIO_STACK_LOCATION IrpSp; + KIRQL OldIrql; + if (Context->Protocol != IPPROTO_TCP) { DPRINT1("Invalid protocol\n"); @@ -946,12 +1258,15 @@ return STATUS_UNSUCCESSFUL; } + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); + if (Context->lwip_tcp_pcb) { lwip_err = tcp_close(Context->lwip_tcp_pcb); if (lwip_err != ERR_OK) { DPRINT1("lwIP tcp_close error: %d", lwip_err); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_UNSUCCESSFUL; } } @@ -968,17 +1283,21 @@ if (IrpSp->FileObject->FsContext != Context) { DPRINT1("IRP context mismatch\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_UNSUCCESSFUL; } - DPRINT1("Closing outstanding request on context\n"); - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + DPRINT1("Unexpected outstanding request on context\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + return STATUS_UNSUCCESSFUL; } Entry = Entry->Flink; ExFreePoolWithTag(Request, TAG_TCP_REQUEST); } + + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + + ExFreePoolWithTag(Context, TAG_TCP_CONTEXT); return STATUS_SUCCESS; } @@ -1061,7 +1380,6 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; - PTCP_REQUEST Request; PTDI_REQUEST_KERNEL_CONNECT Parameters; PTRANSPORT_ADDRESS RemoteTransportAddress; @@ -1080,12 +1398,13 @@ } Context = IrpSp->FileObject->FsContext; + DPRINT1("AddressFile at %08x\n", Context->AddressFile); if (Context->AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_CONNECT for a non-TCP protocol\n"); return STATUS_INVALID_ADDRESS; } - if (Context->AddressFile->TcpState != TCP_STATE_BOUND) + if (Context->TcpState != TCP_STATE_BOUND) { DPRINT1("Connecting on address that's not bound\n"); return STATUS_INVALID_ADDRESS; @@ -1109,7 +1428,6 @@ (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port, lwip_tcp_connected_callback); -// DPRINT1("lwip error %d\n", lwip_err); switch (lwip_err) { case (ERR_VAL) : @@ -1148,13 +1466,14 @@ } case (ERR_OK) : { - Request = PrepareIrpForCancel( + PrepareIrpForCancel( Irp, CancelRequestRoutine, - TCP_REQUEST_CANCEL_MODE_ABORT); - tcp_arg(Context->lwip_tcp_pcb, Request); - Context->AddressFile->TcpState = TCP_STATE_CONNECTING; - break; + TCP_REQUEST_CANCEL_MODE_ABORT, + TCP_REQUEST_PENDING_GENERAL); + tcp_arg(Context->lwip_tcp_pcb, Context); + Context->TcpState = TCP_STATE_CONNECTING; + return STATUS_PENDING; } default : { @@ -1163,8 +1482,6 @@ return STATUS_NOT_IMPLEMENTED; } } - - return STATUS_PENDING; } /* Implementation in testing */ @@ -1180,6 +1497,7 @@ err_t lwip_err; NTSTATUS Status; + KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1230,80 +1548,78 @@ if (AddressFile->Address.in_addr == 0) { - // should really look through address file list for an interface + // TODO: should really look through address file list for an interface AddressFile->Address.in_addr = 0x0100007f; } + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + Context->AddressFile = AddressFile; - Context->lwip_tcp_pcb = AddressFile->ConnectionContext->lwip_tcp_pcb; - InsertTailList(&AddressFile->ConnectionContext->ListEntry, + InsertTailList(&AddressFile->ContextListHead, &Context->ListEntry); AddressFile->ContextCount++; - - switch (AddressFile->TcpState) - { - case TCP_STATE_CREATED : - /* Finally calling into lwip to perform socket bind */ - lwip_err = tcp_bind( - Context->lwip_tcp_pcb, - (ip_addr_t *)&AddressFile->Address.in_addr, - AddressFile->Address.sin_port); - ip_set_option(Context->lwip_tcp_pcb, SOF_BROADCAST); - DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", - lwip_err, - Context->lwip_tcp_pcb->local_ip, - Context->lwip_tcp_pcb->local_port, - Context->lwip_tcp_pcb->remote_ip, - Context->lwip_tcp_pcb->remote_port); - if (lwip_err != ERR_OK) + Context->lwip_tcp_pcb = AddressFile->lwip_tcp_pcb; + + if (AddressFile->ContextListHead.Flink == &Context->ListEntry) + { + DPRINT1("lwIP tcp_bind\n"); + lwip_err = tcp_bind( + Context->lwip_tcp_pcb, + (ip_addr_t *)&AddressFile->Address.in_addr, + AddressFile->Address.sin_port); + ip_set_option(Context->lwip_tcp_pcb, SOF_BROADCAST); + DPRINT1("lwip error %d\n TCP PCB:\n Local Address: %08x\n Local Port: %04x\n Remote Address: %08x\n Remote Port: %04x\n", + lwip_err, + Context->lwip_tcp_pcb->local_ip, + Context->lwip_tcp_pcb->local_port, + Context->lwip_tcp_pcb->remote_ip, + Context->lwip_tcp_pcb->remote_port); + if (lwip_err != ERR_OK) + { + switch (lwip_err) { - switch (lwip_err) + case (ERR_BUF) : { - case (ERR_BUF) : - { - DPRINT1("lwIP ERR_BUFF\n"); - Status = STATUS_NO_MEMORY; - goto LEAVE; - } - case (ERR_VAL) : - { - DPRINT1("lwIP ERR_VAL\n"); - Status = STATUS_INVALID_PARAMETER; - goto LEAVE; - } - case (ERR_USE) : - { - DPRINT1("lwIP ERR_USE\n"); - Status = STATUS_ADDRESS_ALREADY_EXISTS; - goto LEAVE; - } - case (ERR_OK) : - { - DPRINT1("lwIP ERR_OK\n"); - break; - } - default : - { - DPRINT1("lwIP unexpected error\n"); - Status = STATUS_NOT_IMPLEMENTED; - goto LEAVE; - } + DPRINT1("lwIP ERR_BUFF\n"); + Status = STATUS_NO_MEMORY; + goto LEAVE; + } + case (ERR_VAL) : + { + DPRINT1("lwIP ERR_VAL\n"); + Status = STATUS_INVALID_PARAMETER; + goto LEAVE; + } + case (ERR_USE) : + { + DPRINT1("lwIP ERR_USE\n"); + Status = STATUS_ADDRESS_ALREADY_EXISTS; + goto LEAVE; + } + case (ERR_OK) : + { + DPRINT1("lwIP ERR_OK\n"); + break; + } + default : + { + DPRINT1("lwIP unexpected error\n"); + Status = STATUS_NOT_IMPLEMENTED; + goto LEAVE; } } - AddressFile->TcpState = TCP_STATE_BOUND; - case TCP_STATE_BOUND : - case TCP_STATE_LISTENING : - Status = STATUS_SUCCESS; - break; - default : - DPRINT1("Invalid TCP state: %d\n", AddressFile->TcpState); - Status = STATUS_UNSUCCESSFUL; - } + } + } + + DPRINT1("TcpIpAssociateAddress Exiting\n"); + + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + + Context->TcpState = TCP_STATE_BOUND; LEAVE: return Status; } - /* Implementation in testing */ NTSTATUS @@ -1314,6 +1630,8 @@ PTCP_CONTEXT Context; PADDRESS_FILE AddressFile; + KIRQL OldIrql; + IrpSp = IoGetCurrentIrpStackLocation(Irp); if ((ULONG)IrpSp->FileObject->FsContext2 != TDI_CONNECTION_FILE) { @@ -1323,6 +1641,9 @@ Context = IrpSp->FileObject->FsContext; AddressFile = Context->AddressFile; + DPRINT1("AddressFile at %08x\n", AddressFile); + DPRINT1("Context at %08x\n", Context); + if (AddressFile->Protocol != IPPROTO_TCP) { DPRINT1("Received TDI_DISASSOCIATE_ADDRESS for non-TCP protocol\n"); @@ -1334,27 +1655,32 @@ return STATUS_INVALID_ADDRESS; } - switch (AddressFile->TcpState) - { - case TCP_STATE_BOUND : - tcp_close(Context->lwip_tcp_pcb); - case TCP_STATE_CONNECTED : - AddressFile->ConnectionContext->lwip_tcp_pcb = NULL; - Context->lwip_tcp_pcb = NULL; - case TCP_STATE_LISTENING : - RemoveEntryList(&Context->ListEntry); - Context->AddressFile = NULL; - AddressFile->ContextCount--; - if (AddressFile->ContextCount == 0) - { - return TcpIpCloseAddress(AddressFile); - } - return STATUS_SUCCESS; - default : - DPRINT1("Invalid TCP state: %d\n", AddressFile->TcpState); - // TODO: more case statements for better error reporting - return STATUS_UNSUCCESSFUL; - } + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + + if (AddressFile->lwip_tcp_pcb == Context->lwip_tcp_pcb) + { + Context->lwip_tcp_pcb = NULL; + } + + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); + if (!(IsListEmpty(&Context->RequestListHead))) + { + DPRINT1("Disassociating context with outstanding requests\n"); + } + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + + RemoveEntryList(&Context->ListEntry); + AddressFile->ContextCount--; + Context->AddressFile = NULL; + + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + + if (AddressFile->ContextCount == 0) + { + return TcpIpCloseAddress(AddressFile); + } + + return STATUS_SUCCESS; } /* Implementation in testing */ @@ -1364,9 +1690,10 @@ { PIO_STACK_LOCATION IrpSp; PADDRESS_FILE AddressFile; - PTCP_CONTEXT ConnectionContext; + PTCP_CONTEXT Context; struct tcp_pcb *lpcb; + KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1376,46 +1703,44 @@ DPRINT1("Not a connection context\n"); return STATUS_FILE_INVALID; } - /* Get context file */ - ConnectionContext = IrpSp->FileObject->FsContext; - AddressFile = ConnectionContext->AddressFile; - if (ConnectionContext->Protocol != IPPROTO_TCP) - { - DPRINT1("Received TDI_LISTEN for a non-TCP protocol\n"); - return STATUS_INVALID_ADDRESS; - } - - switch (AddressFile->TcpState) - { - case TCP_STATE_BOUND : - /* Call down into lwip to initiate a listen */ - lpcb = tcp_listen(AddressFile->ConnectionContext->lwip_tcp_pcb); - DPRINT1("lwip tcp_listen returned\n"); - if (lpcb == NULL) - { - /* tcp_listen returning NULL can mean - either INVALID_ADDRESS or NO_MEMORY - if SO_REUSE is enabled in lwip options */ - DPRINT1("lwip tcp_listen error\n"); - return STATUS_INVALID_ADDRESS; - } - AddressFile->ConnectionContext->lwip_tcp_pcb = lpcb; - tcp_arg(lpcb, AddressFile); - tcp_accept(lpcb, lwip_tcp_accept_callback); - AddressFile->TcpState = TCP_STATE_LISTENING; - case TCP_STATE_LISTENING : - ConnectionContext->lwip_tcp_pcb - = AddressFile->ConnectionContext->lwip_tcp_pcb; - PrepareIrpForCancel( - Irp, - CancelRequestRoutine, - TCP_REQUEST_CANCEL_MODE_CLOSE); - return STATUS_PENDING; - default : - DPRINT1("Invalid TCP sate\n"); - return STATUS_UNSUCCESSFUL; - } + Context = IrpSp->FileObject->FsContext; + if (!(Context->TcpState & TCP_STATE_BOUND)) + { + DPRINT1("Received TDI_LISTEN for a context that has not been associated\n"); + // TODO: better return code + return STATUS_UNSUCCESSFUL; + } + + AddressFile = Context->AddressFile; + DPRINT1("AddresFile at %08x\n", AddressFile); + + KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); + if (AddressFile->ContextListHead.Flink == &Context->ListEntry) + { + lpcb = tcp_listen(Context->lwip_tcp_pcb); + AddressFile->lwip_tcp_pcb = lpcb; + Context->lwip_tcp_pcb = lpcb; + if (lpcb == NULL) + { + /* tcp_listen returning NULL can mean + either INVALID_ADDRESS or NO_MEMORY + if SO_REUSE is enabled in lwip options */ + DPRINT1("lwip tcp_listen error\n"); + return STATUS_INVALID_ADDRESS; + } + tcp_arg(lpcb, AddressFile); + tcp_accept(lpcb, lwip_tcp_accept_callback); + } + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + + PrepareIrpForCancel( + Irp, + CancelRequestRoutine, + TCP_REQUEST_CANCEL_MODE_ABORT, + TCP_REQUEST_PENDING_GENERAL); + Context->TcpState = TCP_STATE_LISTENING; + return STATUS_PENDING; } NTSTATUS @@ -1430,6 +1755,10 @@ UINT Len; err_t lwip_err; + PLIST_ENTRY Head; + PLIST_ENTRY Entry; + PLIST_ENTRY Temp; + KIRQL OldIrql; IrpSp = IoGetCurrentIrpStackLocation(Irp); Request = (PTDI_REQUEST_KERNEL_SEND)&IrpSp->Parameters; @@ -1441,26 +1770,15 @@ } Context = IrpSp->FileObject->FsContext; - switch (Context->AddressFile->TcpState) - { - case TCP_STATE_LISTENING : - if (Context->lwip_tcp_pcb == Context->AddressFile->ConnectionContext->lwip_tcp_pcb) - { - DPRINT1("Has the PCB been assigned by an lwIP callback?\n"); - // TODO: change to better error - return STATUS_UNSUCCESSFUL; - } - case TCP_STATE_CONNECTED : - break; - default : - DPRINT1("Invalid TCP state: %d\n", Context->AddressFile->TcpState); - // TODO: more cases for better error reporting - return STATUS_UNSUCCESSFUL; - } - + if (!(Context->TcpState & (TCP_STATE_ACCEPTED|TCP_STATE_CONNECTED))) + { + DPRINT1("Invalid TCP state: %d\n", Context->TcpState); + // TODO: better return code + return STATUS_UNSUCCESSFUL; + } if (!Irp->MdlAddress) { - DPRINT1("TcpIpSendEmpty\n"); + DPRINT1("TcpIpSend Empty\n"); return STATUS_INVALID_PARAMETER; } NdisQueryBuffer(Irp->MdlAddress, &Buffer, &Len); @@ -1475,33 +1793,61 @@ return STATUS_INVALID_PARAMETER; } + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); + + Head = &Context->RequestListHead; + Entry = Head->Flink; + while (Entry != Head) + { + TcpRequest = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); + if (!TcpRequest->PendingIrp) + { + Temp = Entry->Flink; + RemoveEntryList(Entry); + Entry = Temp; + ExFreePoolWithTag(TcpRequest, TAG_TCP_REQUEST); + continue; + } + if (TcpRequest->PendingMode == TCP_REQUEST_PENDING_SEND) + { + goto LEAVE; + } + Entry = Entry->Flink; + } + + tcp_arg(Context->lwip_tcp_pcb, Context); + tcp_sent(Context->lwip_tcp_pcb, lwip_tcp_sent_callback); + lwip_err = tcp_write(Context->lwip_tcp_pcb, Buffer, Request->SendLength, 0); switch (lwip_err) { case ERR_OK: - DPRINT1("lwIP ERR_OK\n"); break; case ERR_MEM: DPRINT1("lwIP ERR_MEM\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_NO_MEMORY; case ERR_ARG: DPRINT1("lwIP ERR_ARG\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_INVALID_PARAMETER; case ERR_CONN: DPRINT1("lwIP ERR_CONN\n"); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_CONNECTION_ACTIVE; default: DPRINT1("Unknwon lwIP Error: %d\n", lwip_err); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_NOT_IMPLEMENTED; } - TcpRequest = PrepareIrpForCancel( +LEAVE: + PrepareIrpForCancel( Irp, CancelRequestRoutine, - TCP_REQUEST_CANCEL_MODE_ABORT); - tcp_arg(Context->lwip_tcp_pcb, TcpRequest); - tcp_sent(Context->lwip_tcp_pcb, lwip_tcp_sent_callback); - + TCP_REQUEST_CANCEL_MODE_PRESERVE, + TCP_REQUEST_PENDING_SEND); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } @@ -1511,10 +1857,10 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; - PADDRESS_FILE AddressFile; - PTCP_REQUEST Request; PTDI_REQUEST_KERNEL_RECEIVE RequestInfo; + + DPRINT1("Receive IRP Address: %08x\n", Irp); IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1524,31 +1870,31 @@ return STATUS_INVALID_PARAMETER; } Context = IrpSp->FileObject->FsContext; - AddressFile = Context->AddressFile; - switch (AddressFile->TcpState) - { - case TCP_STATE_LISTENING : - if (Context->lwip_tcp_pcb == AddressFile->ConnectionContext->lwip_tcp_pcb) - { - DPRINT1("Has the PCB been assigned by an lwIP callback?\n"); - return STATUS_INVALID_ADDRESS; - } - case TCP_STATE_CONNECTED : - RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; - DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); - - Request = PrepareIrpForCancel( - Irp, - CancelRequestRoutine, - TCP_REQUEST_CANCEL_MODE_CLOSE); - tcp_arg(Context->lwip_tcp_pcb, Request); + DPRINT1("Receive Context Address: %08x\n", Context); + DPRINT1("Receive Address File Address: %08x\n", Context->AddressFile); + if (Context->TcpState & (TCP_STATE_CONNECTED|TCP_STATE_ACCEPTED)) + { + RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; + DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); + + PrepareIrpForCancel( + Irp, + CancelRequestRoutine, + TCP_REQUEST_CANCEL_MODE_PRESERVE, + TCP_REQUEST_PENDING_RECEIVE); + + if (!(Context->TcpState & TCP_STATE_RECEIVING)) + { + tcp_arg(Context->lwip_tcp_pcb, Context); tcp_recv(Context->lwip_tcp_pcb, lwip_tcp_receive_callback); - - return STATUS_PENDING; - default : - DPRINT1("Invalid TCP state: %d\n", AddressFile->TcpState); - return STATUS_INVALID_PARAMETER; - } + Context->TcpState |= TCP_STATE_RECEIVING; + } + + return STATUS_PENDING; + } + DPRINT1("Invalid TCP state: %d\n", Context->TcpState); + // TODO: better return error + return STATUS_UNSUCCESSFUL; } NTSTATUS Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h [iso-8859-1] Fri Jul 1 19:37:51 2016 @@ -1,47 +1,68 @@ #pragma once -#define TCP_REQUEST_CANCEL_MODE_ABORT 1 -#define TCP_REQUEST_CANCEL_MODE_CLOSE 2 +#define TCP_REQUEST_CANCEL_MODE_ABORT 1 +#define TCP_REQUEST_CANCEL_MODE_CLOSE 2 +#define TCP_REQUEST_CANCEL_MODE_PRESERVE 3 -#define TCP_STATE_CREATED 1 // created, unbound -#define TCP_STATE_BOUND 2 // bound, not listening or trying to connect -#define TCP_STATE_LISTENING 4 // listening, may or may not have connected clients -#define TCP_STATE_CONNECTING 8 // trying to connect as a client -#define TCP_STATE_CONNECTED 16 // connected as client +#define TCP_REQUEST_PENDING_GENERAL 0 +#define TCP_REQUEST_PENDING_SEND 1 +#define TCP_REQUEST_PENDING_RECEIVE 2 + +#define TCP_STATE_CREATED 0x1 << 0 +#define TCP_STATE_BOUND 0x1 << 1 +#define TCP_STATE_LISTENING 0x1 << 2 +#define TCP_STATE_ACCEPTED 0x1 << 3 +#define TCP_STATE_RECEIVING 0x1 << 4 +#define TCP_STATE_ABORTED 0x1 << 5 +#define TCP_STATE_CONNECTING 0x1 << 6 +#define TCP_STATE_CONNECTED 0x1 << 7 +#define TCP_STATE_SENDING 0x1 << 8 typedef struct _ADDRESS_FILE { + UCHAR Type; LIST_ENTRY ListEntry; LONG RefCount; LONG ContextCount; IPPROTO Protocol; TDI_ADDRESS_IP Address; TCPIP_INSTANCE Instance; - KSPIN_LOCK RequestLock; - LIST_ENTRY RequestListHead; - UCHAR TcpState; + union + { + KSPIN_LOCK RequestLock; + KSPIN_LOCK ContextListLock; + }; + union + { + LIST_ENTRY RequestListHead; + LIST_ENTRY ContextListHead; + }; union { struct raw_pcb* lwip_raw_pcb; struct udp_pcb* lwip_udp_pcb; - struct _TCP_CONTEXT *ConnectionContext; + struct tcp_pcb* lwip_tcp_pcb; }; } ADDRESS_FILE, *PADDRESS_FILE; typedef struct _TCP_CONTEXT { + UCHAR Type; LIST_ENTRY ListEntry; PADDRESS_FILE AddressFile; IPPROTO Protocol; TDI_ADDRESS_IP RequestAddress; - KSPIN_LOCK RequestListLock; // TODO: implement + KSPIN_LOCK RequestListLock; LIST_ENTRY RequestListHead; struct tcp_pcb* lwip_tcp_pcb; + ULONG TcpState; } TCP_CONTEXT, *PTCP_CONTEXT; typedef struct _TCP_REQUEST { LIST_ENTRY ListEntry; PIRP PendingIrp; + PTCP_CONTEXT Context; UCHAR CancelMode; + UCHAR PendingMode; } TCP_REQUEST, *PTCP_REQUEST; void

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