Ros-diffs July 2016

ros-diffs@reactos.org

18 participants
358 discussions

[akhaldi] 71866: [FREETYPE] Update to v2.6.4. CORE-11553 CORE-11543

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jul 8 21:07:25 2016 New Revision: 71866 URL: http://svn.reactos.org/svn/reactos?rev=71866&view=rev Log: [FREETYPE] Update to v2.6.4. CORE-11553 CORE-11543 Modified: trunk/reactos/media/doc/3rd Party Files.txt trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog trunk/reactos/sdk/lib/3rdparty/freetype/README trunk/reactos/sdk/lib/3rdparty/freetype/devel/ftoption.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftstdlib.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftautoh.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcache.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcffdrv.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcid.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftgzip.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftotval.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftsystem.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftttdrv.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftdriver.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftmemory.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/internal.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/tttypes.h trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttables.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.dat trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afranges.c trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afscript.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afstyles.h trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aftypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftadvanc.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftoutln.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftstream.c trunk/reactos/sdk/lib/3rdparty/freetype/src/base/md5.c trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmanag.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2error.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffdrivr.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftoken.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidparse.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvjust.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvkern.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftgzip.c trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/zlib.h trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmath.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrtypes.h trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.c trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshglob.c trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftraster.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.h trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttdriver.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.c trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.h trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1afm.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1objs.c trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42parse.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/media/doc/3rd Party Files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/3rd%20Party%20Fi… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/README URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/devel/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftoption.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/config/ftstdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/freetype.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftautoh.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcffdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftcid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftgzip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftotval.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftsystem.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/ftttdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftdriver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftmemory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftobjs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/ftrfork.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/internal/tttypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/include/freetype/tttables.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.dat URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afblue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afcjk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afhints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aflatin2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afranges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afscript.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/afstyles.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/autofit/aftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftadvanc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftbitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftmac.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftoutln.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftrfork.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/ftstream.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/base/md5.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/bdf/bdflib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftccmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmanag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cache/ftcmru.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2error.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cf2hints.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffdrivr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffgload.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cffparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftoken.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cff/cfftypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/cid/cidparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvcommn.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvjust.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvkern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvlcar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvmort1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gxvalid/gxvtrak.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/ftgzip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/gzip/zlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/otvalid/otvmath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pcf/pcfread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrsbit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pfr/pfrtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/psaux/psobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshalgo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/pshinter/pshglob.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/raster/ftraster.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/sfobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttcmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/sfnt/ttpost.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/smooth/ftgrays.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/tools/docmaker/tohtml.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttdriver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttgxvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttinterp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/truetype/ttsubpix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1afm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1load.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type1/t1objs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/… Modified: trunk/reactos/sdk/lib/3rdparty/freetype/src/type42/t42parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/3rdparty/freetype/…

8 years, 5 months

[zhu] 71865: Structural, style, correctness fixes.

by zhu＠svn.reactos.org

Author: zhu Date: Fri Jul 8 17:52:42 2016 New Revision: 71865 URL: http://svn.reactos.org/svn/reactos?rev=71865&view=rev Log: Structural, style, correctness fixes. Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.c branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/address.h branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c 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 8 17:52:42 2016 @@ -14,12 +14,12 @@ typedef struct { - LIST_ENTRY ListEntry; - TDI_ADDRESS_IP RemoteAddress; - PIRP Irp; - PVOID Buffer; - ULONG BufferLength; - PTDI_CONNECTION_INFORMATION ReturnInfo; + LIST_ENTRY ListEntry; + TDI_ADDRESS_IP RemoteAddress; + PIRP Irp; + PVOID Buffer; + ULONG BufferLength; + PTDI_CONNECTION_INFORMATION ReturnInfo; } RECEIVE_DATAGRAM_REQUEST; /* The pool tags we will use for all of our allocation */ @@ -33,6 +33,8 @@ static LIST_ENTRY AddressListHead; /* implementation in testing */ +/* Must already hold the Context->RequestListLock */ +/* Context should be in ->FileObject->FsContext */ NTSTATUS PrepareIrpForCancel( PIRP Irp, @@ -44,7 +46,6 @@ PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; PTCP_REQUEST Request; - KIRQL OldIrql; NTSTATUS Status; DPRINT1("Prepare for cancel\n"); @@ -67,10 +68,8 @@ Request->CancelMode = CancelMode; Request->PendingMode = PendingMode; - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); IoSetCancelRoutine(Irp, CancelRoutine); InsertTailList(&Context->RequestListHead, &Request->ListEntry); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Status = STATUS_SUCCESS; DPRINT1("Prepared for cancel\n"); @@ -143,6 +142,7 @@ { AddressFile->lwip_tcp_pcb = NULL; } + tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count: %d\n", PcbCount); @@ -207,8 +207,8 @@ void TcpIpInitializeAddresses(void) { - KeInitializeSpinLock(&AddressListLock); - InitializeListHead(&AddressListHead); + KeInitializeSpinLock(&AddressListLock); + InitializeListHead(&AddressListHead); PcbCount = 0; } @@ -216,9 +216,9 @@ static BOOLEAN AddrIsUnspecified( - _In_ PTDI_ADDRESS_IP Address) -{ - return ((Address->in_addr == 0) || (Address->in_addr == 0xFFFFFFFF)); + _In_ PTDI_ADDRESS_IP Address) +{ + return ((Address->in_addr == 0) || (Address->in_addr == 0xFFFFFFFF)); } /* Implementation in testing */ @@ -231,8 +231,8 @@ PTCP_CONTEXT Context; PTCP_REQUEST Request; PLIST_ENTRY Head; - PLIST_ENTRY HeadNest; - PLIST_ENTRY EntryNest; + PLIST_ENTRY RequestHead; + PLIST_ENTRY RequestEntry; PLIST_ENTRY Entry; PLIST_ENTRY Temp; PIRP Irp; @@ -267,11 +267,23 @@ Status = STATUS_ADDRESS_CLOSED; + if (!arg) + { + DPRINT1("We did the cancelling ourselves, no need to worry about deallocations\n"); + return; + } + + /* This switch relies on UCHAR Type being the first member in + _ADDRESS_FILE + _TCP_CONTEXT + This works assuming the compiler never adds padding before the first struct member + */ + DPRINT1("Type: %08x\n", *((UCHAR*)arg)); switch (*((UCHAR*)arg)) { case TDI_TRANSPORT_ADDRESS_FILE : AddressFile = (PADDRESS_FILE)arg; - DPRINT1("AddressFile at %08x\n", AddressFile); + DPRINT1("AddressFile at %p\n", AddressFile); KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); Head = &AddressFile->ContextListHead; @@ -281,11 +293,11 @@ Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); - HeadNest = &Context->RequestListHead; - EntryNest = HeadNest->Flink; - while (EntryNest != HeadNest) + RequestHead = &Context->RequestListHead; + RequestEntry = RequestHead->Flink; + while (RequestEntry != RequestHead) { - Request = CONTAINING_RECORD(EntryNest, TCP_REQUEST, ListEntry); + Request = CONTAINING_RECORD(RequestEntry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (Irp) { @@ -298,16 +310,17 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); } - Temp = EntryNest->Flink; - RemoveEntryList(EntryNest); + Temp = RequestEntry->Flink; + RemoveEntryList(RequestEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - EntryNest = Temp; + RequestEntry = Temp; } KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); if (Context->lwip_tcp_pcb != AddressFile->lwip_tcp_pcb) { + tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count\n", PcbCount); @@ -324,14 +337,14 @@ return; case TDI_CONNECTION_FILE : Context = (PTCP_CONTEXT)arg; - DPRINT1("AddressFile at %08x\n", Context->AddressFile); + DPRINT1("AddressFile at %p\n", Context->AddressFile); KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); - HeadNest = &Context->RequestListHead; - EntryNest = HeadNest->Flink; - while (EntryNest != HeadNest) + RequestHead = &Context->RequestListHead; + RequestEntry = RequestHead->Flink; + while (RequestEntry != RequestHead) { - Request = CONTAINING_RECORD(EntryNest, TCP_REQUEST, ListEntry); + Request = CONTAINING_RECORD(RequestEntry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (Irp) { @@ -344,10 +357,10 @@ Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); } - Temp = EntryNest->Flink; - RemoveEntryList(EntryNest); + Temp = RequestEntry->Flink; + RemoveEntryList(RequestEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - EntryNest = Temp; + RequestEntry = Temp; } KeReleaseSpinLock(&Context->RequestListLock, OldIrql); @@ -361,7 +374,7 @@ return; default : - DPRINT1("Invalid argument: %08x\n", arg); + DPRINT1("Invalid argument: %p\n", arg); return; } } @@ -369,96 +382,96 @@ static BOOLEAN ReceiveDatagram( - ADDRESS_FILE* AddressFile, - struct pbuf *p, - ip_addr_t *addr, - u16_t port) -{ - KIRQL OldIrql; - LIST_ENTRY* ListEntry; - RECEIVE_DATAGRAM_REQUEST* Request; - ip_addr_t RequestAddr; - BOOLEAN Result = FALSE; - - NT_ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); - - DPRINT1("Receiving datagram for addr 0x%08x on port %u.\n", ip4_addr_get_u32(addr), port); - - /* Block any cancellation that could occur */ - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - - ListEntry = AddressFile->RequestListHead.Flink; - while (ListEntry != &AddressFile->RequestListHead) - { - Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); - ListEntry = ListEntry->Flink; - - ip4_addr_set_u32(&RequestAddr, Request->RemoteAddress.in_addr); - - if ((RequestAddr.addr == IPADDR_ANY) || - (ip_addr_cmp(&RequestAddr, addr) && - ((Request->RemoteAddress.sin_port == lwip_htons(port)) || !port))) - { - PTA_IP_ADDRESS ReturnAddress; - PIRP Irp; - - DPRINT1("Found a corresponding IRP.\n"); - - Irp = Request->Irp; - - /* We found a request for this one */ - IoSetCancelRoutine(Irp, NULL); - RemoveEntryList(&Request->ListEntry); - Result = TRUE; - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - /* In case of UDP, lwip provides a pbuf directly pointing to the data. - * In other case, we must skip the IP header */ - Irp->IoStatus.Information = pbuf_copy_partial( - p, - Request->Buffer, - Request->BufferLength, - 0); - ReturnAddress = Request->ReturnInfo->RemoteAddress; - ReturnAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP; - ReturnAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; - ReturnAddress->Address->Address->sin_port = lwip_htons(port); - ReturnAddress->Address->Address->in_addr = ip4_addr_get_u32(addr); - RtlZeroMemory(ReturnAddress->Address->Address->sin_zero, - sizeof(ReturnAddress->Address->Address->sin_zero)); - - if (Request->BufferLength < p->tot_len) - Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; - else - Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - - ExFreePoolWithTag(Request, TAG_DGRAM_REQST); - - /* Start again from the beginning */ - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - } - } - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - return Result; + ADDRESS_FILE* AddressFile, + struct pbuf *p, + ip_addr_t *addr, + u16_t port) +{ + KIRQL OldIrql; + LIST_ENTRY* ListEntry; + RECEIVE_DATAGRAM_REQUEST* Request; + ip_addr_t RequestAddr; + BOOLEAN Result = FALSE; + + NT_ASSERT(KeGetCurrentIrql() < DISPATCH_LEVEL); + + DPRINT1("Receiving datagram for addr 0x%08x on port %u.\n", ip4_addr_get_u32(addr), port); + + /* Block any cancellation that could occur */ + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + + ListEntry = AddressFile->RequestListHead.Flink; + while (ListEntry != &AddressFile->RequestListHead) + { + Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); + ListEntry = ListEntry->Flink; + + ip4_addr_set_u32(&RequestAddr, Request->RemoteAddress.in_addr); + + if ((RequestAddr.addr == IPADDR_ANY) || + (ip_addr_cmp(&RequestAddr, addr) && + ((Request->RemoteAddress.sin_port == lwip_htons(port)) || !port))) + { + PTA_IP_ADDRESS ReturnAddress; + PIRP Irp; + + DPRINT1("Found a corresponding IRP.\n"); + + Irp = Request->Irp; + + /* We found a request for this one */ + IoSetCancelRoutine(Irp, NULL); + RemoveEntryList(&Request->ListEntry); + Result = TRUE; + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + + /* In case of UDP, lwip provides a pbuf directly pointing to the data. + * In other case, we must skip the IP header */ + Irp->IoStatus.Information = pbuf_copy_partial( + p, + Request->Buffer, + Request->BufferLength, + 0); + ReturnAddress = Request->ReturnInfo->RemoteAddress; + ReturnAddress->Address->AddressLength = TDI_ADDRESS_LENGTH_IP; + ReturnAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; + ReturnAddress->Address->Address->sin_port = lwip_htons(port); + ReturnAddress->Address->Address->in_addr = ip4_addr_get_u32(addr); + RtlZeroMemory(ReturnAddress->Address->Address->sin_zero, + sizeof(ReturnAddress->Address->Address->sin_zero)); + + if (Request->BufferLength < p->tot_len) + Irp->IoStatus.Status = STATUS_BUFFER_OVERFLOW; + else + Irp->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + ExFreePoolWithTag(Request, TAG_DGRAM_REQST); + + /* Start again from the beginning */ + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + } + } + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + + return Result; } static void lwip_udp_ReceiveDatagram_callback( - void *arg, - struct udp_pcb *pcb, - struct pbuf *p, - ip_addr_t *addr, - u16_t port) -{ - UNREFERENCED_PARAMETER(pcb); - - ReceiveDatagram(arg, p, addr, port); - pbuf_free(p); + void *arg, + struct udp_pcb *pcb, + struct pbuf *p, + ip_addr_t *addr, + u16_t port) +{ + UNREFERENCED_PARAMETER(pcb); + + ReceiveDatagram(arg, p, addr, port); + pbuf_free(p); } /* implementation in testing */ @@ -491,8 +504,7 @@ Context = CONTAINING_RECORD(Entry, TCP_CONTEXT, ListEntry); if (Context->TcpState == TCP_STATE_LISTENING) { - KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); - KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); + KeAcquireSpinLockAtDpcLevel(&Context->RequestListLock); Context->lwip_tcp_pcb = newpcb; InterlockedIncrement(&PcbCount); @@ -504,14 +516,34 @@ Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; - IrpSp = IoGetCurrentIrpStackLocation(Irp); - if (!Irp || IrpSp->MinorFunction != TDI_LISTEN) + if (!Irp) { DPRINT1("Received accept callback for cancelled TDI_LISTEN\n"); RemoveEntryList(Entry); - Entry = Entry->Flink; ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + return ERR_ABRT; + } + IrpSp = IoGetCurrentIrpStackLocation(Irp); + if (IrpSp->MinorFunction != TDI_LISTEN) + { + DPRINT1("The IRP is not a listening request, something is seriously wrong\n"); + /* this should maybe clean out the entire context, + since this should never happen */ + RemoveEntryList(Entry); + + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + IoSetCancelRoutine(Irp, NULL); + + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return ERR_ABRT; } @@ -520,7 +552,8 @@ IoSetCancelRoutine(Irp, NULL); Irp->Cancel = FALSE; - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + KeReleaseSpinLockFromDpcLevel(&Context->RequestListLock); + KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -622,11 +655,6 @@ IrpSp = IoGetCurrentIrpStackLocation(Irp); RequestInfo = (PTDI_REQUEST_KERNEL_SEND)&IrpSp->Parameters; lwip_err = tcp_write(Context->lwip_tcp_pcb, Buffer, RequestInfo->SendLength, 0); - PrepareIrpForCancel( - Irp, - CancelRequestRoutine, - TCP_REQUEST_CANCEL_MODE_PRESERVE, - TCP_REQUEST_PENDING_SEND); break; } Entry = Entry->Flink; @@ -662,6 +690,7 @@ UCHAR *CurrentSrceLocation; PLIST_ENTRY Head; PLIST_ENTRY Entry; + PLIST_ENTRY NextEntry; NTSTATUS Status; err_t lwip_err; @@ -692,9 +721,10 @@ DPRINT1("Request Fetched. Points to %08x\n", Request); if (!Request->PendingIrp) { DPRINT1("IRP pointer dereferenced\n"); + NextEntry = Entry->Flink; RemoveEntryList(Entry); DPRINT1("Entry removed\n"); - Entry = Entry->Flink; + Entry = NextEntry; ExFreePoolWithTag(Request, TAG_TCP_REQUEST); continue; } @@ -718,6 +748,7 @@ if (Context->lwip_tcp_pcb != tpcb) { DPRINT1("Receive tcp_pcb mismatch\n"); + tcp_arg(tpcb, NULL); tcp_abort(tpcb); InterlockedDecrement(&PcbCount); DPRINT1("\n PCB Count\n", PcbCount); @@ -795,14 +826,16 @@ tcp_recv(tpcb, lwip_tcp_receive_callback); break; } + Entry = Entry->Flink; } lwip_err = ERR_OK; BAD: RemoveEntryList(&Request->ListEntry); + + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = CopiedLength; @@ -814,46 +847,46 @@ static u8_t lwip_raw_ReceiveDatagram_callback( - void *arg, - struct raw_pcb *pcb, - struct pbuf *p, - ip_addr_t *addr) -{ - BOOLEAN Result; - ADDRESS_FILE* AddressFile = arg; - - UNREFERENCED_PARAMETER(pcb); - - /* If this is for ICMP, only process the "echo received" packets. - * The rest is processed by lwip. */ - if (AddressFile->Protocol == IPPROTO_ICMP) - { - /* See icmp_input */ - s16_t hlen; - struct ip_hdr *iphdr; - - iphdr = (struct ip_hdr *)p->payload; - hlen = IPH_HL(iphdr) * 4; - - /* Adjust the pbuf to skip the IP header */ - if (pbuf_header(p, -hlen)) - return FALSE; - - if (*((u8_t*)p->payload) != ICMP_ER) - { - pbuf_header(p, hlen); - return FALSE; - } - - pbuf_header(p, hlen); - } - - Result = ReceiveDatagram(arg, p, addr, 0); - - if (Result) - pbuf_free(p); - - return Result; + void *arg, + struct raw_pcb *pcb, + struct pbuf *p, + ip_addr_t *addr) +{ + BOOLEAN Result; + ADDRESS_FILE* AddressFile = arg; + + UNREFERENCED_PARAMETER(pcb); + + /* If this is for ICMP, only process the "echo received" packets. + * The rest is processed by lwip. */ + if (AddressFile->Protocol == IPPROTO_ICMP) + { + /* See icmp_input */ + s16_t hlen; + struct ip_hdr *iphdr; + + iphdr = (struct ip_hdr *)p->payload; + hlen = IPH_HL(iphdr) * 4; + + /* Adjust the pbuf to skip the IP header */ + if (pbuf_header(p, -hlen)) + return FALSE; + + if (*((u8_t*)p->payload) != ICMP_ER) + { + pbuf_header(p, hlen); + return FALSE; + } + + pbuf_header(p, hlen); + } + + Result = ReceiveDatagram(arg, p, addr, 0); + + if (Result) + pbuf_free(p); + + return Result; } /* implementation in testing */ @@ -877,24 +910,20 @@ Context = (PTCP_CONTEXT)arg; KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); Head = &Context->RequestListHead; - Entry = Head->Flink; - if (Head == Entry) + if (IsListEmpty(Head)) { DPRINT1("Request list is empty\n"); KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return ERR_ARG; } + Entry = RemoveHeadList(Head); + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Request = CONTAINING_RECORD(Entry, TCP_REQUEST, ListEntry); Irp = Request->PendingIrp; if (!Irp) { DPRINT1("Callback on cancelled IRP\n"); - - RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - KeReleaseSpinLock(&Request->Context->RequestListLock, OldIrql); - return ERR_ABRT; } IoSetCancelRoutine(Irp, NULL); @@ -910,11 +939,7 @@ lwip_err = ERR_OK; FINISH: - - RemoveEntryList(&Request->ListEntry); ExFreePoolWithTag(Request, TAG_TCP_REQUEST); - - KeReleaseSpinLock(&Context->RequestListLock, OldIrql); Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); @@ -925,176 +950,178 @@ /* implementation in testing */ NTSTATUS TcpIpCreateAddress( - _Inout_ PIRP Irp, - _In_ PTDI_ADDRESS_IP Address, - _In_ IPPROTO Protocol + _Inout_ PIRP Irp, + _In_ PTDI_ADDRESS_IP Address, + _In_ IPPROTO Protocol ) { - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - PADDRESS_FILE AddressFile; - LIST_ENTRY* ListEntry; - KIRQL OldIrql; - - USHORT Port = 1; - - /* See if this port is already taken, and find a free one if needed. */ - KeAcquireSpinLock(&AddressListLock, &OldIrql); + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + PADDRESS_FILE AddressFile; + LIST_ENTRY* ListEntry; + KIRQL OldIrql; + + USHORT Port = 1; + + /* See if this port is already taken, and find a free one if needed. */ + KeAcquireSpinLock(&AddressListLock, &OldIrql); DPRINT1("Search through used ports\n"); - ListEntry = AddressListHead.Flink; - while (ListEntry != &AddressListHead) - { - AddressFile = CONTAINING_RECORD(ListEntry, ADDRESS_FILE, ListEntry); - - if (Address->sin_port) - { - if ((AddressFile->Protocol == Protocol) && - (AddressFile->Address.sin_port == Address->sin_port)) - { - if (IrpSp->Parameters.Create.ShareAccess) - { - /* Good, we found the shared address we were looking for */ - InterlockedIncrement(&AddressFile->RefCount); - KeReleaseSpinLock(&AddressListLock, OldIrql); - goto Success; - } - - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_ADDRESS_ALREADY_EXISTS; - } - } - else if ((AddressFile->Address.sin_port == lwip_htons(Port)) - && AddressFile->Protocol == Protocol) - { - Port++; - if (Port == 0) - { - /* Oh no. Already 65535 ports occupied! */ - DPRINT1("No more free ports for protocol %d!\n", Protocol); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_TOO_MANY_ADDRESSES; - } - - /* We must start anew to check again the previous entries in the list */ - ListEntry = &AddressListHead; - } - ListEntry = ListEntry->Flink; - } + ListEntry = AddressListHead.Flink; + while (ListEntry != &AddressListHead) + { + AddressFile = CONTAINING_RECORD(ListEntry, ADDRESS_FILE, ListEntry); + + if (Address->sin_port) + { + if ((AddressFile->Protocol == Protocol) && + (AddressFile->Address.sin_port == Address->sin_port)) + { + if (IrpSp->Parameters.Create.ShareAccess) + { + /* Good, we found the shared address we were looking for */ + InterlockedIncrement(&AddressFile->RefCount); + DPRINT1("RefCount increment to %d\n", AddressFile->RefCount); + KeReleaseSpinLock(&AddressListLock, OldIrql); + goto Success; + } + + KeReleaseSpinLock(&AddressListLock, OldIrql); + DPRINT1("Address taken\n"); + return STATUS_ADDRESS_ALREADY_EXISTS; + } + } + else if ((AddressFile->Address.sin_port == lwip_htons(Port)) + && AddressFile->Protocol == Protocol) + { + Port++; + if (Port == 0) + { + /* Oh no. Already 65535 ports occupied! */ + DPRINT1("No more free ports for protocol %d!\n", Protocol); + KeReleaseSpinLock(&AddressListLock, OldIrql); + return STATUS_TOO_MANY_ADDRESSES; + } + + /* We must start anew to check again the previous entries in the list */ + ListEntry = &AddressListHead; + } + ListEntry = ListEntry->Flink; + } DPRINT1("Find local interface for address\n"); - if (!AddrIsUnspecified(Address)) - { - /* Find the local interface for this address */ - struct netif* lwip_netif = netif_list; - ip_addr_t IpAddr; - - ip4_addr_set_u32(&IpAddr, Address->in_addr); - while (lwip_netif) - { + if (!AddrIsUnspecified(Address)) + { + /* Find the local interface for this address */ + struct netif* lwip_netif = netif_list; + ip_addr_t IpAddr; + + ip4_addr_set_u32(&IpAddr, Address->in_addr); + while (lwip_netif) + { // DPRINT1("Comparing against address %lx\n", lwip_netif->ip_addr.addr); - if (ip_addr_cmp(&IpAddr, &lwip_netif->ip_addr)) - { - break; - } - lwip_netif = lwip_netif->next; - } - - if (!lwip_netif) - { - DPRINT1("Cound not find an interface for address 0x%08x\n", AddressFile->Address.in_addr); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_INVALID_ADDRESS; - } - } + if (ip_addr_cmp(&IpAddr, &lwip_netif->ip_addr)) + { + break; + } + lwip_netif = lwip_netif->next; + } + + if (!lwip_netif) + { + DPRINT1("Cound not find an interface for address 0x%08x\n", AddressFile->Address.in_addr); + KeReleaseSpinLock(&AddressListLock, OldIrql); + return STATUS_INVALID_ADDRESS; + } + } DPRINT1("Allocate address file\n"); - /* Allocate our new address file */ - AddressFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*AddressFile), TAG_ADDRESS_FILE); - if (!AddressFile) - { + /* Allocate our new address file */ + AddressFile = ExAllocatePoolWithTag(NonPagedPool, sizeof(*AddressFile), TAG_ADDRESS_FILE); + if (!AddressFile) + { KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_NO_MEMORY; - } - - RtlZeroMemory(AddressFile, sizeof(*AddressFile)); + 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; - if (!Address->sin_port) - AddressFile->Address.sin_port = lwip_htons(Port); - - /* Initialize the datagram request stuff */ - KeInitializeSpinLock(&AddressFile->RequestLock); - InitializeListHead(&AddressFile->RequestListHead); + AddressFile->RefCount = 1; + RtlCopyMemory(&AddressFile->Address, Address, sizeof(*Address)); + AddressFile->Protocol = Protocol; + if (!Address->sin_port) + AddressFile->Address.sin_port = lwip_htons(Port); + + /* Initialize the datagram request stuff */ + KeInitializeSpinLock(&AddressFile->RequestLock); + InitializeListHead(&AddressFile->RequestListHead); DPRINT1("Protocol-dependent operations\n"); - /* Give it an entity ID and open a PCB if needed. */ - switch (Protocol) - { - case IPPROTO_TCP: + /* Give it an entity ID and open a PCB if needed. */ + switch (Protocol) + { + case IPPROTO_TCP: { ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); - InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + InsertEntityInstance(CO_TL_ENTITY, &AddressFile->Instance); AddressFile->ContextCount = 0; AddressFile->lwip_tcp_pcb = tcp_new(); InterlockedIncrement(&PcbCount); DPRINT1("\n PCB Count: %d\n", PcbCount); tcp_arg(AddressFile->lwip_tcp_pcb, AddressFile); tcp_err(AddressFile->lwip_tcp_pcb, lwip_tcp_err_callback); - break; - } - case IPPROTO_UDP: - { - ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); - InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); - AddressFile->lwip_udp_pcb = udp_new(); - udp_bind(AddressFile->lwip_udp_pcb, &IpAddr, lwip_ntohs(AddressFile->Address.sin_port)); - ip_set_option(AddressFile->lwip_udp_pcb, SOF_BROADCAST); - /* Register our recv handler to lwip */ - udp_recv( - AddressFile->lwip_udp_pcb, - lwip_udp_ReceiveDatagram_callback, - AddressFile); - break; - } - default: - { - ip_addr_t IpAddr; - ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); - if (Protocol == IPPROTO_ICMP) - InsertEntityInstance(ER_ENTITY, &AddressFile->Instance); - else - InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); - AddressFile->lwip_raw_pcb = raw_new(Protocol); - raw_bind(AddressFile->lwip_raw_pcb, &IpAddr); - ip_set_option(AddressFile->lwip_raw_pcb, SOF_BROADCAST); - /* Register our recv handler for lwip */ - raw_recv( - AddressFile->lwip_raw_pcb, - lwip_raw_ReceiveDatagram_callback, - AddressFile); - break; - } - } + break; + } + case IPPROTO_UDP: + { + ip_addr_t IpAddr; + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); + AddressFile->lwip_udp_pcb = udp_new(); + udp_bind(AddressFile->lwip_udp_pcb, &IpAddr, lwip_ntohs(AddressFile->Address.sin_port)); + ip_set_option(AddressFile->lwip_udp_pcb, SOF_BROADCAST); + /* Register our recv handler to lwip */ + udp_recv( + AddressFile->lwip_udp_pcb, + lwip_udp_ReceiveDatagram_callback, + AddressFile); + break; + } + default: + { + ip_addr_t IpAddr; + ip4_addr_set_u32(&IpAddr, AddressFile->Address.in_addr); + if (Protocol == IPPROTO_ICMP) + InsertEntityInstance(ER_ENTITY, &AddressFile->Instance); + else + InsertEntityInstance(CL_TL_ENTITY, &AddressFile->Instance); + AddressFile->lwip_raw_pcb = raw_new(Protocol); + raw_bind(AddressFile->lwip_raw_pcb, &IpAddr); + ip_set_option(AddressFile->lwip_raw_pcb, SOF_BROADCAST); + /* Register our recv handler for lwip */ + raw_recv( + AddressFile->lwip_raw_pcb, + lwip_raw_ReceiveDatagram_callback, + AddressFile); + break; + } + } DPRINT1("Insert into address list\n"); - /* Insert it into the list. */ - InsertTailList(&AddressListHead, &AddressFile->ListEntry); - KeReleaseSpinLock(&AddressListLock, OldIrql); + /* Insert it into the list. */ + InsertTailList(&AddressListHead, &AddressFile->ListEntry); + KeReleaseSpinLock(&AddressListLock, OldIrql); Success: - IrpSp->FileObject->FsContext = AddressFile; - IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; - - return STATUS_SUCCESS; + IrpSp->FileObject->FsContext = AddressFile; + IrpSp->FileObject->FsContext2 = (PVOID)TDI_TRANSPORT_ADDRESS_FILE; + + return STATUS_SUCCESS; } /* implementation in testing */ @@ -1138,25 +1165,27 @@ /* implementation in testing */ NTSTATUS TcpIpCloseAddress( - _Inout_ ADDRESS_FILE* AddressFile + _Inout_ ADDRESS_FILE* AddressFile ) { - KIRQL OldIrql; + KIRQL OldIrql; + NTSTATUS Status; err_t lwip_err; - /* Lock the global address list */ - KeAcquireSpinLock(&AddressListLock, &OldIrql); - - if (InterlockedDecrement(&AddressFile->RefCount) != 0) - { - /* There are still some open handles for this address */ - DPRINT1("TcpIpCloseAddress on address with open handles\n"); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_SUCCESS; - } - - /* remove the lwip pcb */ + /* Lock the global address list */ + KeAcquireSpinLock(&AddressListLock, &OldIrql); + + InterlockedDecrement(&AddressFile->RefCount); + if (AddressFile->RefCount != 0) + { + /* There are still some open handles for this address */ + DPRINT1("TcpIpCloseAddress on address with %d open handles\n", AddressFile->RefCount); + KeReleaseSpinLock(&AddressListLock, OldIrql); + return STATUS_SUCCESS; + } + + /* remove the lwip pcb */ switch (AddressFile->Protocol) { case IPPROTO_UDP : @@ -1166,6 +1195,7 @@ if (AddressFile->ContextCount != 0) { DPRINT1("Calling close on TCP address with open contexts\n"); + // Should never happen due to how callers are written. KeReleaseSpinLock(&AddressListLock, OldIrql); return STATUS_INVALID_PARAMETER; } @@ -1177,6 +1207,7 @@ } else { + tcp_arg(AddressFile->lwip_tcp_pcb, NULL); tcp_abort(AddressFile->lwip_tcp_pcb); lwip_err = ERR_OK; } @@ -1185,29 +1216,35 @@ if (lwip_err != ERR_OK) { DPRINT1("lwIP tcp_close error: %d", lwip_err); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_UNSUCCESSFUL; + // TODO: better return code + Status = STATUS_UNSUCCESSFUL; } + Status = STATUS_SUCCESS; + break; } break; case IPPROTO_RAW : raw_remove(AddressFile->lwip_raw_pcb); + Status = STATUS_SUCCESS; break; default : DPRINT1("Unknown protocol\n"); - KeReleaseSpinLock(&AddressListLock, OldIrql); - return STATUS_INVALID_ADDRESS; - } - - /* Remove from the list and free the structure */ - RemoveEntryList(&AddressFile->ListEntry); - KeReleaseSpinLock(&AddressListLock, OldIrql); - - RemoveEntityInstance(&AddressFile->Instance); - - ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); - - return STATUS_SUCCESS; + // Should never happen due to how callers are written. + // This case is particularly bad since we don't know what needs + // to be deallocated at all. + Status = STATUS_INVALID_ADDRESS; + break; + } + + /* Remove from the list and free the structure */ + RemoveEntryList(&AddressFile->ListEntry); + KeReleaseSpinLock(&AddressListLock, OldIrql); + + RemoveEntityInstance(&AddressFile->Instance); + + ExFreePoolWithTag(AddressFile, TAG_ADDRESS_FILE); + + return Status; } /* implementation in testing */ @@ -1218,6 +1255,7 @@ err_t lwip_err; PLIST_ENTRY Head; PLIST_ENTRY Entry; + PADDRESS_FILE AddressFile; PTCP_REQUEST Request; PIRP Irp; PIO_STACK_LOCATION IrpSp; @@ -1229,7 +1267,7 @@ DPRINT1("Invalid protocol\n"); return STATUS_INVALID_PARAMETER; } - if (Context->AddressFile) + if (!(Context->TcpState & TCP_STATE_DISASSOCIATED)) { DPRINT1("Context retains association\n"); return STATUS_UNSUCCESSFUL; @@ -1245,6 +1283,7 @@ } else { + tcp_arg(Context->lwip_tcp_pcb, NULL); tcp_abort(Context->lwip_tcp_pcb); lwip_err = ERR_OK; } @@ -1284,7 +1323,16 @@ KeReleaseSpinLock(&Context->RequestListLock, OldIrql); + AddressFile = Context->AddressFile; + ExFreePoolWithTag(Context, TAG_TCP_CONTEXT); + + if (AddressFile->ContextCount == 0) + { + DPRINT1("Closing Address File at %p from TcpIpCloseContext on Context at %p\n", + AddressFile, Context); + return TcpIpCloseAddress(AddressFile); + } return STATUS_SUCCESS; } @@ -1292,73 +1340,73 @@ static NTSTATUS ExtractAddressFromList( - _In_ PTRANSPORT_ADDRESS AddressList, - _Out_ PTDI_ADDRESS_IP Address) -{ - PTA_ADDRESS CurrentAddress; - INT i; - - CurrentAddress = &AddressList->Address[0]; - - /* We can only use IP addresses. Search the list until we find one */ - for (i = 0; i < AddressList->TAAddressCount; i++) - { - if (CurrentAddress->AddressType == TDI_ADDRESS_TYPE_IP) - { - if (CurrentAddress->AddressLength == TDI_ADDRESS_LENGTH_IP) - { - /* This is an IPv4 address */ - RtlCopyMemory(Address, &CurrentAddress->Address[0], CurrentAddress->AddressLength); - return STATUS_SUCCESS; - } - } - CurrentAddress = (PTA_ADDRESS)&CurrentAddress->Address[CurrentAddress->AddressLength]; - } - return STATUS_INVALID_ADDRESS; + _In_ PTRANSPORT_ADDRESS AddressList, + _Out_ PTDI_ADDRESS_IP Address) +{ + PTA_ADDRESS CurrentAddress; + INT i; + + CurrentAddress = &AddressList->Address[0]; + + /* We can only use IP addresses. Search the list until we find one */ + for (i = 0; i < AddressList->TAAddressCount; i++) + { + if (CurrentAddress->AddressType == TDI_ADDRESS_TYPE_IP) + { + if (CurrentAddress->AddressLength == TDI_ADDRESS_LENGTH_IP) + { + /* This is an IPv4 address */ + RtlCopyMemory(Address, &CurrentAddress->Address[0], CurrentAddress->AddressLength); + return STATUS_SUCCESS; + } + } + CurrentAddress = (PTA_ADDRESS)&CurrentAddress->Address[CurrentAddress->AddressLength]; + } + return STATUS_INVALID_ADDRESS; } static VOID NTAPI CancelReceiveDatagram( - _Inout_ struct _DEVICE_OBJECT* DeviceObject, - _Inout_ _IRQL_uses_cancel_ struct _IRP *Irp) -{ - PIO_STACK_LOCATION IrpSp; - ADDRESS_FILE* AddressFile; - RECEIVE_DATAGRAM_REQUEST* Request; - LIST_ENTRY* ListEntry; - KIRQL OldIrql; - - IoReleaseCancelSpinLock(Irp->CancelIrql); - - IrpSp = IoGetCurrentIrpStackLocation(Irp); - AddressFile = IrpSp->FileObject->FsContext; - - /* Find this IRP in the list of requests */ - KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); - ListEntry = AddressFile->RequestListHead.Flink; - while (ListEntry != &AddressFile->RequestListHead) - { - Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); - if (Request->Irp == Irp) - break; - ListEntry = ListEntry->Flink; - } - - /* We must have found it */ - NT_ASSERT(ListEntry != &AddressFile->RequestListHead); - - RemoveEntryList(&Request->ListEntry); - - Irp->IoStatus.Status = STATUS_CANCELLED; - Irp->IoStatus.Information = 0; - - KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); - - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - - ExFreePoolWithTag(Request, TAG_DGRAM_REQST); + _Inout_ struct _DEVICE_OBJECT* DeviceObject, + _Inout_ _IRQL_uses_cancel_ struct _IRP *Irp) +{ + PIO_STACK_LOCATION IrpSp; + ADDRESS_FILE* AddressFile; + RECEIVE_DATAGRAM_REQUEST* Request; + LIST_ENTRY* ListEntry; + KIRQL OldIrql; + + IoReleaseCancelSpinLock(Irp->CancelIrql); + + IrpSp = IoGetCurrentIrpStackLocation(Irp); + AddressFile = IrpSp->FileObject->FsContext; + + /* Find this IRP in the list of requests */ + KeAcquireSpinLock(&AddressFile->RequestLock, &OldIrql); + ListEntry = AddressFile->RequestListHead.Flink; + while (ListEntry != &AddressFile->RequestListHead) + { + Request = CONTAINING_RECORD(ListEntry, RECEIVE_DATAGRAM_REQUEST, ListEntry); + if (Request->Irp == Irp) + break; + ListEntry = ListEntry->Flink; + } + + /* We must have found it */ + NT_ASSERT(ListEntry != &AddressFile->RequestListHead); + + RemoveEntryList(&Request->ListEntry); + + KeReleaseSpinLock(&AddressFile->RequestLock, OldIrql); + + Irp->IoStatus.Status = STATUS_CANCELLED; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + + ExFreePoolWithTag(Request, TAG_DGRAM_REQST); } /* implementation in testing */ @@ -1370,6 +1418,7 @@ PTCP_CONTEXT Context; PTDI_REQUEST_KERNEL_CONNECT Parameters; PTRANSPORT_ADDRESS RemoteTransportAddress; + KIRQL OldIrql; struct sockaddr *SocketAddressRemote; struct sockaddr_in *SocketAddressInRemote; @@ -1412,10 +1461,13 @@ Context->lwip_tcp_pcb->local_ip, Context->lwip_tcp_pcb->local_port); + DPRINT1("Call into lwIP tcp_connect(). Context at %p, pcb at %p\n", + Context, Context->lwip_tcp_pcb); lwip_err = tcp_connect(Context->lwip_tcp_pcb, (ip_addr_t *)&SocketAddressInRemote->sin_addr.s_addr, SocketAddressInRemote->sin_port, lwip_tcp_connected_callback); + DPRINT1("Return from lwIP tcp_connect()\n"); switch (lwip_err) { case (ERR_VAL) : @@ -1454,6 +1506,7 @@ } case (ERR_OK) : { + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, CancelRequestRoutine, @@ -1461,6 +1514,7 @@ TCP_REQUEST_PENDING_GENERAL); tcp_arg(Context->lwip_tcp_pcb, Context); Context->TcpState = TCP_STATE_CONNECTING; + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } default : @@ -1662,12 +1716,13 @@ if (Request->PendingIrp) { IrpSp = IoGetCurrentIrpStackLocation(Request->PendingIrp); - DPRINT1("Pending IRP Control Code: %08x\n", IrpSp->MinorFunction); + DPRINT1("Pending IRP MonorFunction: %08x\n", IrpSp->MinorFunction); } else { DPRINT1("IRP is NULL\n"); } + Entry = Entry->Flink; } } KeReleaseSpinLock(&Context->RequestListLock, OldIrql); @@ -1675,13 +1730,8 @@ KeAcquireSpinLock(&AddressFile->ContextListLock, &OldIrql); RemoveEntryList(&Context->ListEntry); AddressFile->ContextCount--; - Context->AddressFile = NULL; + Context->TcpState |= TCP_STATE_DISASSOCIATED; KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); - - if (AddressFile->ContextCount == 0) - { - return TcpIpCloseAddress(AddressFile); - } return STATUS_SUCCESS; } @@ -1738,12 +1788,14 @@ } KeReleaseSpinLock(&AddressFile->ContextListLock, OldIrql); + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, CancelRequestRoutine, TCP_REQUEST_CANCEL_MODE_CLOSE, TCP_REQUEST_PENDING_GENERAL); Context->TcpState = TCP_STATE_LISTENING; + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } @@ -1861,10 +1913,11 @@ { PIO_STACK_LOCATION IrpSp; PTCP_CONTEXT Context; + KIRQL OldIrql; PTDI_REQUEST_KERNEL_RECEIVE RequestInfo; - DPRINT1("Receive IRP Address: %08x\n", Irp); + DPRINT1("Receive IRP Address: %p\n", Irp); IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1880,6 +1933,8 @@ { RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVE)&IrpSp->Parameters; DPRINT1("\n Request Length = %d\n", RequestInfo->ReceiveLength); + + KeAcquireSpinLock(&Context->RequestListLock, &OldIrql); PrepareIrpForCancel( Irp, @@ -1894,6 +1949,7 @@ Context->TcpState |= TCP_STATE_RECEIVING; } + KeReleaseSpinLock(&Context->RequestListLock, OldIrql); return STATUS_PENDING; } DPRINT1("Invalid TCP state: %d\n", Context->TcpState); @@ -1903,275 +1959,275 @@ NTSTATUS TcpIpReceiveDatagram( - _Inout_ PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - ADDRESS_FILE *AddressFile; - RECEIVE_DATAGRAM_REQUEST* Request = NULL; - PTDI_REQUEST_KERNEL_RECEIVEDG RequestInfo; - NTSTATUS Status; - - /* Check this is really an address file */ - if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { - Status = STATUS_FILE_INVALID; - goto Failure; - } - - /* Get the address file */ - AddressFile = IrpSp->FileObject->FsContext; - - if (AddressFile->Protocol == IPPROTO_TCP) - { - /* TCP has no such thing as datagrams */ - DPRINT1("Received TDI_RECEIVE_DATAGRAM for a TCP adress file.\n"); - Status = STATUS_INVALID_ADDRESS; - goto Failure; - } - - /* Queue the request */ - Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_DGRAM_REQST); - if (!Request) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Failure; - } - RtlZeroMemory(Request, sizeof(*Request)); - Request->Irp = Irp; - - /* Get details about what we should be receiving */ - RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVEDG)&IrpSp->Parameters; - - /* Get the address */ - if (RequestInfo->ReceiveDatagramInformation->RemoteAddressLength != 0) - { - Status = ExtractAddressFromList( - RequestInfo->ReceiveDatagramInformation->RemoteAddress, - &Request->RemoteAddress); - if (!NT_SUCCESS(Status)) - goto Failure; - } - - DPRINT1("Queuing datagram receive on address 0x%08x, port %u.\n", - Request->RemoteAddress.in_addr, Request->RemoteAddress.sin_port); - - /* Get the buffer */ - Request->Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - Request->BufferLength = MmGetMdlByteCount(Irp->MdlAddress); - - Request->ReturnInfo = RequestInfo->ReturnDatagramInformation; - - /* Mark pending */ - Irp->IoStatus.Status = STATUS_PENDING; - IoMarkIrpPending(Irp); - IoSetCancelRoutine(Irp, CancelReceiveDatagram); - - /* We're ready to go */ - ExInterlockedInsertTailList( - &AddressFile->RequestListHead, - &Request->ListEntry, - &AddressFile->RequestLock); - - return STATUS_PENDING; + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + ADDRESS_FILE *AddressFile; + RECEIVE_DATAGRAM_REQUEST* Request = NULL; + PTDI_REQUEST_KERNEL_RECEIVEDG RequestInfo; + NTSTATUS Status; + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + Status = STATUS_FILE_INVALID; + goto Failure; + } + + /* Get the address file */ + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol == IPPROTO_TCP) + { + /* TCP has no such thing as datagrams */ + DPRINT1("Received TDI_RECEIVE_DATAGRAM for a TCP adress file.\n"); + Status = STATUS_INVALID_ADDRESS; + goto Failure; + } + + /* Queue the request */ + Request = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Request), TAG_DGRAM_REQST); + if (!Request) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Failure; + } + RtlZeroMemory(Request, sizeof(*Request)); + Request->Irp = Irp; + + /* Get details about what we should be receiving */ + RequestInfo = (PTDI_REQUEST_KERNEL_RECEIVEDG)&IrpSp->Parameters; + + /* Get the address */ + if (RequestInfo->ReceiveDatagramInformation->RemoteAddressLength != 0) + { + Status = ExtractAddressFromList( + RequestInfo->ReceiveDatagramInformation->RemoteAddress, + &Request->RemoteAddress); + if (!NT_SUCCESS(Status)) + goto Failure; + } + + DPRINT1("Queuing datagram receive on address 0x%08x, port %u.\n", + Request->RemoteAddress.in_addr, Request->RemoteAddress.sin_port); + + /* Get the buffer */ + Request->Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); + Request->BufferLength = MmGetMdlByteCount(Irp->MdlAddress); + + Request->ReturnInfo = RequestInfo->ReturnDatagramInformation; + + /* Mark pending */ + Irp->IoStatus.Status = STATUS_PENDING; + IoMarkIrpPending(Irp); + IoSetCancelRoutine(Irp, CancelReceiveDatagram); + + /* We're ready to go */ + ExInterlockedInsertTailList( + &AddressFile->RequestListHead, + &Request->ListEntry, + &AddressFile->RequestLock); + + return STATUS_PENDING; Failure: - if (Request) - ExFreePoolWithTag(Request, TAG_DGRAM_REQST); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - return Status; + if (Request) + ExFreePoolWithTag(Request, TAG_DGRAM_REQST); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return Status; } NTSTATUS TcpIpSendDatagram( - _Inout_ PIRP Irp) -{ - PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); - ADDRESS_FILE *AddressFile; - PTDI_REQUEST_KERNEL_SENDDG RequestInfo; - NTSTATUS Status; - ip_addr_t IpAddr; - u16_t Port; - PVOID Buffer; - ULONG BufferLength; - struct pbuf* p = NULL; - err_t lwip_error; - - /* Check this is really an address file */ - if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) - { - Status = STATUS_FILE_INVALID; - goto Finish; - } - - /* Get the address file */ - AddressFile = IrpSp->FileObject->FsContext; - - if (AddressFile->Protocol == IPPROTO_TCP) - { - /* TCP has no such thing as datagrams */ - DPRINT1("Received TDI_SEND_DATAGRAM for a TCP adress file.\n"); - Status = STATUS_INVALID_ADDRESS; - goto Finish; - } - - /* Get details about what we should be receiving */ - RequestInfo = (PTDI_REQUEST_KERNEL_SENDDG)&IrpSp->Parameters; - - /* Get the address */ - if (RequestInfo->SendDatagramInformation->RemoteAddressLength != 0) - { - TDI_ADDRESS_IP Address; - Status = ExtractAddressFromList( - RequestInfo->SendDatagramInformation->RemoteAddress, - &Address); - if (!NT_SUCCESS(Status)) - goto Finish; - ip4_addr_set_u32(&IpAddr, Address.in_addr); - Port = lwip_ntohs(Address.sin_port); - } - else - { - ip_addr_set_any(&IpAddr); - Port = 0; - } - - DPRINT1("Sending datagram to address 0x%08x, port %u\n", ip4_addr_get_u32(&IpAddr), lwip_ntohs(Port)); - - /* Get the buffer */ - Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); - BufferLength = MmGetMdlByteCount(Irp->MdlAddress); - p = pbuf_alloc(PBUF_RAW, BufferLength, PBUF_REF); - if (!p) - { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto Finish; - } - p->payload = Buffer; - - /* Send it for real */ - switch (AddressFile->Protocol) - { - case IPPROTO_UDP: - if (((ip4_addr_get_u32(&IpAddr) == IPADDR_ANY) || - (ip4_addr_get_u32(&IpAddr) == IPADDR_BROADCAST)) && - (Port == 67) && (AddressFile->Address.in_addr == 0)) - { - struct netif* lwip_netif = netif_list; - - /* - * This is a DHCP packet for an address file with address 0.0.0.0. - * Try to find an ethernet interface with no address set, - * and send the packet through it. - */ - while (lwip_netif != NULL) - { - if (ip4_addr_get_u32(&lwip_netif->ip_addr) == 0) - break; - lwip_netif = lwip_netif->next; - } - - if (lwip_netif == NULL) - { - /* Do a regular send. (This will most likely fail) */ - lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); - } - else - { - /* We found an interface with address being 0.0.0.0 */ - lwip_error = udp_sendto_if(AddressFile->lwip_udp_pcb, p, &IpAddr, Port, lwip_netif); - } - } - else - { - lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); - } - break; - default: - lwip_error = raw_sendto(AddressFile->lwip_raw_pcb, p, &IpAddr); - break; - } - - switch (lwip_error) - { - case ERR_OK: - Status = STATUS_SUCCESS; - Irp->IoStatus.Information = BufferLength; - break; - case ERR_MEM: - case ERR_BUF: - DPRINT1("Received ERR_MEM from lwip.\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; - break; - case ERR_RTE: - DPRINT1("Received ERR_RTE from lwip.\n"); - Status = STATUS_INVALID_ADDRESS; - break; - case ERR_VAL: - DPRINT1("Received ERR_VAL from lwip.\n"); - Status = STATUS_INVALID_PARAMETER; - break; - default: - DPRINT1("Received error %d from lwip.\n", lwip_error); - Status = STATUS_UNEXPECTED_NETWORK_ERROR; - } + _Inout_ PIRP Irp) +{ + PIO_STACK_LOCATION IrpSp = IoGetCurrentIrpStackLocation(Irp); + ADDRESS_FILE *AddressFile; + PTDI_REQUEST_KERNEL_SENDDG RequestInfo; + NTSTATUS Status; + ip_addr_t IpAddr; + u16_t Port; + PVOID Buffer; + ULONG BufferLength; + struct pbuf* p = NULL; + err_t lwip_error; + + /* Check this is really an address file */ + if ((ULONG_PTR)IrpSp->FileObject->FsContext2 != TDI_TRANSPORT_ADDRESS_FILE) + { + Status = STATUS_FILE_INVALID; + goto Finish; + } + + /* Get the address file */ + AddressFile = IrpSp->FileObject->FsContext; + + if (AddressFile->Protocol == IPPROTO_TCP) + { + /* TCP has no such thing as datagrams */ + DPRINT1("Received TDI_SEND_DATAGRAM for a TCP adress file.\n"); + Status = STATUS_INVALID_ADDRESS; + goto Finish; + } + + /* Get details about what we should be receiving */ + RequestInfo = (PTDI_REQUEST_KERNEL_SENDDG)&IrpSp->Parameters; + + /* Get the address */ + if (RequestInfo->SendDatagramInformation->RemoteAddressLength != 0) + { + TDI_ADDRESS_IP Address; + Status = ExtractAddressFromList( + RequestInfo->SendDatagramInformation->RemoteAddress, + &Address); + if (!NT_SUCCESS(Status)) + goto Finish; + ip4_addr_set_u32(&IpAddr, Address.in_addr); + Port = lwip_ntohs(Address.sin_port); + } + else + { + ip_addr_set_any(&IpAddr); + Port = 0; + } + + DPRINT1("Sending datagram to address 0x%08x, port %u\n", ip4_addr_get_u32(&IpAddr), lwip_ntohs(Port)); + + /* Get the buffer */ + Buffer = MmGetSystemAddressForMdl(Irp->MdlAddress); + BufferLength = MmGetMdlByteCount(Irp->MdlAddress); + p = pbuf_alloc(PBUF_RAW, BufferLength, PBUF_REF); + if (!p) + { + Status = STATUS_INSUFFICIENT_RESOURCES; + goto Finish; + } + p->payload = Buffer; + + /* Send it for real */ + switch (AddressFile->Protocol) + { + case IPPROTO_UDP: + if (((ip4_addr_get_u32(&IpAddr) == IPADDR_ANY) || + (ip4_addr_get_u32(&IpAddr) == IPADDR_BROADCAST)) && + (Port == 67) && (AddressFile->Address.in_addr == 0)) + { + struct netif* lwip_netif = netif_list; + + /* + * This is a DHCP packet for an address file with address 0.0.0.0. + * Try to find an ethernet interface with no address set, + * and send the packet through it. + */ + while (lwip_netif != NULL) + { + if (ip4_addr_get_u32(&lwip_netif->ip_addr) == 0) + break; + lwip_netif = lwip_netif->next; + } + + if (lwip_netif == NULL) + { + /* Do a regular send. (This will most likely fail) */ + lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); + } + else + { + /* We found an interface with address being 0.0.0.0 */ + lwip_error = udp_sendto_if(AddressFile->lwip_udp_pcb, p, &IpAddr, Port, lwip_netif); + } + } + else + { + lwip_error = udp_sendto(AddressFile->lwip_udp_pcb, p, &IpAddr, Port); + } + break; + default: + lwip_error = raw_sendto(AddressFile->lwip_raw_pcb, p, &IpAddr); + break; + } + + switch (lwip_error) + { + case ERR_OK: + Status = STATUS_SUCCESS; + Irp->IoStatus.Information = BufferLength; + break; + case ERR_MEM: + case ERR_BUF: + DPRINT1("Received ERR_MEM from lwip.\n"); + Status = STATUS_INSUFFICIENT_RESOURCES; + break; + case ERR_RTE: + DPRINT1("Received ERR_RTE from lwip.\n"); + Status = STATUS_INVALID_ADDRESS; + break; + case ERR_VAL: + DPRINT1("Received ERR_VAL from lwip.\n"); + Status = STATUS_INVALID_PARAMETER; + break; + default: + DPRINT1("Received error %d from lwip.\n", lwip_error); + Status = STATUS_UNEXPECTED_NETWORK_ERROR; + } Finish: - if (p) - pbuf_free(p); - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); - return Status; + if (p) + pbuf_free(p); + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + return Status; } NTSTATUS AddressSetIpDontFragment( - _In_ TDIEntityID ID, - _In_ PVOID InBuffer, - _In_ ULONG BufferSize) -{ - /* Silently ignore. - * lwip doesn't have such thing, and already tries to fragment data as less as possible */ - return STATUS_SUCCESS; + _In_ TDIEntityID ID, + _In_ PVOID InBuffer, + _In_ ULONG BufferSize) +{ + /* Silently ignore. + * lwip doesn't have such thing, and already tries to fragment data as less as possible */ + return STATUS_SUCCESS; } NTSTATUS AddressSetTtl( - _In_ TDIEntityID ID, - _In_ PVOID InBuffer, - _In_ ULONG BufferSize) -{ - ADDRESS_FILE* AddressFile; - TCPIP_INSTANCE* Instance; - NTSTATUS Status; - ULONG Value; - - if (BufferSize < sizeof(ULONG)) - return STATUS_BUFFER_TOO_SMALL; - - /* Get the address file */ - Status = GetInstance(ID, &Instance); - if (!NT_SUCCESS(Status)) - return Status; - - AddressFile = CONTAINING_RECORD(Instance, ADDRESS_FILE, Instance); - - /* Get the value */ - Value = *((ULONG*)InBuffer); - - switch (AddressFile->Protocol) - { - case IPPROTO_TCP: - DPRINT1("TCP not supported yet.\n"); - break; - case IPPROTO_UDP: - AddressFile->lwip_udp_pcb->ttl = Value; - break; - default: - AddressFile->lwip_raw_pcb->ttl = Value; - break; - } - - return STATUS_SUCCESS; -} + _In_ TDIEntityID ID, + _In_ PVOID InBuffer, + _In_ ULONG BufferSize) +{ + ADDRESS_FILE* AddressFile; + TCPIP_INSTANCE* Instance; + NTSTATUS Status; + ULONG Value; + + if (BufferSize < sizeof(ULONG)) + return STATUS_BUFFER_TOO_SMALL; + + /* Get the address file */ + Status = GetInstance(ID, &Instance); + if (!NT_SUCCESS(Status)) + return Status; + + AddressFile = CONTAINING_RECORD(Instance, ADDRESS_FILE, Instance); + + /* Get the value */ + Value = *((ULONG*)InBuffer); + + switch (AddressFile->Protocol) + { + case IPPROTO_TCP: + DPRINT1("TCP not supported yet.\n"); + break; + case IPPROTO_UDP: + AddressFile->lwip_udp_pcb->ttl = Value; + break; + default: + AddressFile->lwip_raw_pcb->ttl = Value; + break; + } + + return STATUS_SUCCESS; +} 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 8 17:52:42 2016 @@ -9,18 +9,19 @@ #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 +#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 +#define TCP_STATE_DISASSOCIATED 0x1 << 9 typedef struct _ADDRESS_FILE { - UCHAR Type; + UCHAR Type; // must be the first member LIST_ENTRY ListEntry; LONG RefCount; LONG ContextCount; @@ -46,7 +47,7 @@ } ADDRESS_FILE, *PADDRESS_FILE; typedef struct _TCP_CONTEXT { - UCHAR Type; + UCHAR Type; // must be the first member LIST_ENTRY ListEntry; PADDRESS_FILE AddressFile; IPPROTO Protocol; Modified: branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/lwIP-tcpip/drivers/ne… ============================================================================== --- branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] (original) +++ branches/GSoC_2016/lwIP-tcpip/drivers/network/tcpip/main.c [iso-8859-1] Fri Jul 8 17:52:42 2016 @@ -360,7 +360,6 @@ { case TDI_TRANSPORT_ADDRESS_FILE: DPRINT1("TCPIP Close Transport Address\n"); - if (!IrpSp->FileObject->FsContext) { DPRINT1("TCPIP: Got a close request without a file to close!\n");

8 years, 5 months

[hbelusca] 71864: [FLTMGR]: Remove a MSVC warning: FltObjectDereference, whose prototype is publicly defined in fltkernel.h, doesn't return any value.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jul 8 17:44:59 2016 New Revision: 71864 URL: http://svn.reactos.org/svn/reactos?rev=71864&view=rev Log: [FLTMGR]: Remove a MSVC warning: FltObjectDereference, whose prototype is publicly defined in fltkernel.h, doesn't return any value. Modified: trunk/reactos/drivers/filters/fltmgr/Object.c Modified: trunk/reactos/drivers/filters/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filters/fltmgr/Obj… ============================================================================== --- trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filters/fltmgr/Object.c [iso-8859-1] Fri Jul 8 17:44:59 2016 @@ -36,11 +36,11 @@ return STATUS_SUCCESS; } -BOOLEAN +VOID NTAPI FltObjectDereference(_Inout_ PFLT_OBJECT Object) { - return FltpExReleaseRundownProtection(&Object->RundownRef); + FltpExReleaseRundownProtection(&Object->RundownRef); }

8 years, 5 months

[gedmurphy] 71863: - Slight code cleanup - Add missing PAGED_CODE (thanks thomas)

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jul 8 13:41:31 2016 New Revision: 71863 URL: http://svn.reactos.org/svn/reactos?rev=71863&view=rev Log: - Slight code cleanup - Add missing PAGED_CODE (thanks thomas) Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Fri Jul 8 13:41:31 2016 @@ -1352,8 +1352,8 @@ PFILE_OBJECT_EXTENSION FileObjectExtension; ASSERT(FALSE); - /* The extension buffer comes directly after the file object */ - FileObjectExtension = (PFILE_OBJECT_EXTENSION)(FileObject + 1); + /* Cast the buffer to something we understand */ + FileObjectExtension = FileObject->FileObjectExtension; /* Check if have a replacement top level device */ if (FileObjectExtension->TopDeviceObjectHint) Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Fri Jul 8 13:41:31 2016 @@ -818,6 +818,7 @@ FileObject->Flags |= FO_FILE_OBJECT_HAS_EXTENSION; FileObjectExtension = (PFILE_OBJECT_EXTENSION)(FileObject + 1); + FileObject->FileObjectExtension = FileObjectExtension; /* Add the top level device which we'll send the request to */ if (OpenPacket->InternalFlags & IOP_USE_TOP_LEVEL_DEVICE_HINT) @@ -2669,6 +2670,8 @@ { ULONG Flags = 0; + PAGED_CODE(); + /* Check if we were passed a device to send the create request to*/ if (DeviceObject) {

8 years, 5 months

[gedmurphy] 71862: [NTOS] - Implement IoCreateFileSpecifyDeviceObjectHint - will be needed for fltmgr - Rename IoCreateFile to IopCreateFile and forward both IoCreateFile and IoCreateFileSpecifyDev...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jul 8 13:18:39 2016 New Revision: 71862 URL: http://svn.reactos.org/svn/reactos?rev=71862&view=rev Log: [NTOS] - Implement IoCreateFileSpecifyDeviceObjectHint - will be needed for fltmgr - Rename IoCreateFile to IopCreateFile and forward both IoCreateFile and IoCreateFileSpecifyDeviceObjectHint to that routine - Add support to IopParseDevice to check for a top level device hint and use that instead of the real device. - Create a file object extension in IopParseDevice and use that to store our top level device hint data - Update IoGetRelatedDeviceObject to check for file object extensions and return the 'fake' top level device if we have one Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Fri Jul 8 13:18:39 2016 @@ -84,6 +84,21 @@ // Max traversal of reparse points for a single open in IoParseDevice // #define IOP_MAX_REPARSE_TRAVERSAL 0x20 + +// +// Private flags for IoCreateFile / IoParseDevice +// +#define IOP_USE_TOP_LEVEL_DEVICE_HINT 0x01 +#define IOP_CREATE_FILE_OBJECT_EXTENSION 0x02 + + +typedef struct _FILE_OBJECT_EXTENSION +{ + PDEVICE_OBJECT TopDeviceObjectHint; + +} FILE_OBJECT_EXTENSION, *PFILE_OBJECT_EXTENSION; + + // // We can call the Ob Inlined API, it's the same thing Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Fri Jul 8 13:18:39 2016 @@ -1349,9 +1349,18 @@ /* Check if the extension is really present */ if (FileObject->FileObjectExtension) { - /* FIXME: Unhandled yet */ - DPRINT1("FOEs not supported\n"); + PFILE_OBJECT_EXTENSION FileObjectExtension; ASSERT(FALSE); + + /* The extension buffer comes directly after the file object */ + FileObjectExtension = (PFILE_OBJECT_EXTENSION)(FileObject + 1); + + /* Check if have a replacement top level device */ + if (FileObjectExtension->TopDeviceObjectHint) + { + /* Use this instead of returning the top level device */ + return FileObjectExtension->TopDeviceObjectHint; + } } } Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Fri Jul 8 13:18:39 2016 @@ -586,13 +586,16 @@ /* Reference it */ InterlockedIncrement((PLONG)&Vpb->ReferenceCount); + + /* Check if we were given a specific top level device to use */ + if (OpenPacket->InternalFlags & IOP_USE_TOP_LEVEL_DEVICE_HINT) + { + DeviceObject = Vpb->DeviceObject; + } } } else { - /* The device object is the one we were given */ - DeviceObject = OriginalDeviceObject; - /* Check if it has a VPB */ if ((OriginalDeviceObject->Vpb) && !(DirectOpen)) { @@ -606,13 +609,25 @@ /* Get the VPB's device object */ DeviceObject = Vpb->DeviceObject; } - - /* Check if there's an attached device */ - if (DeviceObject->AttachedDevice) + else + { + /* The device object is the one we were given */ + DeviceObject = OriginalDeviceObject; + } + + /* If we weren't given a specific top level device, look for an attached device */ + if (!(OpenPacket->InternalFlags & IOP_USE_TOP_LEVEL_DEVICE_HINT) && + DeviceObject->AttachedDevice) { /* Get the attached device */ DeviceObject = IoGetAttachedDevice(DeviceObject); } + } + + if (OpenPacket->InternalFlags & IOP_USE_TOP_LEVEL_DEVICE_HINT) + { + // FIXME: Verify our device object is good to use + ASSERT(DirectOpen == FALSE); } /* If we traversed a mount point, reset the information */ @@ -706,6 +721,12 @@ /* Check if we really need to create an object */ if (!UseDummyFile) { + ULONG ObjectSize = sizeof(FILE_OBJECT); + + /* Tag on space for a file object extension */ + if (OpenPacket->InternalFlags & IOP_CREATE_FILE_OBJECT_EXTENSION) + ObjectSize += sizeof(FILE_OBJECT_EXTENSION); + /* Create the actual file object */ InitializeObjectAttributes(&ObjectAttributes, NULL, @@ -717,7 +738,7 @@ &ObjectAttributes, AccessMode, NULL, - sizeof(FILE_OBJECT), + ObjectSize, 0, 0, (PVOID*)&FileObject); @@ -786,6 +807,23 @@ { /* Set the correct flag for the FSD to read */ FileObject->Flags |= FO_RANDOM_ACCESS; + } + + /* Check if we were asked to setup a file object extension */ + if (OpenPacket->InternalFlags & IOP_CREATE_FILE_OBJECT_EXTENSION) + { + PFILE_OBJECT_EXTENSION FileObjectExtension; + + /* Make sure the file object knows it has an extension */ + FileObject->Flags |= FO_FILE_OBJECT_HAS_EXTENSION; + + FileObjectExtension = (PFILE_OBJECT_EXTENSION)(FileObject + 1); + + /* Add the top level device which we'll send the request to */ + if (OpenPacket->InternalFlags & IOP_USE_TOP_LEVEL_DEVICE_HINT) + { + FileObjectExtension->TopDeviceObjectHint = DeviceObject; + } } } else @@ -2116,53 +2154,24 @@ return STATUS_NOT_IMPLEMENTED; } -/* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ NTSTATUS NTAPI -IoCheckQuerySetFileInformation(IN FILE_INFORMATION_CLASS FileInformationClass, - IN ULONG Length, - IN BOOLEAN SetOperation) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -IoCheckQuotaBufferValidity(IN PFILE_QUOTA_INFORMATION QuotaBuffer, - IN ULONG QuotaLength, - OUT PULONG ErrorOffset) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -IoCreateFile(OUT PHANDLE FileHandle, - IN ACCESS_MASK DesiredAccess, - IN POBJECT_ATTRIBUTES ObjectAttributes, - OUT PIO_STATUS_BLOCK IoStatusBlock, - IN PLARGE_INTEGER AllocationSize OPTIONAL, - IN ULONG FileAttributes, - IN ULONG ShareAccess, - IN ULONG Disposition, - IN ULONG CreateOptions, - IN PVOID EaBuffer OPTIONAL, - IN ULONG EaLength, - IN CREATE_FILE_TYPE CreateFileType, - IN PVOID ExtraCreateParameters OPTIONAL, - IN ULONG Options) +IopCreateFile(OUT PHANDLE FileHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PLARGE_INTEGER AllocationSize OPTIONAL, + IN ULONG FileAttributes, + IN ULONG ShareAccess, + IN ULONG Disposition, + IN ULONG CreateOptions, + IN PVOID EaBuffer OPTIONAL, + IN ULONG EaLength, + IN CREATE_FILE_TYPE CreateFileType, + IN PVOID ExtraCreateParameters OPTIONAL, + IN ULONG Options, + IN ULONG Flags, + IN PDEVICE_OBJECT DeviceObject OPTIONAL) { KPROCESSOR_MODE AccessMode; HANDLE LocalHandle = 0; @@ -2171,7 +2180,7 @@ PNAMED_PIPE_CREATE_PARAMETERS NamedPipeCreateParameters; POPEN_PACKET OpenPacket; ULONG EaErrorOffset; - PAGED_CODE(); + IOTRACE(IO_FILE_DEBUG, "FileName: %wZ\n", ObjectAttributes->ObjectName); @@ -2451,6 +2460,8 @@ OpenPacket->Disposition = Disposition; OpenPacket->CreateFileType = CreateFileType; OpenPacket->ExtraCreateParameters = ExtraCreateParameters; + OpenPacket->InternalFlags = Flags; + OpenPacket->TopDeviceObjectHint = DeviceObject; /* Update the operation count */ IopUpdateOperationCount(IopOtherTransfer); @@ -2567,6 +2578,74 @@ return Status; } +/* FUNCTIONS *****************************************************************/ + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoCheckQuerySetFileInformation(IN FILE_INFORMATION_CLASS FileInformationClass, + IN ULONG Length, + IN BOOLEAN SetOperation) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +IoCheckQuotaBufferValidity(IN PFILE_QUOTA_INFORMATION QuotaBuffer, + IN ULONG QuotaLength, + OUT PULONG ErrorOffset) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +IoCreateFile(OUT PHANDLE FileHandle, + IN ACCESS_MASK DesiredAccess, + IN POBJECT_ATTRIBUTES ObjectAttributes, + OUT PIO_STATUS_BLOCK IoStatusBlock, + IN PLARGE_INTEGER AllocationSize OPTIONAL, + IN ULONG FileAttributes, + IN ULONG ShareAccess, + IN ULONG Disposition, + IN ULONG CreateOptions, + IN PVOID EaBuffer OPTIONAL, + IN ULONG EaLength, + IN CREATE_FILE_TYPE CreateFileType, + IN PVOID ExtraCreateParameters OPTIONAL, + IN ULONG Options) +{ + PAGED_CODE(); + + return IopCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + AllocationSize, + FileAttributes, + ShareAccess, + Disposition, + CreateOptions, + EaBuffer, + EaLength, + CreateFileType, + ExtraCreateParameters, + Options, + 0, + NULL); +} + /* * @unimplemented */ @@ -2588,8 +2667,31 @@ IN ULONG Options, IN PVOID DeviceObject) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ULONG Flags = 0; + + /* Check if we were passed a device to send the create request to*/ + if (DeviceObject) + { + /* We'll tag this request into a file object extension */ + Flags = (IOP_CREATE_FILE_OBJECT_EXTENSION | IOP_USE_TOP_LEVEL_DEVICE_HINT); + } + + return IopCreateFile(FileHandle, + DesiredAccess, + ObjectAttributes, + IoStatusBlock, + AllocationSize, + FileAttributes, + ShareAccess, + Disposition, + CreateOptions, + EaBuffer, + EaLength, + CreateFileType, + ExtraCreateParameters, + Options | IO_NO_PARAMETER_CHECKING, + Flags, + DeviceObject); } /*

8 years, 5 months

[gedmurphy] 71861: [SDK] - Add missing filter manager status codes

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jul 8 13:05:33 2016 New Revision: 71861 URL: http://svn.reactos.org/svn/reactos?rev=71861&view=rev Log: [SDK] - Add missing filter manager status codes Modified: trunk/reactos/sdk/include/psdk/ntstatus.h Modified: trunk/reactos/sdk/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/psdk/ntstatus.… ============================================================================== --- trunk/reactos/sdk/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/psdk/ntstatus.h [iso-8859-1] Fri Jul 8 13:05:33 2016 @@ -1196,6 +1196,40 @@ #define STATUS_GENERIC_COMMAND_FAILED ((NTSTATUS) 0xC0150026) #define STATUS_SXS_FILE_HASH_MISSING ((NTSTATUS) 0xC0150027) + + +#define STATUS_FLT_NO_HANDLER_DEFINED ((NTSTATUS)0xC01C0001L) +#define STATUS_FLT_CONTEXT_ALREADY_DEFINED ((NTSTATUS)0xC01C0002L) +#define STATUS_FLT_INVALID_ASYNCHRONOUS_REQUEST ((NTSTATUS)0xC01C0003L) +#define STATUS_FLT_DISALLOW_FAST_IO ((NTSTATUS)0xC01C0004L) +#define STATUS_FLT_INVALID_NAME_REQUEST ((NTSTATUS)0xC01C0005L) +#define STATUS_FLT_NOT_SAFE_TO_POST_OPERATION ((NTSTATUS)0xC01C0006L) +#define STATUS_FLT_NOT_INITIALIZED ((NTSTATUS)0xC01C0007L) +#define STATUS_FLT_FILTER_NOT_READY ((NTSTATUS)0xC01C0008L) +#define STATUS_FLT_POST_OPERATION_CLEANUP ((NTSTATUS)0xC01C0009L) +#define STATUS_FLT_INTERNAL_ERROR ((NTSTATUS)0xC01C000AL) +#define STATUS_FLT_DELETING_OBJECT ((NTSTATUS)0xC01C000BL) +#define STATUS_FLT_MUST_BE_NONPAGED_POOL ((NTSTATUS)0xC01C000CL) +#define STATUS_FLT_DUPLICATE_ENTRY ((NTSTATUS)0xC01C000DL) +#define STATUS_FLT_CBDQ_DISABLED ((NTSTATUS)0xC01C000EL) +#define STATUS_FLT_DO_NOT_ATTACH ((NTSTATUS)0xC01C000FL) +#define STATUS_FLT_DO_NOT_DETACH ((NTSTATUS)0xC01C0010L) +#define STATUS_FLT_INSTANCE_ALTITUDE_COLLISION ((NTSTATUS)0xC01C0011L) +#define STATUS_FLT_INSTANCE_NAME_COLLISION ((NTSTATUS)0xC01C0012L) +#define STATUS_FLT_FILTER_NOT_FOUND ((NTSTATUS)0xC01C0013L) +#define STATUS_FLT_VOLUME_NOT_FOUND ((NTSTATUS)0xC01C0014L) +#define STATUS_FLT_INSTANCE_NOT_FOUND ((NTSTATUS)0xC01C0015L) +#define STATUS_FLT_CONTEXT_ALLOCATION_NOT_FOUND ((NTSTATUS)0xC01C0016L) +#define STATUS_FLT_INVALID_CONTEXT_REGISTRATION ((NTSTATUS)0xC01C0017L) +#define STATUS_FLT_NAME_CACHE_MISS ((NTSTATUS)0xC01C0018L) +#define STATUS_FLT_NO_DEVICE_OBJECT ((NTSTATUS)0xC01C0019L) +#define STATUS_FLT_VOLUME_ALREADY_MOUNTED ((NTSTATUS)0xC01C001AL) +#define STATUS_FLT_ALREADY_ENLISTED ((NTSTATUS)0xC01C001BL) +#define STATUS_FLT_CONTEXT_ALREADY_LINKED ((NTSTATUS)0xC01C001CL) +#define STATUS_FLT_NO_WAITER_FOR_REPLY ((NTSTATUS)0xC01C0020L) +#define STATUS_FLT_REGISTRATION_BUSY ((NTSTATUS)0xC01C0023L) + + #endif /* WIN32_NO_STATUS */ #ifdef __cplusplus

8 years, 5 months

[gedmurphy] 71860: [FLTMGR] Move it to a more correct place in the tree

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jul 8 13:04:44 2016 New Revision: 71860 URL: http://svn.reactos.org/svn/reactos?rev=71860&view=rev Log: [FLTMGR] Move it to a more correct place in the tree Added: trunk/reactos/drivers/filters/fltmgr/ - copied from r71859, trunk/reactos/drivers/fs_minifilter/fltmgr/ Removed: trunk/reactos/drivers/fs_minifilter/

8 years, 5 months

[gedmurphy] 71859: [FLTMGR] - Implement basic versions of FltRegisterFilter and FltUnregisterFilter - Add layout of data for FLT_FILTER, FLT_INSTANCE, FLT_OBJECT and their accociated data - Add bas...

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jul 8 12:55:20 2016 New Revision: 71859 URL: http://svn.reactos.org/svn/reactos?rev=71859&view=rev Log: [FLTMGR] - Implement basic versions of FltRegisterFilter and FltUnregisterFilter - Add layout of data for FLT_FILTER, FLT_INSTANCE, FLT_OBJECT and their accociated data - Add basic rundown protection for the FLT_FILTER object - Removed from the build for now because GCC doesn't like our fltkernel.h header Added: trunk/reactos/drivers/fs_minifilter/fltmgr/Object.c (with props) trunk/reactos/drivers/fs_minifilter/fltmgr/Registration.c (with props) Modified: trunk/reactos/drivers/CMakeLists.txt trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h Modified: trunk/reactos/drivers/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/CMakeLists.txt [iso-8859-1] Fri Jul 8 12:55:20 2016 @@ -8,7 +8,7 @@ add_subdirectory(crypto) add_subdirectory(filesystems) add_subdirectory(filters) -add_subdirectory(fs_minifilter) +#add_subdirectory(fs_minifilter) add_subdirectory(hid) add_subdirectory(input) add_subdirectory(ksfilter) Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/CMakeLists.txt [iso-8859-1] Fri Jul 8 12:55:20 2016 @@ -1,6 +1,8 @@ list(APPEND SOURCE Interface.c + Registration.c + Object.c Lib.c fltmgr.h) Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Interface.c [iso-8859-1] Fri Jul 8 12:55:20 2016 @@ -370,6 +370,7 @@ DRIVER_DATA DriverData; + typedef struct _FLTMGR_DEVICE_EXTENSION { /* The file system we're attached to */ @@ -425,11 +426,18 @@ _Inout_ PIRP Irp) { PFLTMGR_DEVICE_EXTENSION DeviceExtension; + PIO_STACK_LOCATION StackPtr; DeviceExtension = DeviceObject->DeviceExtension; __debugbreak(); FLT_ASSERT(DeviceExtension && DeviceExtension->AttachedToDeviceObject); + + StackPtr = IoGetCurrentIrpStackLocation(Irp); + if (StackPtr->MajorFunction == IRP_MJ_SHUTDOWN) + { + //FltpProcessShutdownRequest(DeviceObject); + } /* Just pass the IRP down the stack */ IoSkipCurrentIrpStackLocation(Irp); Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Lib.c [iso-8859-1] Fri Jul 8 12:55:20 2016 @@ -19,83 +19,6 @@ /* FUNCTIONS **********************************************/ - -NTSTATUS -FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, - _Inout_ PUNICODE_STRING ObjectName) -{ - PDEVICE_OBJECT BaseDeviceObject; - NTSTATUS Status; - - /* - * Get the lowest device object on the stack, which may be the - * object we were passed, and lookup the name for that object - */ - BaseDeviceObject = IoGetDeviceAttachmentBaseRef(DeviceObject); - Status = FltpGetObjectName(BaseDeviceObject, ObjectName); - ObDereferenceObject(BaseDeviceObject); - - return Status; -} - -NTSTATUS -FltpGetObjectName(_In_ PVOID Object, - _Inout_ PUNICODE_STRING ObjectName) -{ - POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; - OBJECT_NAME_INFORMATION LocalNameInfo; - ULONG ReturnLength; - NTSTATUS Status; - - if (ObjectName == NULL) - return STATUS_INVALID_PARAMETER; - - /* Get the size of the buffer required to hold the nameinfo */ - Status = ObQueryNameString(Object, - &LocalNameInfo, - sizeof(LocalNameInfo), - &ReturnLength); - if (Status == STATUS_INFO_LENGTH_MISMATCH) - { - ObjectNameInfo = ExAllocatePoolWithTag(PagedPool, - ReturnLength, - FM_TAG_UNICODE_STRING); - if (ObjectNameInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; - - /* Get the actual name info now we have the buffer to hold it */ - Status = ObQueryNameString(Object, - ObjectNameInfo, - ReturnLength, - &ReturnLength); - } - - - if (NT_SUCCESS(Status)) - { - /* Make sure the buffer we were passed is large enough to hold the string */ - if (ObjectName->MaximumLength < ObjectNameInfo->Name.Length) - { - /* It wasn't, let's enlarge the buffer */ - Status = FltpReallocateUnicodeString(ObjectName, - ObjectNameInfo->Name.Length, - FALSE); - - } - - if (NT_SUCCESS(Status)) - { - /* Copy the object name into the callers buffer */ - RtlCopyUnicodeString(ObjectName, &ObjectNameInfo->Name); - } - } - - if (ObjectNameInfo) - { - ExFreePoolWithTag(ObjectNameInfo, FM_TAG_UNICODE_STRING); - } - - return Status; -} VOID FltpFreeUnicodeString(_In_ PUNICODE_STRING String) Added: trunk/reactos/drivers/fs_minifilter/fltmgr/Object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Object.c (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Object.c [iso-8859-1] Fri Jul 8 12:55:20 2016 @@ -0,0 +1,158 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/fs_minifilter/fltmgr/Object.c +* PURPOSE: Miscellaneous library functions +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +// NOTE: Split this file into filter object and device object functions +// when the code base grows sufficiently + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + + + +/* EXPORTED FUNCTIONS ******************************************************/ + + +NTSTATUS +NTAPI +FltObjectReference(_Inout_ PFLT_OBJECT Object) +{ + if (!FltpExAcquireRundownProtection(&Object->RundownRef)) + { + return STATUS_FLT_DELETING_OBJECT; + } + + return STATUS_SUCCESS; +} + +BOOLEAN +NTAPI +FltObjectDereference(_Inout_ PFLT_OBJECT Object) +{ + return FltpExReleaseRundownProtection(&Object->RundownRef); +} + + + +/* INTERNAL FUNCTIONS ******************************************************/ + +VOID +FltpExInitializeRundownProtection(_Out_ PEX_RUNDOWN_REF RundownRef) +{ + ExInitializeRundownProtection(RundownRef); +} + +BOOLEAN +FltpExAcquireRundownProtection(_Inout_ PEX_RUNDOWN_REF RundownRef) +{ + return ExAcquireRundownProtection(RundownRef); +} + +BOOLEAN +FltpExReleaseRundownProtection(_Inout_ PEX_RUNDOWN_REF RundownRef) +{ + ExReleaseRundownProtection(RundownRef); + return TRUE; +} + +BOOLEAN +FltpExRundownCompleted(_Inout_ PEX_RUNDOWN_REF RundownRef) +{ + return _InterlockedExchange((PLONG)RundownRef, 1); +} + +NTSTATUS +NTAPI +FltpObjectRundownWait(_Inout_ PEX_RUNDOWN_REF RundownRef) +{ + //return FltpExWaitForRundownProtectionRelease(RundownRef); + return 0; +} + +NTSTATUS +FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PUNICODE_STRING ObjectName) +{ + PDEVICE_OBJECT BaseDeviceObject; + NTSTATUS Status; + + /* + * Get the lowest device object on the stack, which may be the + * object we were passed, and lookup the name for that object + */ + BaseDeviceObject = IoGetDeviceAttachmentBaseRef(DeviceObject); + Status = FltpGetObjectName(BaseDeviceObject, ObjectName); + ObDereferenceObject(BaseDeviceObject); + + return Status; +} + +NTSTATUS +FltpGetObjectName(_In_ PVOID Object, + _Inout_ PUNICODE_STRING ObjectName) +{ + POBJECT_NAME_INFORMATION ObjectNameInfo = NULL; + OBJECT_NAME_INFORMATION LocalNameInfo; + ULONG ReturnLength; + NTSTATUS Status; + + if (ObjectName == NULL) + return STATUS_INVALID_PARAMETER; + + /* Get the size of the buffer required to hold the nameinfo */ + Status = ObQueryNameString(Object, + &LocalNameInfo, + sizeof(LocalNameInfo), + &ReturnLength); + if (Status == STATUS_INFO_LENGTH_MISMATCH) + { + ObjectNameInfo = ExAllocatePoolWithTag(PagedPool, + ReturnLength, + FM_TAG_UNICODE_STRING); + if (ObjectNameInfo == NULL) return STATUS_INSUFFICIENT_RESOURCES; + + /* Get the actual name info now we have the buffer to hold it */ + Status = ObQueryNameString(Object, + ObjectNameInfo, + ReturnLength, + &ReturnLength); + } + + + if (NT_SUCCESS(Status)) + { + /* Make sure the buffer we were passed is large enough to hold the string */ + if (ObjectName->MaximumLength < ObjectNameInfo->Name.Length) + { + /* It wasn't, let's enlarge the buffer */ + Status = FltpReallocateUnicodeString(ObjectName, + ObjectNameInfo->Name.Length, + FALSE); + + } + + if (NT_SUCCESS(Status)) + { + /* Copy the object name into the callers buffer */ + RtlCopyUnicodeString(ObjectName, &ObjectNameInfo->Name); + } + } + + if (ObjectNameInfo) + { + ExFreePoolWithTag(ObjectNameInfo, FM_TAG_UNICODE_STRING); + } + + return Status; +} Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/Object.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/fs_minifilter/fltmgr/Registration.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/Registration.c (added) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/Registration.c [iso-8859-1] Fri Jul 8 12:55:20 2016 @@ -0,0 +1,251 @@ +/* +* PROJECT: Filesystem Filter Manager +* LICENSE: GPL - See COPYING in the top level directory +* FILE: drivers/fs_minifilter/fltmgr/Registration.c +* PURPOSE: Handles registration of mini filters +* PROGRAMMERS: Ged Murphy (gedmurphy(a)reactos.org) +*/ + +/* INCLUDES ******************************************************************/ + +#include "fltmgr.h" + +#define NDEBUG +#include <debug.h> + + +/* DATA *********************************************************************/ + + +NTSTATUS +FltpStartingToDrainObject( + _Inout_ PFLT_OBJECT Object +); + + +/* EXPORTED FUNCTIONS ******************************************************/ + +NTSTATUS +NTAPI +FltRegisterFilter(_In_ PDRIVER_OBJECT DriverObject, + _In_ const FLT_REGISTRATION *Registration, + _Out_ PFLT_FILTER *RetFilter) +{ + PFLT_OPERATION_REGISTRATION Callbacks; + PFLT_FILTER Filter; + ULONG CallbackBufferSize; + ULONG FilterBufferSize; + ULONG Count = 0; + PCHAR Ptr; + NTSTATUS Status; + + Status = 0; //remove me + + /* Make sure we're targeting the correct major revision */ + if ((Registration->Version & 0xFF00) != FLT_MAJOR_VERSION) + { + return STATUS_INVALID_PARAMETER; + } + + /* Make sure our namespace callbacks are valid */ + if ((!Registration->GenerateFileNameCallback && Registration->NormalizeNameComponentCallback) || + (!Registration->NormalizeNameComponentCallback && Registration->NormalizeContextCleanupCallback)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Count the number of operations that were requested */ + Callbacks = (PFLT_OPERATION_REGISTRATION)Registration->OperationRegistration; + while (Callbacks) + { + Count++; + + /* Bail when we find the last one */ + if (Callbacks->MajorFunction == IRP_MJ_OPERATION_END) + break; + + /* Move to the next item */ + Callbacks++; + } + + /* Calculate the buffer sizes */ + CallbackBufferSize = Count * sizeof(FLT_OPERATION_REGISTRATION); + FilterBufferSize = sizeof(FLT_FILTER) + CallbackBufferSize + + DriverObject->DriverExtension->ServiceKeyName.Length; + + /* Allocate a buffer to hold our filter data */ + Filter = ExAllocatePoolWithTag(NonPagedPool, + FilterBufferSize, + FM_TAG_FILTER); + if (Filter == NULL) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(Filter, FilterBufferSize); + + /* Find the end of the fixed struct */ + Ptr = (PCHAR)(Filter + 1); + + /* Store a copy of the driver object of this filter */ + Filter->DriverObject = DriverObject; + + /* Initialize the base object data */ + Filter->Base.Flags = FLT_OBFL_TYPE_FILTER; + Filter->Base.PointerCount = 1; + FltpExInitializeRundownProtection(&Filter->Base.RundownRef); + FltObjectReference(&Filter->Base); + + /* Set the callback addresses */ + Filter->FilterUnload = Registration->FilterUnloadCallback; + Filter->InstanceSetup = Registration->InstanceSetupCallback; + Filter->InstanceQueryTeardown = Registration->InstanceQueryTeardownCallback; + Filter->InstanceTeardownStart = Registration->InstanceTeardownStartCallback; + Filter->InstanceTeardownComplete = Registration->InstanceTeardownCompleteCallback; + Filter->GenerateFileName = Registration->GenerateFileNameCallback; + Filter->NormalizeNameComponent = Registration->NormalizeNameComponentCallback; + Filter->NormalizeContextCleanup = Registration->NormalizeContextCleanupCallback; + + /* Initialize the instance list */ + ExInitializeResourceLite(&Filter->InstanceList.rLock); + InitializeListHead(&Filter->InstanceList.rList); + Filter->InstanceList.rCount = 0; + + ExInitializeFastMutex(&Filter->ActiveOpens.mLock); + InitializeListHead(&Filter->ActiveOpens.mList); + Filter->ActiveOpens.mCount = 0; + + /* Initialize the usermode port list */ + ExInitializeFastMutex(&Filter->PortList.mLock); + InitializeListHead(&Filter->PortList.mList); + Filter->PortList.mCount = 0; + + /* Check if the caller requested any context data */ + if (Registration->ContextRegistration) + { + // register the context information + } + + if (Registration->OperationRegistration) + { + /* The callback data comes after the fixed struct */ + Filter->Operations = (PFLT_OPERATION_REGISTRATION)Ptr; + Ptr += (Count * sizeof(FLT_OPERATION_REGISTRATION)); + + /* Tag the operation data onto the end of the filter data */ + RtlCopyMemory(Filter->Operations, Registration->OperationRegistration, CallbackBufferSize); + + /* walk through the requested callbacks */ + for (Callbacks = Filter->Operations; + Callbacks->MajorFunction != IRP_MJ_OPERATION_END; + Callbacks++) + { + // http://fsfilters.blogspot.co.uk/2011/03/how-file-system-filters-attach-to_1… + /* Check if this is an attach to a volume */ + if (Callbacks->MajorFunction == IRP_MJ_VOLUME_MOUNT) + { + Filter->PreVolumeMount = Callbacks->PreOperation; + Filter->PostVolumeMount = Callbacks->PostOperation; + } + else if (Callbacks->MajorFunction == IRP_MJ_SHUTDOWN) + { + Callbacks->PostOperation = NULL; + } + } + } + + /* Add the filter name buffer onto the end of the data and fill in the string */ + Filter->Name.Length = 0; + Filter->Name.MaximumLength = DriverObject->DriverExtension->ServiceKeyName.Length; + Filter->Name.Buffer = (PWCH)Ptr; + RtlCopyUnicodeString(&Filter->Name, &DriverObject->DriverExtension->ServiceKeyName); + + // + // - Get the altitude string + // - Slot the filter into the correct altitude location + // - More stuff?? + // + +//Quit: + if (!NT_SUCCESS(Status)) + { + // Add cleanup for context resources + + ExDeleteResourceLite(&Filter->InstanceList.rLock); + ExFreePoolWithTag(Filter, FM_TAG_FILTER); + } + + return Status; +} + +VOID +FLTAPI +FltUnregisterFilter(_In_ PFLT_FILTER Filter) +{ + PFLT_INSTANCE Instance; + PLIST_ENTRY CurrentEntry; + NTSTATUS Status; + + /* Set the draining flag */ + Status = FltpStartingToDrainObject(&Filter->Base); + if (!NT_SUCCESS(Status)) + { + /* Someone already unregistered us, just remove our ref and bail */ + FltObjectDereference(&Filter->Base); + return; + } + + /* Lock the instance list */ + KeEnterCriticalRegion(); + ExAcquireResourceSharedLite(&Filter->InstanceList.rLock, TRUE); + + /* Set the first entry in the list */ + CurrentEntry = Filter->InstanceList.rList.Flink; + + /* Free all instances referenced by the filter */ + while (CurrentEntry != &Filter->InstanceList.rList) + { + /* Get the record pointer */ + Instance = CONTAINING_RECORD(CurrentEntry, FLT_INSTANCE, FilterLink); + + // FIXME: implement + + /* Reset the pointer and move to next entry */ + Instance = NULL; + CurrentEntry = CurrentEntry->Flink; + } + + /* We're done with instances now */ + ExReleaseResourceLite(&Filter->InstanceList.rLock); + KeLeaveCriticalRegion(); + + /* Remove the reference from the base object */ + FltObjectDereference(&Filter->Base); + + /* Wait until we're sure nothing is using the filter */ + FltpObjectRundownWait(&Filter->Base.RundownRef); + + /* Delete the instance list lock */ + ExDeleteResourceLite(&Filter->InstanceList.rLock); + + /* We're finished cleaning up now */ + FltpExRundownCompleted(&Filter->Base.RundownRef); + + /* Hand the memory back */ + ExFreePoolWithTag(Filter, FM_TAG_FILTER); +} + + +/* INTERNAL FUNCTIONS ******************************************************/ + +NTSTATUS +FltpStartingToDrainObject(_Inout_ PFLT_OBJECT Object) +{ + /* + * Set the draining flag for the filter. This let's us force + * a post op callback for minifilters currently awaiting one. + */ + if (InterlockedOr((PLONG)&Object->Flags, FLT_OBFL_DRAINING) & 1) + { + /* We've been called once, we're already being deleted */ + return STATUS_FLT_DELETING_OBJECT; + } + + return STATUS_SUCCESS; +} Propchange: trunk/reactos/drivers/fs_minifilter/fltmgr/Registration.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/fs_minifilter/fltm… ============================================================================== --- trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/fs_minifilter/fltmgr/fltmgr.h [iso-8859-1] Fri Jul 8 12:55:20 2016 @@ -1,16 +1,25 @@ #ifndef _FLTMGR_H #define _FLTMGR_H +// Hack - our SDK reports NTDDI_VERSION as 0x05020100 (from _WIN32_WINNT 0x502) +// which doesn't pass the FLT_MGR_BASELINE check in fltkernel.h +#define NTDDI_VERSION NTDDI_WS03SP1 + #include <ntifs.h> -//#include <fltkernel.h> +#include <fltkernel.h> #include <pseh/pseh2.h> #define DRIVER_NAME L"RosFltMgr" + +#define FLT_MAJOR_VERSION 0x02 +#define FLT_MINOR_VERSION 0x00 //win2k3 #define FM_TAG_DISPATCH_TABLE 'ifMF' #define FM_TAG_REGISTRY_DATA 'rtMF' #define FM_TAG_DEV_OBJ_PTRS 'ldMF' #define FM_TAG_UNICODE_STRING 'suMF' +#define FM_TAG_FILTER 'lfMF' + typedef struct _DRIVER_DATA { @@ -25,7 +34,160 @@ } DRIVER_DATA, *PDRIVER_DATA; -#define FLT_ASSERT(_e) NT_ASSERT(_e) //FIXME +typedef enum _FLT_OBJECT_FLAGS +{ + FLT_OBFL_DRAINING = 1, + FLT_OBFL_ZOMBIED = 2, + FLT_OBFL_TYPE_INSTANCE = 0x1000000, + FLT_OBFL_TYPE_FILTER = 0x2000000, + FLT_OBFL_TYPE_VOLUME = 0x4000000 + +} FLT_OBJECT_FLAGS, *PFLT_OBJECT_FLAGS; + +typedef enum _FLT_FILTER_FLAGS +{ + FLTFL_MANDATORY_UNLOAD_IN_PROGRESS = 1, + FLTFL_FILTERING_INITIATED = 2 + +} FLT_FILTER_FLAGS, *PFLT_FILTER_FLAGS; + +typedef struct _FLT_OBJECT // size = 0x14 +{ + volatile FLT_OBJECT_FLAGS Flags; + ULONG PointerCount; + EX_RUNDOWN_REF RundownRef; + LIST_ENTRY PrimaryLink; + +} FLT_OBJECT, *PFLT_OBJECT; + +typedef struct _FLT_RESOURCE_LIST_HEAD +{ + ERESOURCE rLock; + LIST_ENTRY rList; + ULONG rCount; + +} FLT_RESOURCE_LIST_HEAD, *PFLT_RESOURCE_LIST_HEAD; + +typedef struct _FLT_MUTEX_LIST_HEAD +{ + FAST_MUTEX mLock; + LIST_ENTRY mList; + ULONG mCount; + +} FLT_MUTEX_LIST_HEAD, *PFLT_MUTEX_LIST_HEAD; + +typedef struct _FLT_FILTER // size = 0x120 +{ + FLT_OBJECT Base; + PVOID Frame; //FLTP_FRAME + UNICODE_STRING Name; + UNICODE_STRING DefaultAltitude; + FLT_FILTER_FLAGS Flags; + PDRIVER_OBJECT DriverObject; + FLT_RESOURCE_LIST_HEAD InstanceList; + PVOID VerifierExtension; + PFLT_FILTER_UNLOAD_CALLBACK FilterUnload; + PFLT_INSTANCE_SETUP_CALLBACK InstanceSetup; + PFLT_INSTANCE_QUERY_TEARDOWN_CALLBACK InstanceQueryTeardown; + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownStart; + PFLT_INSTANCE_TEARDOWN_CALLBACK InstanceTeardownComplete; + PVOID SupportedContextsListHead; //PALLOCATE_CONTEXT_HEADER + PVOID SupportedContexts; //PALLOCATE_CONTEXT_HEADER + PVOID PreVolumeMount; + PVOID PostVolumeMount; + PFLT_GENERATE_FILE_NAME GenerateFileName; + PFLT_NORMALIZE_NAME_COMPONENT NormalizeNameComponent; + PFLT_NORMALIZE_CONTEXT_CLEANUP NormalizeContextCleanup; + PFLT_OPERATION_REGISTRATION Operations; + PFLT_FILTER_UNLOAD_CALLBACK OldDriverUnload; + FLT_MUTEX_LIST_HEAD ActiveOpens; + FLT_MUTEX_LIST_HEAD PortList; + EX_PUSH_LOCK PortLock; + +} FLT_FILTER, *PFLT_FILTER; + +typedef enum _FLT_INSTANCE_FLAGS +{ + INSFL_CAN_BE_DETACHED = 0x01, + INSFL_DELETING = 0x02, + INSFL_INITING = 0x04 + +} FLT_INSTANCE_FLAGS, *PFLT_INSTANCE_FLAGS; + +typedef struct _FLT_INSTANCE // size = 0x144 +{ + FLT_OBJECT Base; + ULONG OperationRundownRef; + PVOID Volume; //PFLT_VOLUME + PFLT_FILTER Filter; + FLT_INSTANCE_FLAGS Flags; + UNICODE_STRING Altitude; + UNICODE_STRING Name; + LIST_ENTRY FilterLink; + ERESOURCE ContextLock; + PVOID Context; + PVOID TrackCompletionNodes; + PVOID CallbackNodes; + +} FLT_INSTANCE, *PFLT_INSTANCE; + + + + + +VOID +FltpExInitializeRundownProtection( + _Out_ PEX_RUNDOWN_REF RundownRef +); + +BOOLEAN +FltpExAcquireRundownProtection( + _Inout_ PEX_RUNDOWN_REF RundownRef +); + +BOOLEAN +FltpExReleaseRundownProtection( + _Inout_ PEX_RUNDOWN_REF RundownRef +); + +NTSTATUS +NTAPI +FltpObjectRundownWait( + _Inout_ PEX_RUNDOWN_REF RundownRef +); + +BOOLEAN +FltpExRundownCompleted( + _Inout_ PEX_RUNDOWN_REF RundownRef +); + +/////////// FIXME: put these into the correct header +NTSTATUS +FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, + _Inout_ PUNICODE_STRING ObjectName); + +NTSTATUS +FltpGetObjectName(_In_ PVOID Object, + _Inout_ PUNICODE_STRING ObjectName); + +NTSTATUS +FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, + _In_ SIZE_T NewLength, + _In_ BOOLEAN CopyExisting); + +VOID +FltpFreeUnicodeString(_In_ PUNICODE_STRING String); +//////////////////////////////////////////////// + + + + + + + + + + //FM ? ? -fltmgr.sys - Unrecognized FltMgr tag(update pooltag.w) @@ -243,22 +405,5 @@ -/////////// FIXME: put these into the correct header -NTSTATUS -FltpGetBaseDeviceObjectName(_In_ PDEVICE_OBJECT DeviceObject, -_Inout_ PUNICODE_STRING ObjectName); - -NTSTATUS -FltpGetObjectName(_In_ PVOID Object, -_Inout_ PUNICODE_STRING ObjectName); - -NTSTATUS -FltpReallocateUnicodeString(_In_ PUNICODE_STRING String, -_In_ SIZE_T NewLength, -_In_ BOOLEAN CopyExisting); - -VOID -FltpFreeUnicodeString(_In_ PUNICODE_STRING String); -//////////////////////////////////////////////// #endif /* _FLTMGR_H */

8 years, 5 months

[tthompson] 71858: [NTFS] Fix broken check for free disk space in NtfsAllocateClusters().

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Jul 8 12:05:19 2016 New Revision: 71858 URL: http://svn.reactos.org/svn/reactos?rev=71858&view=rev Log: [NTFS] Fix broken check for free disk space in NtfsAllocateClusters(). Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Fri Jul 8 12:05:19 2016 @@ -162,8 +162,14 @@ RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.ClusterCount); FreeClusters = RtlNumberOfClearBits(&Bitmap); - if( FreeClusters < DesiredClusters ) - Status = STATUS_DISK_FULL; + if (FreeClusters < DesiredClusters) + { + ReleaseAttributeContext(DataContext); + + ExFreePoolWithTag(BitmapData, TAG_NTFS); + ExFreePoolWithTag(BitmapRecord, TAG_NTFS); + return STATUS_DISK_FULL; + } // TODO: Observe MFT reservation zone

8 years, 5 months

[tthompson] 71857: [NTFS] Simplify GetLastClusterInDataRun() and clean up NtfsAllocateClusters(). No functional changes.

by tthompson＠svn.reactos.org

Author: tthompson Date: Fri Jul 8 11:59:25 2016 New Revision: 71857 URL: http://svn.reactos.org/svn/reactos?rev=71857&view=rev Log: [NTFS] Simplify GetLastClusterInDataRun() and clean up NtfsAllocateClusters(). No functional changes. Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/attrib.c [iso-8859-1] Fri Jul 8 11:59:25 2016 @@ -583,28 +583,16 @@ { DataRun = DecodeRun(DataRun, &DataRunOffset, &DataRunLength); - if (DataRunOffset == -1) - { - // sparse run - if (*DataRun == 0) - { - // if it's the last run, return the last cluster of the last run - *LastCluster = LastLCN + DataRunLength - 1; - break; - } - } - else + if (DataRunOffset != -1) { // Normal data run. DataRunStartLCN = LastLCN + DataRunOffset; LastLCN = DataRunStartLCN; + *LastCluster = LastLCN + DataRunLength - 1; } - if (*DataRun == 0) - { - *LastCluster = LastLCN + DataRunLength - 1; - break; - } + if (*DataRun == 0) + break; } return STATUS_SUCCESS; Modified: branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2016/NTFS/drivers/filesyst… ============================================================================== --- branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] (original) +++ branches/GSoC_2016/NTFS/drivers/filesystems/ntfs/volinfo.c [iso-8859-1] Fri Jul 8 11:59:25 2016 @@ -162,38 +162,35 @@ RtlInitializeBitMap(&Bitmap, (PULONG)BitmapData, DeviceExt->NtfsInfo.ClusterCount); FreeClusters = RtlNumberOfClearBits(&Bitmap); - if (FreeClusters >= DesiredClusters) - { - // TODO: Observe MFT reservation zone - - // Can we get one contiguous run? - ULONG AssignedRun = RtlFindClearBitsAndSet(&Bitmap, DesiredClusters, FirstDesiredCluster); - ULONG LengthWritten; - - if (AssignedRun != 0xFFFFFFFF) + if( FreeClusters < DesiredClusters ) + Status = STATUS_DISK_FULL; + + // TODO: Observe MFT reservation zone + + // Can we get one contiguous run? + ULONG AssignedRun = RtlFindClearBitsAndSet(&Bitmap, DesiredClusters, FirstDesiredCluster); + ULONG LengthWritten; + + if (AssignedRun != 0xFFFFFFFF) + { + *FirstAssignedCluster = AssignedRun; + *AssignedClusters = DesiredClusters; + } + else + { + // we can't get one contiguous run + *AssignedClusters = RtlFindNextForwardRunClear(&Bitmap, FirstDesiredCluster, FirstAssignedCluster); + + if (*AssignedClusters == 0) { - *FirstAssignedCluster = AssignedRun; - *AssignedClusters = DesiredClusters; + // we couldn't find any runs starting at DesiredFirstCluster + *AssignedClusters = RtlFindLongestRunClear(&Bitmap, FirstAssignedCluster); } - else - { - // we can't get one contiguous run - *AssignedClusters = RtlFindNextForwardRunClear(&Bitmap, FirstDesiredCluster, FirstAssignedCluster); - - if (*AssignedClusters == 0) - { - // we couldn't find any runs starting at DesiredFirstCluster - *AssignedClusters = RtlFindLongestRunClear(&Bitmap, FirstAssignedCluster); - } - } + } - Status = WriteAttribute(DeviceExt, DataContext, 0, BitmapData, (ULONG)BitmapDataSize, &LengthWritten); - } - else - Status = STATUS_DISK_FULL; - - + Status = WriteAttribute(DeviceExt, DataContext, 0, BitmapData, (ULONG)BitmapDataSize, &LengthWritten); + ReleaseAttributeContext(DataContext); ExFreePoolWithTag(BitmapData, TAG_NTFS);

8 years, 5 months

← Newer
1
...
18
19
20
21
22
23
24
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2016