Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 36154: update libxml2 to 2.7.1
by cwittich＠svn.reactos.org 12 Sep '08

12 Sep '08

Author: cwittich Date: Fri Sep 12 03:09:23 2008 New Revision: 36154 URL: http://svn.reactos.org/svn/reactos?rev=36154&view=rev Log: update libxml2 to 2.7.1 Added: trunk/reactos/include/reactos/libs/libxml/schematron.h (with props) trunk/reactos/lib/3rdparty/libxml2/regressions.xml (with props) trunk/reactos/lib/3rdparty/libxml2/runxmlconf.c (with props) trunk/reactos/lib/3rdparty/libxml2/schematron.c (with props) trunk/reactos/lib/3rdparty/libxml2/testchar.c (with props) trunk/reactos/lib/3rdparty/libxml2/testdict.c (with props) trunk/reactos/lib/3rdparty/libxml2/testrecurse.c (with props) Removed: trunk/reactos/lib/3rdparty/libxml2/regressions.rbuild Modified: trunk/reactos/include/reactos/libs/libxml/DOCBparser.h trunk/reactos/include/reactos/libs/libxml/HTMLparser.h trunk/reactos/include/reactos/libs/libxml/HTMLtree.h trunk/reactos/include/reactos/libs/libxml/Makefile.am trunk/reactos/include/reactos/libs/libxml/Makefile.in trunk/reactos/include/reactos/libs/libxml/SAX.h trunk/reactos/include/reactos/libs/libxml/SAX2.h trunk/reactos/include/reactos/libs/libxml/c14n.h trunk/reactos/include/reactos/libs/libxml/catalog.h trunk/reactos/include/reactos/libs/libxml/chvalid.h trunk/reactos/include/reactos/libs/libxml/debugXML.h trunk/reactos/include/reactos/libs/libxml/dict.h trunk/reactos/include/reactos/libs/libxml/encoding.h trunk/reactos/include/reactos/libs/libxml/entities.h trunk/reactos/include/reactos/libs/libxml/globals.h trunk/reactos/include/reactos/libs/libxml/hash.h trunk/reactos/include/reactos/libs/libxml/list.h trunk/reactos/include/reactos/libs/libxml/nanoftp.h trunk/reactos/include/reactos/libs/libxml/nanohttp.h trunk/reactos/include/reactos/libs/libxml/parser.h trunk/reactos/include/reactos/libs/libxml/parserInternals.h trunk/reactos/include/reactos/libs/libxml/pattern.h trunk/reactos/include/reactos/libs/libxml/relaxng.h trunk/reactos/include/reactos/libs/libxml/schemasInternals.h trunk/reactos/include/reactos/libs/libxml/threads.h trunk/reactos/include/reactos/libs/libxml/tree.h trunk/reactos/include/reactos/libs/libxml/uri.h trunk/reactos/include/reactos/libs/libxml/valid.h trunk/reactos/include/reactos/libs/libxml/xinclude.h trunk/reactos/include/reactos/libs/libxml/xlink.h trunk/reactos/include/reactos/libs/libxml/xmlIO.h trunk/reactos/include/reactos/libs/libxml/xmlautomata.h trunk/reactos/include/reactos/libs/libxml/xmlerror.h trunk/reactos/include/reactos/libs/libxml/xmlexports.h trunk/reactos/include/reactos/libs/libxml/xmlmemory.h trunk/reactos/include/reactos/libs/libxml/xmlmodule.h trunk/reactos/include/reactos/libs/libxml/xmlreader.h trunk/reactos/include/reactos/libs/libxml/xmlregexp.h trunk/reactos/include/reactos/libs/libxml/xmlsave.h trunk/reactos/include/reactos/libs/libxml/xmlschemas.h trunk/reactos/include/reactos/libs/libxml/xmlschemastypes.h trunk/reactos/include/reactos/libs/libxml/xmlstring.h trunk/reactos/include/reactos/libs/libxml/xmlunicode.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in trunk/reactos/include/reactos/libs/libxml/xpath.h trunk/reactos/include/reactos/libs/libxml/xpathInternals.h trunk/reactos/include/reactos/libs/libxml/xpointer.h trunk/reactos/lib/3rdparty/libxml2/ChangeLog trunk/reactos/lib/3rdparty/libxml2/DOCBparser.c trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c trunk/reactos/lib/3rdparty/libxml2/INSTALL trunk/reactos/lib/3rdparty/libxml2/Makefile.am trunk/reactos/lib/3rdparty/libxml2/Makefile.in trunk/reactos/lib/3rdparty/libxml2/Makefile.tests trunk/reactos/lib/3rdparty/libxml2/NEWS trunk/reactos/lib/3rdparty/libxml2/README.tests trunk/reactos/lib/3rdparty/libxml2/SAX.c trunk/reactos/lib/3rdparty/libxml2/SAX2.c trunk/reactos/lib/3rdparty/libxml2/aclocal.m4 trunk/reactos/lib/3rdparty/libxml2/c14n.c trunk/reactos/lib/3rdparty/libxml2/catalog.c trunk/reactos/lib/3rdparty/libxml2/check-relaxng-test-suite.py trunk/reactos/lib/3rdparty/libxml2/check-relaxng-test-suite2.py trunk/reactos/lib/3rdparty/libxml2/check-xsddata-test-suite.py trunk/reactos/lib/3rdparty/libxml2/chvalid.c trunk/reactos/lib/3rdparty/libxml2/config.guess trunk/reactos/lib/3rdparty/libxml2/config.h.in trunk/reactos/lib/3rdparty/libxml2/config.sub trunk/reactos/lib/3rdparty/libxml2/configure trunk/reactos/lib/3rdparty/libxml2/configure.in trunk/reactos/lib/3rdparty/libxml2/debugXML.c trunk/reactos/lib/3rdparty/libxml2/depcomp trunk/reactos/lib/3rdparty/libxml2/dict.c trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h trunk/reactos/lib/3rdparty/libxml2/encoding.c trunk/reactos/lib/3rdparty/libxml2/entities.c trunk/reactos/lib/3rdparty/libxml2/error.c trunk/reactos/lib/3rdparty/libxml2/genUnicode.py trunk/reactos/lib/3rdparty/libxml2/gentest.py trunk/reactos/lib/3rdparty/libxml2/globals.c trunk/reactos/lib/3rdparty/libxml2/hash.c trunk/reactos/lib/3rdparty/libxml2/legacy.c trunk/reactos/lib/3rdparty/libxml2/libxml-2.0.pc.in trunk/reactos/lib/3rdparty/libxml2/libxml.3 trunk/reactos/lib/3rdparty/libxml2/libxml.h trunk/reactos/lib/3rdparty/libxml2/libxml.spec.in trunk/reactos/lib/3rdparty/libxml2/libxml2.spec trunk/reactos/lib/3rdparty/libxml2/list.c trunk/reactos/lib/3rdparty/libxml2/ltmain.sh trunk/reactos/lib/3rdparty/libxml2/nanoftp.c trunk/reactos/lib/3rdparty/libxml2/nanohttp.c trunk/reactos/lib/3rdparty/libxml2/parser.c trunk/reactos/lib/3rdparty/libxml2/parserInternals.c trunk/reactos/lib/3rdparty/libxml2/pattern.c trunk/reactos/lib/3rdparty/libxml2/relaxng.c trunk/reactos/lib/3rdparty/libxml2/runsuite.c trunk/reactos/lib/3rdparty/libxml2/runtest.c trunk/reactos/lib/3rdparty/libxml2/testAutomata.c trunk/reactos/lib/3rdparty/libxml2/testC14N.c trunk/reactos/lib/3rdparty/libxml2/testHTML.c trunk/reactos/lib/3rdparty/libxml2/testModule.c trunk/reactos/lib/3rdparty/libxml2/testReader.c trunk/reactos/lib/3rdparty/libxml2/testRegexp.c trunk/reactos/lib/3rdparty/libxml2/testRelax.c trunk/reactos/lib/3rdparty/libxml2/testSAX.c trunk/reactos/lib/3rdparty/libxml2/testSchemas.c trunk/reactos/lib/3rdparty/libxml2/testThreads.c trunk/reactos/lib/3rdparty/libxml2/testThreadsWin32.c trunk/reactos/lib/3rdparty/libxml2/testURI.c trunk/reactos/lib/3rdparty/libxml2/testXPath.c trunk/reactos/lib/3rdparty/libxml2/testapi.c trunk/reactos/lib/3rdparty/libxml2/threads.c trunk/reactos/lib/3rdparty/libxml2/tree.c trunk/reactos/lib/3rdparty/libxml2/trio.c trunk/reactos/lib/3rdparty/libxml2/trio.h trunk/reactos/lib/3rdparty/libxml2/triodef.h trunk/reactos/lib/3rdparty/libxml2/trionan.c trunk/reactos/lib/3rdparty/libxml2/trionan.h trunk/reactos/lib/3rdparty/libxml2/triop.h trunk/reactos/lib/3rdparty/libxml2/triostr.c trunk/reactos/lib/3rdparty/libxml2/triostr.h trunk/reactos/lib/3rdparty/libxml2/uri.c trunk/reactos/lib/3rdparty/libxml2/valid.c trunk/reactos/lib/3rdparty/libxml2/xinclude.c trunk/reactos/lib/3rdparty/libxml2/xlink.c trunk/reactos/lib/3rdparty/libxml2/xml2-config.in trunk/reactos/lib/3rdparty/libxml2/xmlIO.c trunk/reactos/lib/3rdparty/libxml2/xmlcatalog.c trunk/reactos/lib/3rdparty/libxml2/xmllint.c trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c trunk/reactos/lib/3rdparty/libxml2/xmlmodule.c trunk/reactos/lib/3rdparty/libxml2/xmlreader.c trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c trunk/reactos/lib/3rdparty/libxml2/xmlsave.c trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c trunk/reactos/lib/3rdparty/libxml2/xmlschemastypes.c trunk/reactos/lib/3rdparty/libxml2/xmlstring.c trunk/reactos/lib/3rdparty/libxml2/xmlunicode.c trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c trunk/reactos/lib/3rdparty/libxml2/xpath.c trunk/reactos/lib/3rdparty/libxml2/xpointer.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/reactos/libs/libxml/DOCBparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/HTMLparser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/HTMLtree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/SAX.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/SAX2.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/c14n.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/catalog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/chvalid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/debugXML.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/dict.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/encoding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/entities.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/globals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/hash.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/list.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/nanoftp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/nanohttp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/parserInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/pattern.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/relaxng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/schemasInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Added: trunk/reactos/include/reactos/libs/libxml/schematron.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/threads.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/tree.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/uri.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/valid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xinclude.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xlink.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlIO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlautomata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlerror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlexports.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlmemory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlmodule.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlreader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlregexp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlsave.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlschemas.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlschemastypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlunicode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xmlversion.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xpath.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xpathInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/include/reactos/libs/libxml/xpointer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Chang… Modified: trunk/reactos/lib/3rdparty/libxml2/DOCBparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/DOCBp… Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLparser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLp… Modified: trunk/reactos/lib/3rdparty/libxml2/HTMLtree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/HTMLt… Modified: trunk/reactos/lib/3rdparty/libxml2/INSTALL URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/INSTA… Modified: trunk/reactos/lib/3rdparty/libxml2/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Makef… Modified: trunk/reactos/lib/3rdparty/libxml2/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Makef… Modified: trunk/reactos/lib/3rdparty/libxml2/Makefile.tests URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/Makef… Modified: trunk/reactos/lib/3rdparty/libxml2/NEWS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/NEWS?… Modified: trunk/reactos/lib/3rdparty/libxml2/README.tests URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/READM… Modified: trunk/reactos/lib/3rdparty/libxml2/SAX.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/SAX.c… Modified: trunk/reactos/lib/3rdparty/libxml2/SAX2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/SAX2.… Modified: trunk/reactos/lib/3rdparty/libxml2/aclocal.m4 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/acloc… Modified: trunk/reactos/lib/3rdparty/libxml2/c14n.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/c14n.… Modified: trunk/reactos/lib/3rdparty/libxml2/catalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/catal… Modified: trunk/reactos/lib/3rdparty/libxml2/check-relaxng-test-suite.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/check… Modified: trunk/reactos/lib/3rdparty/libxml2/check-relaxng-test-suite2.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/check… Modified: trunk/reactos/lib/3rdparty/libxml2/check-xsddata-test-suite.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/check… Modified: trunk/reactos/lib/3rdparty/libxml2/chvalid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/chval… Modified: trunk/reactos/lib/3rdparty/libxml2/config.guess URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/config.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/config.sub URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/configure URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/configure.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/confi… Modified: trunk/reactos/lib/3rdparty/libxml2/debugXML.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/debug… Modified: trunk/reactos/lib/3rdparty/libxml2/depcomp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/depco… Modified: trunk/reactos/lib/3rdparty/libxml2/dict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/dict.… Modified: trunk/reactos/lib/3rdparty/libxml2/elfgcchack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/elfgc… Modified: trunk/reactos/lib/3rdparty/libxml2/encoding.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/encod… Modified: trunk/reactos/lib/3rdparty/libxml2/entities.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/entit… Modified: trunk/reactos/lib/3rdparty/libxml2/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/error… Modified: trunk/reactos/lib/3rdparty/libxml2/genUnicode.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/genUn… Modified: trunk/reactos/lib/3rdparty/libxml2/gentest.py URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/gente… Modified: trunk/reactos/lib/3rdparty/libxml2/globals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/globa… Modified: trunk/reactos/lib/3rdparty/libxml2/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/hash.… Modified: trunk/reactos/lib/3rdparty/libxml2/legacy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/legac… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml-2.0.pc.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml.3 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml.spec.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/libxml2.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/libxm… Modified: trunk/reactos/lib/3rdparty/libxml2/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/list.… Modified: trunk/reactos/lib/3rdparty/libxml2/ltmain.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/ltmai… Modified: trunk/reactos/lib/3rdparty/libxml2/nanoftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanof… Modified: trunk/reactos/lib/3rdparty/libxml2/nanohttp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/nanoh… Modified: trunk/reactos/lib/3rdparty/libxml2/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/parserInternals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/parse… Modified: trunk/reactos/lib/3rdparty/libxml2/pattern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/patte… Removed: trunk/reactos/lib/3rdparty/libxml2/regressions.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/regre… Added: trunk/reactos/lib/3rdparty/libxml2/regressions.xml URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/regre… Modified: trunk/reactos/lib/3rdparty/libxml2/relaxng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/relax… Modified: trunk/reactos/lib/3rdparty/libxml2/runsuite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/runsu… Modified: trunk/reactos/lib/3rdparty/libxml2/runtest.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/runte… Added: trunk/reactos/lib/3rdparty/libxml2/runxmlconf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/runxm… Added: trunk/reactos/lib/3rdparty/libxml2/schematron.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/schem… Modified: trunk/reactos/lib/3rdparty/libxml2/testAutomata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testA… Modified: trunk/reactos/lib/3rdparty/libxml2/testC14N.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testC… Modified: trunk/reactos/lib/3rdparty/libxml2/testHTML.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testH… Modified: trunk/reactos/lib/3rdparty/libxml2/testModule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testM… Modified: trunk/reactos/lib/3rdparty/libxml2/testReader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testR… Modified: trunk/reactos/lib/3rdparty/libxml2/testRegexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testR… Modified: trunk/reactos/lib/3rdparty/libxml2/testRelax.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testR… Modified: trunk/reactos/lib/3rdparty/libxml2/testSAX.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testS… Modified: trunk/reactos/lib/3rdparty/libxml2/testSchemas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testS… Modified: trunk/reactos/lib/3rdparty/libxml2/testThreads.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testT… Modified: trunk/reactos/lib/3rdparty/libxml2/testThreadsWin32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testT… Modified: trunk/reactos/lib/3rdparty/libxml2/testURI.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testU… Modified: trunk/reactos/lib/3rdparty/libxml2/testXPath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testX… Modified: trunk/reactos/lib/3rdparty/libxml2/testapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testa… Added: trunk/reactos/lib/3rdparty/libxml2/testchar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testc… Added: trunk/reactos/lib/3rdparty/libxml2/testdict.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testd… Added: trunk/reactos/lib/3rdparty/libxml2/testrecurse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/testr… Modified: trunk/reactos/lib/3rdparty/libxml2/threads.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/threa… Modified: trunk/reactos/lib/3rdparty/libxml2/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/tree.… Modified: trunk/reactos/lib/3rdparty/libxml2/trio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trio.… Modified: trunk/reactos/lib/3rdparty/libxml2/trio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trio.… Modified: trunk/reactos/lib/3rdparty/libxml2/triodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/triod… Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trion… Modified: trunk/reactos/lib/3rdparty/libxml2/trionan.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trion… Modified: trunk/reactos/lib/3rdparty/libxml2/triop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/triop… Modified: trunk/reactos/lib/3rdparty/libxml2/triostr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trios… Modified: trunk/reactos/lib/3rdparty/libxml2/triostr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/trios… Modified: trunk/reactos/lib/3rdparty/libxml2/uri.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/uri.c… Modified: trunk/reactos/lib/3rdparty/libxml2/valid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/valid… Modified: trunk/reactos/lib/3rdparty/libxml2/xinclude.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xincl… Modified: trunk/reactos/lib/3rdparty/libxml2/xlink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xlink… Modified: trunk/reactos/lib/3rdparty/libxml2/xml2-config.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xml2-… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlIO.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlIO… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlcatalog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlca… Modified: trunk/reactos/lib/3rdparty/libxml2/xmllint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlli… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlme… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlmodule.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlmo… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlreader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlregexp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlre… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlsave.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsa… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlschemas.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsc… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlschemastypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlsc… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlst… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlunicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlun… Modified: trunk/reactos/lib/3rdparty/libxml2/xmlwriter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xmlwr… Modified: trunk/reactos/lib/3rdparty/libxml2/xpath.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpath… Modified: trunk/reactos/lib/3rdparty/libxml2/xpointer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libxml2/xpoin…

1 0

[cwittich] 36153: fix redefinitions add MemoryBarrier for MSVC
by cwittich＠svn.reactos.org 12 Sep '08

12 Sep '08

Author: cwittich Date: Fri Sep 12 03:07:52 2008 New Revision: 36153 URL: http://svn.reactos.org/svn/reactos?rev=36153&view=rev Log: fix redefinitions add MemoryBarrier for MSVC Modified: trunk/reactos/include/psdk/windef.h trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/windef.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/windef.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/windef.h [iso-8859-1] Fri Sep 12 03:07:52 2008 @@ -125,7 +125,6 @@ #define __pascal __stdcall #define CDECL _cdecl -#define PASCAL _pascal #if !defined(__x86_64__) //defined(_STDCALL_SUPPORTED) #define STDCALL __stdcall Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Fri Sep 12 03:07:52 2008 @@ -1526,9 +1526,6 @@ #define IMAGE_ARCHIVE_PAD "\n" #define IMAGE_ARCHIVE_LINKER_MEMBER "/ " #define IMAGE_ARCHIVE_LONGNAMES_MEMBER "// " -#define IMAGE_ORDINAL_FLAG 0x80000000 -#define IMAGE_SNAP_BY_ORDINAL(o) ((o&IMAGE_ORDINAL_FLAG)!=0) -#define IMAGE_ORDINAL(o) (o&0xffff) #define IMAGE_RESOURCE_NAME_IS_STRING 0x80000000 #define IMAGE_RESOURCE_DATA_IS_DIRECTORY 0x80000000 #define IMAGE_DEBUG_TYPE_UNKNOWN 0 @@ -4843,6 +4840,15 @@ /* TODO: Other architectures than X86 */ #if defined(_M_IX86) +#if defined(_MSC_VER) +FORCEINLINE +VOID +MemoryBarrier (VOID) +{ + LONG Barrier; + __asm { xchg Barrier, eax } +} +#else FORCEINLINE VOID MemoryBarrier(VOID) @@ -4850,6 +4856,7 @@ LONG Barrier; __asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory"); } +#endif #elif defined (_M_AMD64) #define MemoryBarrier() #elif defined(_M_PPC)

1 0

[cgutman] 36152: - Merge aicom-network-fixes up to r36151
by cgutman＠svn.reactos.org 12 Sep '08

12 Sep '08

Author: cgutman Date: Thu Sep 11 23:08:55 2008 New Revision: 36152 URL: http://svn.reactos.org/svn/reactos?rev=36152&view=rev Log: - Merge aicom-network-fixes up to r36151 Modified: trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/lan/lan/lan.c trunk/reactos/drivers/network/ndis/ndis/config.c trunk/reactos/drivers/network/ndis/ndis/io.c trunk/reactos/drivers/network/ndis/ndis/miniport.c trunk/reactos/drivers/network/ndis/ndis/protocol.c trunk/reactos/drivers/network/ndis/ndis/stubs.c trunk/reactos/drivers/network/tcpip/datalink/lan.c Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -39,7 +39,6 @@ NTSTATUS STDCALL AfdSetContext( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { - NTSTATUS Status = STATUS_BUFFER_TOO_SMALL; PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; @@ -47,25 +46,19 @@ if( FCB->Context ) { ExFreePool( FCB->Context ); - FCB->Context = NULL; + FCB->ContextSize = 0; } - if( FCB->ContextSize < - IrpSp->Parameters.DeviceIoControl.InputBufferLength ) { - FCB->Context = - ExAllocatePool - ( PagedPool, - IrpSp->Parameters.DeviceIoControl.InputBufferLength ); + FCB->Context = ExAllocatePool( PagedPool, + IrpSp->Parameters.DeviceIoControl.InputBufferLength ); - if( !FCB->Context ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); + if( !FCB->Context ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); - RtlCopyMemory( FCB->Context, - IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, - IrpSp->Parameters.DeviceIoControl.InputBufferLength ); - Status = STATUS_SUCCESS; - } + FCB->ContextSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; - AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + RtlCopyMemory( FCB->Context, + IrpSp->Parameters.DeviceIoControl.Type3InputBuffer, + FCB->ContextSize ); - return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0, NULL ); } Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -174,8 +174,8 @@ ( NonPagedPool, HandleCount * sizeof(AFD_HANDLE) ); for( i = 0; FileObjects && i < HandleCount; i++ ) { - HandleArray[i].Status = 0; - HandleArray[i].Events = HandleArray[i].Events; + FileObjects[i].Status = 0; + FileObjects[i].Events = HandleArray[i].Events; FileObjects[i].Handle = 0; if( !HandleArray[i].Handle ) continue; if( NT_SUCCESS(Status) ) { @@ -206,6 +206,7 @@ } ExFreePool( HandleArray ); + HandleArray = NULL; } /* Returns transitioned state or SOCKET_STATE_INVALID_TRANSITION */ Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -52,6 +52,7 @@ ULONG EaLength; PWCHAR EaInfoValue = NULL; UINT Disposition, i; + NTSTATUS Status = STATUS_SUCCESS; AFD_DbgPrint(MID_TRACE, ("AfdCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp)); @@ -140,16 +141,27 @@ AFD_DbgPrint(MID_TRACE,("Packet oriented socket\n")); /* Allocate our backup buffer */ FCB->Recv.Window = ExAllocatePool( NonPagedPool, FCB->Recv.Size ); + if( !FCB->Recv.Window ) Status = STATUS_NO_MEMORY; FCB->Send.Window = ExAllocatePool( NonPagedPool, FCB->Send.Size ); + if( !FCB->Send.Window ) { + if( FCB->Recv.Window ) ExFreePool( FCB->Recv.Window ); + Status = STATUS_NO_MEMORY; + } /* A datagram socket is always sendable */ FCB->PollState |= AFD_EVENT_SEND; PollReeval( FCB->DeviceExt, FCB->FileObject ); } - Irp->IoStatus.Status = STATUS_SUCCESS; + if( !NT_SUCCESS(Status) ) { + if( FCB->TdiDeviceName.Buffer ) ExFreePool( FCB->TdiDeviceName.Buffer ); + ExFreePool( FCB ); + FileObject->FsContext = NULL; + } + + Irp->IoStatus.Status = Status; IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - return STATUS_SUCCESS; + return Status; } VOID DestroySocket( PAFD_FCB FCB ) { Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -642,6 +642,7 @@ AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; PollReeval( FCB->DeviceExt, FCB->FileObject ); + UnlockBuffers( RecvReq->BufferArray, RecvReq->BufferCount, TRUE ); return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } else { PollReeval( FCB->DeviceExt, FCB->FileObject ); Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -311,7 +311,7 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); - return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, + return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); } Modified: trunk/reactos/drivers/network/lan/lan/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/lan/lan/la… ============================================================================== --- trunk/reactos/drivers/network/lan/lan/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/lan/lan/lan.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -349,7 +349,10 @@ /* Get a transfer data packet */ KeAcquireSpinLockAtDpcLevel(&Adapter->Lock); NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, Adapter->MTU ); - if( NdisStatus != NDIS_STATUS_SUCCESS ) return NDIS_STATUS_NOT_ACCEPTED; + if( NdisStatus != NDIS_STATUS_SUCCESS ) { + KeReleaseSpinLockFromDpcLevel(&Adapter->Lock); + return NDIS_STATUS_NOT_ACCEPTED; + } LA_DbgPrint(DEBUG_DATALINK, ("pretransfer LookaheadBufferSize %d packsize %d\n",LookaheadBufferSize,PacketSize)); { UINT temp; Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -283,6 +283,7 @@ if(!ConfigurationContext) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ZwClose(KeyHandle); *ConfigurationHandle = NULL; *Status = NDIS_STATUS_FAILURE; return; @@ -849,6 +850,7 @@ if(!ConfigurationContext) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ZwClose(RegKeyHandle); *Status = NDIS_STATUS_FAILURE; return; } @@ -907,6 +909,7 @@ if(!ConfigurationContext) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); + ZwClose(RegKeyHandle); *Status = NDIS_STATUS_FAILURE; return; } Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -407,6 +407,7 @@ if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("IoAllocateAdapterChannel failed: 0x%x\n", NtStatus)); + ExFreePool(Adapter->MapRegisters); return NDIS_STATUS_RESOURCES; } @@ -417,6 +418,7 @@ if(!NT_SUCCESS(NtStatus)) { NDIS_DbgPrint(MIN_TRACE, ("KeWaitForSingleObject failed: 0x%x\n", NtStatus)); + ExFreePool(Adapter->MapRegisters); return NDIS_STATUS_RESOURCES; } Modified: trunk/reactos/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -314,15 +314,18 @@ IN NDIS_STATUS Status) { PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( MacBlock->Binding->ProtocolBindingContext, Request, Status); } + KeLowerIrql(OldIrql); } VOID NTAPI @@ -340,15 +343,18 @@ */ { PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[0]; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeLowerIrql(OldIrql); } @@ -370,15 +376,18 @@ IN UINT BytesTransferred) { PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[0]; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeLowerIrql(OldIrql); } @@ -548,10 +557,12 @@ { NDIS_STATUS NdisStatus; ULONG BytesNeeded; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); /* call the miniport's queryinfo handler */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.QueryInformationHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, Oid, @@ -559,6 +570,7 @@ Size, BytesWritten, &BytesNeeded); + KeLowerIrql(OldIrql); /* FIXME: Wait in pending case! */ @@ -678,14 +690,17 @@ * Status of operation */ { + NDIS_STATUS Status; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); Adapter->MediaRequest = NdisRequest; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: - return (*Adapter->DriverHandle->MiniportCharacteristics.QueryInformationHandler)( + Status = (*Adapter->DriverHandle->MiniportCharacteristics.QueryInformationHandler)( Adapter->MiniportAdapterContext, NdisRequest->DATA.QUERY_INFORMATION.Oid, NdisRequest->DATA.QUERY_INFORMATION.InformationBuffer, @@ -695,7 +710,7 @@ break; case NdisRequestSetInformation: - return (*Adapter->DriverHandle->MiniportCharacteristics.SetInformationHandler)( + Status = (*Adapter->DriverHandle->MiniportCharacteristics.SetInformationHandler)( Adapter->MiniportAdapterContext, NdisRequest->DATA.SET_INFORMATION.Oid, NdisRequest->DATA.SET_INFORMATION.InformationBuffer, @@ -705,8 +720,11 @@ break; default: - return NDIS_STATUS_FAILURE; - } + Status = NDIS_STATUS_FAILURE; + } + + KeLowerIrql(OldIrql); + return Status; } @@ -722,9 +740,12 @@ { PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + KIRQL OldIrql; ASSERT(MiniportBlock); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( MiniportBlock->QueryCompleteHandler ) (MiniportBlock->QueryCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); } @@ -746,8 +767,11 @@ PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(DeferredContext); + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); NdisStatus = MiniDequeueWorkItem @@ -845,6 +869,8 @@ break; } } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); } @@ -1281,6 +1307,7 @@ if (!NT_SUCCESS(Status)) { NDIS_DbgPrint(MIN_TRACE,("failed to open adapter-specific reg key\n")); + ExInterlockedRemoveEntryList( &Adapter->ListEntry, &AdapterListLock ); return Status; } @@ -1909,7 +1936,10 @@ IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status) { + KIRQL OldIrql; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->SetCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); } Modified: trunk/reactos/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -238,7 +238,6 @@ */ NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n")); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &SpinOldIrql); - { /* * if the miniport is marked as busy, we queue the packet as a work item, * else we send the packet directly to the miniport. Sending to the miniport @@ -251,8 +250,6 @@ NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to busy\n")); Adapter->MiniportBusy = TRUE; } - } - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); /* * Test the packet to see if it is a MAC loopback. @@ -269,8 +266,11 @@ if (QueueWorkItem) { MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, (PVOID)Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); return NDIS_STATUS_PENDING; } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); KeRaiseIrql(DISPATCH_LEVEL, &RaiseOldIrql); { @@ -306,11 +306,14 @@ if (QueueWorkItem) { MiniQueueWorkItem(Adapter, NdisWorkItemSend, (PVOID)Packet); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); NDIS_DbgPrint(MAX_TRACE, ("Queued a work item and returning\n")); return NDIS_STATUS_PENDING; } ASSERT(Adapter->NdisMiniportBlock.DriverHandle); + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, SpinOldIrql); /* * Call the appropriate send handler Modified: trunk/reactos/drivers/network/ndis/ndis/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/stubs.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -301,7 +301,10 @@ memmove ( FullFileName.Buffer, NDIS_FILE_FOLDER, FullFileName.Length ); *Status = RtlAppendUnicodeStringToString ( &FullFileName, FileName ); if ( !NT_SUCCESS(*Status) ) + { + *Status = NDIS_STATUS_FAILURE; goto cleanup; + } InitializeObjectAttributes ( &ObjectAttributes, &FullFileName, @@ -321,6 +324,11 @@ FILE_SYNCHRONOUS_IO_NONALERT, // ULONG CreateOptions 0, // PVOID EaBuffer 0 ); // ULONG EaLength + + if ( !NT_SUCCESS(*Status) ) + { + *Status = NDIS_STATUS_FAILURE; + } cleanup: if ( FullFileName.Buffer != NULL ) Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Thu Sep 11 23:08:55 2008 @@ -595,7 +595,6 @@ PETH_HEADER EHeader; PCHAR Data; UINT Size; - KIRQL OldIrql; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)Context; TI_DbgPrint(DEBUG_DATALINK, @@ -673,13 +672,11 @@ ((PCHAR)LinkAddress)[5] & 0xff)); } - TcpipAcquireSpinLock( &Adapter->Lock, &OldIrql ); TI_DbgPrint(MID_TRACE, ("NdisSend\n")); NdisSend(&NdisStatus, Adapter->NdisHandle, NdisPacket); TI_DbgPrint(MID_TRACE, ("NdisSend %s\n", NdisStatus == NDIS_STATUS_PENDING ? "Pending" : "Complete")); - TcpipReleaseSpinLock( &Adapter->Lock, OldIrql ); /* I had a talk with vizzini: these really ought to be here. * we're supposed to see these completed by ndis *only* when @@ -861,6 +858,11 @@ ExFreePool( Kbio ); KbioLength = ResultLength; Kbio = ExAllocatePool( NonPagedPool, KbioLength ); + if( !Kbio ) { + TI_DbgPrint(DEBUG_DATALINK,("Failed to allocate memory\n")); + NtClose( EnumKey ); + return STATUS_NO_MEMORY; + } Status = ZwEnumerateKey( EnumKey, i, KeyBasicInformation, Kbio, KbioLength, &ResultLength ); @@ -1262,7 +1264,7 @@ FreeAdapter(Adapter); - return NDIS_STATUS_SUCCESS; + return NdisStatus; }

1 0

[cgutman] 36151: - Revert r36141 and r36102 - They cause a strange mIRC crash
by cgutman＠svn.reactos.org 12 Sep '08

12 Sep '08

Author: cgutman Date: Thu Sep 11 22:53:09 2008 New Revision: 36151 URL: http://svn.reactos.org/svn/reactos?rev=36151&view=rev Log: - Revert r36141 and r36102 - They cause a strange mIRC crash Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/select.c [iso-8859-1] Thu Sep 11 22:53:09 2008 @@ -57,9 +57,7 @@ PAFD_ACTIVE_POLL Poll OPTIONAL, PIRP _Irp OPTIONAL, PAFD_POLL_INFO PollReq, - NTSTATUS Status, - KSPIN_LOCK Lock, - KIRQL OldIrql + NTSTATUS Status ) { UINT i; @@ -89,9 +87,7 @@ UnlockHandles( AFD_HANDLES(PollReq), PollReq->HandleCount ); if( Irp->MdlAddress ) UnlockRequest( Irp, IoGetCurrentIrpStackLocation( Irp ) ); AFD_DbgPrint(MID_TRACE,("Completing\n")); - KeReleaseSpinLock(&Lock, OldIrql); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); - KeAcquireSpinLock(&Lock, &OldIrql); AFD_DbgPrint(MID_TRACE,("Done\n")); } @@ -114,7 +110,7 @@ ZeroEvents( PollReq->Handles, PollReq->HandleCount ); KeAcquireSpinLock( &DeviceExt->Lock, &OldIrql ); - SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT, DeviceExt->Lock, OldIrql ); + SignalSocket( Poll, NULL, PollReq, STATUS_TIMEOUT ); KeReleaseSpinLock( &DeviceExt->Lock, OldIrql ); AFD_DbgPrint(MID_TRACE,("Timeout\n")); @@ -149,7 +145,7 @@ if( (PVOID)HandleArray[i].Handle == FileObject && (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { ZeroEvents( PollReq->Handles, PollReq->HandleCount ); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS, DeviceExt->Lock, OldIrql ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); } } } @@ -233,7 +229,7 @@ if( Signalled ) { Status = STATUS_SUCCESS; Irp->IoStatus.Status = Status; - SignalSocket( NULL, Irp, PollReq, Status, DeviceExt->Lock, OldIrql ); + SignalSocket( NULL, Irp, PollReq, Status ); } else { PAFD_ACTIVE_POLL Poll = NULL; @@ -387,7 +383,6 @@ KIRQL OldIrql; PAFD_POLL_INFO PollReq; PKEVENT EventSelect = NULL; - PIRP Irp; AFD_DbgPrint(MID_TRACE,("Called: DeviceExt %x FileObject %x\n", DeviceExt, FileObject)); @@ -417,14 +412,13 @@ while( ThePollEnt != &DeviceExt->Polls ) { Poll = CONTAINING_RECORD( ThePollEnt, AFD_ACTIVE_POLL, ListEntry ); - Irp = Poll->Irp; - PollReq = Irp->AssociatedIrp.SystemBuffer; + PollReq = Poll->Irp->AssociatedIrp.SystemBuffer; AFD_DbgPrint(MID_TRACE,("Checking poll %x\n", Poll)); if( UpdatePollWithFCB( Poll, FileObject ) ) { ThePollEnt = ThePollEnt->Flink; AFD_DbgPrint(MID_TRACE,("Signalling socket\n")); - SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS, DeviceExt->Lock, OldIrql ); + SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); } else ThePollEnt = ThePollEnt->Flink; }

1 0

[cgutman] 36150: - We must call MiniDequeueWorkItem while holding a spin lock
by cgutman＠svn.reactos.org 12 Sep '08

12 Sep '08

Author: cgutman Date: Thu Sep 11 22:06:31 2008 New Revision: 36150 URL: http://svn.reactos.org/svn/reactos?rev=36150&view=rev Log: - We must call MiniDequeueWorkItem while holding a spin lock Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Sep 11 22:06:31 2008 @@ -767,8 +767,11 @@ PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; PLOGICAL_ADAPTER Adapter = GET_LOGICAL_ADAPTER(DeferredContext); + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); NdisStatus = MiniDequeueWorkItem @@ -866,6 +869,8 @@ break; } } + + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); }

1 0

[cgutman] 36149: - Call ProtocolRequestComplete at the correct IRQL - Call ProtocolSendComplete at the correct IRQL
by cgutman＠svn.reactos.org 12 Sep '08

12 Sep '08

Author: cgutman Date: Thu Sep 11 21:58:08 2008 New Revision: 36149 URL: http://svn.reactos.org/svn/reactos?rev=36149&view=rev Log: - Call ProtocolRequestComplete at the correct IRQL - Call ProtocolSendComplete at the correct IRQL Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Sep 11 21:58:08 2008 @@ -314,15 +314,18 @@ IN NDIS_STATUS Status) { PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( MacBlock->Binding->RequestCompleteHandler ) { (*MacBlock->Binding->RequestCompleteHandler)( MacBlock->Binding->ProtocolBindingContext, Request, Status); } + KeLowerIrql(OldIrql); } VOID NTAPI @@ -340,15 +343,18 @@ */ { PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[0]; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeLowerIrql(OldIrql); } @@ -370,15 +376,18 @@ IN UINT BytesTransferred) { PADAPTER_BINDING AdapterBinding; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[0]; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); + KeLowerIrql(OldIrql); }

1 0

[cgutman] 36148: - Set Status to STATUS_SUCCESS
by cgutman＠svn.reactos.org 12 Sep '08

12 Sep '08

Author: cgutman Date: Thu Sep 11 21:43:05 2008 New Revision: 36148 URL: http://svn.reactos.org/svn/reactos?rev=36148&view=rev Log: - Set Status to STATUS_SUCCESS Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Thu Sep 11 21:43:05 2008 @@ -52,7 +52,7 @@ ULONG EaLength; PWCHAR EaInfoValue = NULL; UINT Disposition, i; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; AFD_DbgPrint(MID_TRACE, ("AfdCreate(DeviceObject %p Irp %p)\n", DeviceObject, Irp));

1 0

[cgutman] 36147: - Call MiniportQueryInformation at the correct IRQL - Call MiniportSetInformation at the correct IRQL - Call QueryInformationComplete at the correct IRQL - Call SetInformationComplete at the correct IRQL - All IRQLs verified by MSDN
by cgutman＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cgutman Date: Thu Sep 11 15:57:51 2008 New Revision: 36147 URL: http://svn.reactos.org/svn/reactos?rev=36147&view=rev Log: - Call MiniportQueryInformation at the correct IRQL - Call MiniportSetInformation at the correct IRQL - Call QueryInformationComplete at the correct IRQL - Call SetInformationComplete at the correct IRQL - All IRQLs verified by MSDN Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c Modified: branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Thu Sep 11 15:57:51 2008 @@ -548,10 +548,12 @@ { NDIS_STATUS NdisStatus; ULONG BytesNeeded; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); /* call the miniport's queryinfo handler */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.QueryInformationHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, Oid, @@ -559,6 +561,7 @@ Size, BytesWritten, &BytesNeeded); + KeLowerIrql(OldIrql); /* FIXME: Wait in pending case! */ @@ -678,14 +681,17 @@ * Status of operation */ { + NDIS_STATUS Status; + KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); Adapter->MediaRequest = NdisRequest; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); switch (NdisRequest->RequestType) { case NdisRequestQueryInformation: - return (*Adapter->DriverHandle->MiniportCharacteristics.QueryInformationHandler)( + Status = (*Adapter->DriverHandle->MiniportCharacteristics.QueryInformationHandler)( Adapter->MiniportAdapterContext, NdisRequest->DATA.QUERY_INFORMATION.Oid, NdisRequest->DATA.QUERY_INFORMATION.InformationBuffer, @@ -695,7 +701,7 @@ break; case NdisRequestSetInformation: - return (*Adapter->DriverHandle->MiniportCharacteristics.SetInformationHandler)( + Status = (*Adapter->DriverHandle->MiniportCharacteristics.SetInformationHandler)( Adapter->MiniportAdapterContext, NdisRequest->DATA.SET_INFORMATION.Oid, NdisRequest->DATA.SET_INFORMATION.InformationBuffer, @@ -705,8 +711,11 @@ break; default: - return NDIS_STATUS_FAILURE; - } + Status = NDIS_STATUS_FAILURE; + } + + KeLowerIrql(OldIrql); + return Status; } @@ -722,9 +731,12 @@ { PNDIS_MINIPORT_BLOCK MiniportBlock = (PNDIS_MINIPORT_BLOCK)MiniportAdapterHandle; + KIRQL OldIrql; ASSERT(MiniportBlock); + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); if( MiniportBlock->QueryCompleteHandler ) (MiniportBlock->QueryCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); } @@ -1910,7 +1922,10 @@ IN NDIS_HANDLE MiniportAdapterHandle, IN NDIS_STATUS Status) { + KIRQL OldIrql; + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*((PNDIS_MINIPORT_BLOCK)(MiniportAdapterHandle))->SetCompleteHandler)(MiniportAdapterHandle, Status); + KeLowerIrql(OldIrql); }

1 0

[sserapion] 36146: Stop annoying warning.
by sserapion＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: sserapion Date: Thu Sep 11 15:19:23 2008 New Revision: 36146 URL: http://svn.reactos.org/svn/reactos?rev=36146&view=rev Log: Stop annoying warning. Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/pciidex/pciidex.rbuild Modified: branches/ros-amd64-bringup/reactos/drivers/storage/ide/pciidex/pciidex.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/storage/ide/pciidex/pciidex.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/storage/ide/pciidex/pciidex.rbuild [iso-8859-1] Thu Sep 11 15:19:23 2008 @@ -3,7 +3,6 @@ <module name="pciidex" type="kernelmodedriver" installbase="system32/drivers" installname="pciidex.sys"> <importlibrary definition="pciidex.spec.def" /> <library>ntoskrnl</library> - <file>pciidex.spec</file> <file>fdo.c</file> <file>miniport.c</file> <file>misc.c</file>

1 0

[cfinck] 36145: - Import some language files from the Web server (they were just copied from the english ones to enable the translation) - Add Hebrew to the list of supported languages. It's already selectable in the online language list for quite some time now, but due to this bug, it always switched back to English :-/ This is all still a big mess....
by cfinck＠svn.reactos.org 11 Sep '08

11 Sep '08

Author: cfinck Date: Thu Sep 11 15:15:20 2008 New Revision: 36145 URL: http://svn.reactos.org/svn/reactos?rev=36145&view=rev Log: - Import some language files from the Web server (they were just copied from the english ones to enable the translation) - Add Hebrew to the list of supported languages. It's already selectable in the online language list for quite some time now, but due to this bug, it always switched back to English :-/ This is all still a big mess.... Added: trunk/web/reactos.org/htdocs/roscms/inc/lang/cz.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/he.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/sk.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/tw.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php trunk/web/reactos.org/htdocs/roscms/inc/lang/uk.php - copied unchanged from r34825, trunk/web/reactos.org/htdocs/roscms/inc/lang/en.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php trunk/web/reactos.org/htdocs/roscms/lang.php Modified: trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/inc/… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/inc/lang/bg.php [iso-8859-1] Thu Sep 11 15:15:20 2008 @@ -26,163 +26,163 @@ // Language settings $roscms_langres['charset'] = 'utf-8'; -//$roscms_langres['charset'] = 'cp1251'; -$roscms_langres['lang_code'] = 'BG'; +//$roscms_langres['charset'] = 'iso-8859-1'; +$roscms_langres['lang_code'] = 'EN'; // main menu -$roscms_langres['Navigation'] = 'ÐÐ°ÑÐ¾ÐºÐ°'; -$roscms_langres['Home'] = 'ÐÐ°ÑÐ°Ð»Ð¾'; -$roscms_langres['Dev'] = 'Ð Ð°Ð·ÑÐ°Ð±Ð¾ÑÐºÐ°'; -$roscms_langres['Community'] = 'ÐÐ±ÑÐµÑÑÐ²Ð¾'; -$roscms_langres['Support'] = 'ÐÐ¾Ð´ÑÑÐ¶ÐºÐ°'; -$roscms_langres['myReactOS'] = 'ÐÐ¾ÑÑ Ð ÐµÐ°ÐºÑÐÐ¡'; -$roscms_langres['Info'] = 'Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ'; +$roscms_langres['Navigation'] = 'Navigation'; +$roscms_langres['Home'] = 'Home'; +$roscms_langres['Dev'] = 'Development'; +$roscms_langres['Community'] = 'Community'; +$roscms_langres['Support'] = 'Support'; +$roscms_langres['myReactOS'] = 'myReactOS'; +$roscms_langres['Info'] = 'Info'; // Login bar: -$roscms_langres['Account'] = 'Ð¡Ð¼ÐµÑÐºÐ°'; -$roscms_langres['Login'] = 'ÐÑÐ¾Ð´'; -$roscms_langres['Logout'] = 'ÐÐ·ÑÐ¾Ð´'; -$roscms_langres['Global_Login_System'] = 'ÐÑÐµÐ¾Ð±ÑÐ° Ð²ÑÐ¾Ð´Ð½Ð° ÑÑÐµÐ´Ð±Ð°'; -$roscms_langres['Register_Account'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¼ÐµÑÐºÐ°'; -$roscms_langres['Login_Nick'] = ' ÐÑÐ¾Ð·Ð²Ð¸ÑÐµ: '; -$roscms_langres['LoginPwd'] = ' ÐÐ°ÑÐ¾Ð»Ð°: '; +$roscms_langres['Account'] = 'Account'; +$roscms_langres['Login'] = 'Login'; +$roscms_langres['Logout'] = 'Logout'; +$roscms_langres['Global_Login_System'] = 'Global Login System'; +$roscms_langres['Register_Account'] = 'Register Account'; +$roscms_langres['Login_Nick'] = ' Nick: '; +$roscms_langres['LoginPwd'] = ' Pwd: '; // myReactOS menu -$roscms_langres['User_Profil_Overview'] = 'ÐÐ±Ð·Ð¾Ñ Ð½Ð° Ð¾ÑÐµÑÐºÐ° Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ'; -$roscms_langres['User_Profil'] = 'ÐÑÐµÑÐº Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ'; -$roscms_langres['Overview'] = 'ÐÐ±Ð·Ð¾Ñ'; -$roscms_langres['Login_System'] = 'ÐÑÐ¾Ð´Ð½Ð° ÑÑÐµÐ´Ð±Ð°'; -$roscms_langres['Messages'] = 'Ð¡ÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ'; -$roscms_langres['Contacts'] = 'Ð£ÐºÐ°Ð·Ð°ÑÐµÐ»'; -$roscms_langres['Favorites'] = 'ÐÑÐ±Ð¸Ð¼ÐºÐ¸'; -$roscms_langres['Documentation'] = 'ÐÐ¾ÐºÑÐ¼ÐµÐ½ÑÐ°ÑÐ¸Ñ'; -$roscms_langres['Account_Edit'] = 'ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸'; -$roscms_langres['Accountlist'] = 'Ð¡Ð¿Ð¸ÑÑÐº Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ÑÐµ'; +$roscms_langres['User_Profil_Overview'] = 'User Profile Overview'; +$roscms_langres['User_Profil'] = 'User Profile'; +$roscms_langres['Overview'] = 'Overview'; +$roscms_langres['Login_System'] = 'Login System'; +$roscms_langres['Messages'] = 'Messages'; +$roscms_langres['Contacts'] = 'Contacts'; +$roscms_langres['Favorites'] = 'Favorites'; +$roscms_langres['Documentation'] = 'Documentation'; +$roscms_langres['Account_Edit'] = 'Settings'; +$roscms_langres['Accountlist'] = 'User List'; // myReactOS Content -$roscms_langres['myReactOS_description'] = 'ÐÐ¾ÑÐµÐ½ Ð¸ ÑÐ´Ð¾Ð±ÐµÐ½ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ¼ÐµÑÐºÐ°ÑÐ° Ð²Ð¸ Ð·Ð° Ð¼ÑÑÑÐ¾ÑÐ¾ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡.'; -$roscms_langres['Account_Information'] = 'Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ Ð·Ð° ÑÐ¼ÐµÑÐºÐ°ÑÐ°'; -$roscms_langres['Account_Information_description'] = 'ÐÐ±Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ... <placeholder>'; +$roscms_langres['myReactOS_description'] = 'A powerful and easy to use interface to manage your ReactOS homepage account.'; +$roscms_langres['Account_Information'] = 'Account Information'; +$roscms_langres['Account_Information_description'] = 'A sum up of the account data ... <placeholder>'; // Right side bar: -$roscms_langres['Latest_Release'] = 'ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¾ Ð¸Ð·Ð´Ð°Ð½Ð¸Ðµ'; -$roscms_langres['myReactOS_Developer_Quotes'] = 'ÐÑÐ¼Ð¸ Ð½Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸ÑÐµ'; +$roscms_langres['Latest_Release'] = 'Latest Release'; +$roscms_langres['myReactOS_Developer_Quotes'] = 'Developer Quotes'; // Error 404 -$roscms_langres['Page_not_found'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ðµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ°'; +$roscms_langres['Page_not_found'] = 'Page not found'; // Admin/Dev/Translator Interface -$roscms_langres['Dev_Interface'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸'; -$roscms_langres['Dev_Overview'] = 'ÐÐ±Ð·Ð¾Ñ'; -$roscms_langres['Dev_Pages'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['Dev_Contents'] = 'Ð¡ÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['Dev_Help'] = 'ÐÐ¾Ð¼Ð¾Ñ'; +$roscms_langres['Dev_Interface'] = 'Dev Interface'; +$roscms_langres['Dev_Overview'] = 'Overview'; +$roscms_langres['Dev_Pages'] = 'Pages'; +$roscms_langres['Dev_Contents'] = 'Contents'; +$roscms_langres['Dev_Help'] = 'Help'; -$roscms_langres['Dev_DeveloperInterfaceOverview'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸- Ð¾Ð±Ð·Ð¾Ñ'; +$roscms_langres['Dev_DeveloperInterfaceOverview'] = 'Developer Interface - Overview'; -$roscms_langres['ContTrans_generalinfo'] = 'ÐÑÐ½Ð¾Ð²Ð½Ð¸ÑÐµ ÑÑÑÐ°Ð½Ð¸ÑÐ¸ Ð½Ð° Ð ÐµÐ°ÐºÑÐÐ¡ ÑÐµ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ñ Ð²ÐµÐ´Ð½ÑÐ¶ Ð´Ð½ÐµÐ²Ð½Ð¾. ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð²Ð¸Ð´Ð¸ÑÐµ Ð¿ÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸ÑÐµ, ÐºÐ¾Ð¸ÑÐ¾ ÑÑÐµ Ð½Ð°Ð¿ÑÐ°Ð²Ð¸Ð»Ð¸, ÑÐ»ÐµÐ´ ÐºÐ°ÑÐ¾ Ð½Ð°ÑÐ¸ÑÐ½ÐµÑÐµ "ÐÐ°Ð¿Ð¸Ñ".'; +$roscms_langres['ContTrans_generalinfo'] = 'The ReactOS main website pages get updated once a day. You will see a preview of your changes after clicking on "Save".'; -$roscms_langres['ContTrans_Interface_Content'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸- ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Contents'] = 'Ð¡ÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Interface_Pages'] = 'ÐÐ½ÑÐµÑÑÐµÐ¹Ñ Ð·Ð° ÑÐ°Ð·ÑÐ°Ð±Ð¾ÑÑÐ¸ÑÐ¸- ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Pages'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ¸'; +$roscms_langres['ContTrans_Interface_Content'] = 'Dev Interface - Content'; +$roscms_langres['ContTrans_Contents'] = 'Content'; +$roscms_langres['ContTrans_Interface_Pages'] = 'Dev Interface - Pages'; +$roscms_langres['ContTrans_Pages'] = 'Pages'; -$roscms_langres['ContTrans_Profile'] = 'ÐÑÐµÑÐº'; +$roscms_langres['ContTrans_Profile'] = 'Profile'; -$roscms_langres['ContTrans_Action'] = 'ÐÐµÐ¹ÑÑÐ²Ð¸Ðµ'; -$roscms_langres['ContTrans_NewContent'] = 'ÐÐ¾Ð²Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_NewPage'] = 'ÐÐ¾Ð²Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°'; +$roscms_langres['ContTrans_Action'] = 'Action'; +$roscms_langres['ContTrans_NewContent'] = 'New Content'; +$roscms_langres['ContTrans_NewPage'] = 'New Page'; -$roscms_langres['ContTrans_resetfilters'] = 'Ð¿ÑÐµÑÑÑÐ°Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿ÑÐµÑÑÐ²Ð°Ð½Ð¸ÐµÑÐ¾ Ð¸ Ð¿Ð¾Ð´ÑÐµÐ¶Ð´Ð°Ð½ÐµÑÐ¾'; -$roscms_langres['ContTrans_Info'] = 'Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ'; -$roscms_langres['ContTrans_ContentID'] = 'ÐÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_PageID'] = 'ÐÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_Content'] = 'Ð¡ÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Rev'] = 'ÐÐ·Ð´.'; -$roscms_langres['ContTrans_Date'] = 'ÐÐ°ÑÐ°'; -$roscms_langres['ContTrans_Time'] = 'ÐÑÐµÐ¼Ðµ'; -$roscms_langres['ContTrans_User'] = 'ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»'; -$roscms_langres['ContTrans_Language'] = 'ÐÐ·Ð¸Ðº'; -$roscms_langres['ContTrans_International'] = 'ÐÐ·ÑÐ¾Ð´ÐµÐ½ (ÐÐ½Ð³Ð»Ð¸Ð¹ÑÐºÐ¸)'; -$roscms_langres['ContTrans_All'] = 'ÐÑÐ¸ÑÐºÐ¾'; -$roscms_langres['ContTrans_Filter'] = 'ÐÑÐµÑÑÐ²Ð°Ð½Ðµ'; +$roscms_langres['ContTrans_resetfilters'] = 'reset filters & sort'; +$roscms_langres['ContTrans_Info'] = 'Info'; +$roscms_langres['ContTrans_ContentID'] = 'Content ID'; +$roscms_langres['ContTrans_PageID'] = 'Page ID'; +$roscms_langres['ContTrans_Content'] = 'Content'; +$roscms_langres['ContTrans_Rev'] = 'Rev.'; +$roscms_langres['ContTrans_Date'] = 'Date'; +$roscms_langres['ContTrans_Time'] = 'Time'; +$roscms_langres['ContTrans_User'] = 'User'; +$roscms_langres['ContTrans_Language'] = 'Language'; +$roscms_langres['ContTrans_International'] = 'Original (English)'; +$roscms_langres['ContTrans_All'] = 'All'; +$roscms_langres['ContTrans_Filter'] = 'Filter'; $roscms_langres['ContTrans_activecontent'] = 'active content'; $roscms_langres['ContTrans_activepages'] = 'active pages'; -$roscms_langres['ContTrans_allcontent'] = 'Ð¿ÑÐ»Ð½Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_allpages'] = 'ÐÑÐ¸ÑÐºÐ¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_activeandvisiblecontent'] = 'Ð´ÐµÐ¹Ð½Ð¾ Ð¸ Ð²Ð¸Ð´Ð¸Ð¼Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_currentuser'] = 'ÑÐµÐºÑÑ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»'; +$roscms_langres['ContTrans_allcontent'] = 'all content'; +$roscms_langres['ContTrans_allpages'] = 'all pages'; +$roscms_langres['ContTrans_activeandvisiblecontent'] = 'active and visible content'; +$roscms_langres['ContTrans_currentuser'] = 'current user'; -$roscms_langres['ContTrans_normalpages'] = 'Ð¾Ð±Ð¸ÐºÐ½Ð¾Ð²ÐµÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_dynamicpages'] = 'Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; +$roscms_langres['ContTrans_normalpages'] = 'normal pages'; +$roscms_langres['ContTrans_dynamicpages'] = 'dynamic pages'; -$roscms_langres['ContTrans_history'] = 'Ð´Ð½ÐµÐ²Ð½Ð¸Ðº'; -$roscms_langres['ContTrans_Sortedby'] = 'ÐÐ¾Ð´ÑÐµÐ¶Ð´Ð°Ð½Ðµ Ð¿Ð¾'; -$roscms_langres['ContTrans_contentid'] = 'Ð¾Ð¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_pageid'] = 'Ð¾Ð¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµÐ» (id) Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_date'] = 'Ð´Ð°ÑÐ°'; -$roscms_langres['ContTrans_user'] = 'Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»'; -$roscms_langres['ContTrans_active'] = 'Ð´ÐµÐµÐ½'; -$roscms_langres['ContTrans_Active'] = 'ÐÐµÐµÐ½'; -$roscms_langres['ContTrans_visible'] = 'Ð²Ð¸Ð´Ð¸Ð¼'; -$roscms_langres['ContTrans_Visible'] = 'ÐÐ¸Ð´Ð¸Ð¼'; -$roscms_langres['ContTrans_version'] = 'Ð²ÐµÑÑÐ¸Ñ'; -$roscms_langres['ContTrans_extra'] = 'Ð¾ÑÐµ'; -$roscms_langres['ContTrans_Extra'] = 'ÐÑÐµ'; -$roscms_langres['ContTrans_language'] = 'ÐµÐ·Ð¸Ðº'; -$roscms_langres['ContTrans_editor'] = 'Ð¾Ð±ÑÐ°Ð±Ð¾ÑÐ¸Ð»'; -$roscms_langres['ContTrans_Editor'] = 'ÐÐ±ÑÐ°Ð±Ð¾ÑÐ¸Ð»'; -$roscms_langres['ContTrans_Translate'] = 'ÐÑÐµÐ²Ð¾Ð´'; -$roscms_langres['ContTrans_Edit'] = 'ÐÑÐµÐ³Ð»ÐµÐ´/ ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ°'; -$roscms_langres['ContTrans_Delete'] = 'ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ'; -$roscms_langres['ContTrans_filter_history'] = 'ÐÑÐµÑÑÐ²Ð°Ð½Ðµ: Ð´Ð½ÐµÐ²Ð½Ð¸Ðº'; +$roscms_langres['ContTrans_history'] = 'history'; +$roscms_langres['ContTrans_Sortedby'] = 'Sorted by'; +$roscms_langres['ContTrans_contentid'] = 'content id'; +$roscms_langres['ContTrans_pageid'] = 'page id'; +$roscms_langres['ContTrans_date'] = 'date'; +$roscms_langres['ContTrans_user'] = 'user'; +$roscms_langres['ContTrans_active'] = 'active'; +$roscms_langres['ContTrans_Active'] = 'Active'; +$roscms_langres['ContTrans_visible'] = 'visible'; +$roscms_langres['ContTrans_Visible'] = 'Visible'; +$roscms_langres['ContTrans_version'] = 'version'; +$roscms_langres['ContTrans_extra'] = 'extra'; +$roscms_langres['ContTrans_Extra'] = 'Extra'; +$roscms_langres['ContTrans_language'] = 'language'; +$roscms_langres['ContTrans_editor'] = 'editor'; +$roscms_langres['ContTrans_Editor'] = 'Editor'; +$roscms_langres['ContTrans_Translate'] = 'Translate'; +$roscms_langres['ContTrans_Edit'] = 'View / Edit'; +$roscms_langres['ContTrans_Delete'] = 'Delete'; +$roscms_langres['ContTrans_filter_history'] = 'Filter: history'; -$roscms_langres['ContTrans_ViewEditContent'] = 'ÐÑÐµÐ³Ð»ÐµÐ´/ ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_ViewEditpage'] = 'ÐÑÐµÐ³Ð»ÐµÐ´/ ÐÐ±ÑÐ°Ð±Ð¾ÑÐºÐ° Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_SaveContent'] = 'ÐÐ°Ð¿Ð¸Ñ Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾'; -$roscms_langres['ContTrans_Type'] = 'ÐÐ¸Ð´'; -$roscms_langres['ContTrans_Description'] = 'ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ'; -$roscms_langres['ContTrans_Username'] = 'ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÐºÐ¾ Ð¸Ð¼Ðµ'; -$roscms_langres['ContTrans_egAbout'] = 'Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ "Ð·Ð°"'; -$roscms_langres['ContTrans_checklang'] = 'ÐÐ¾Ð»Ñ, Ð¿ÑÐ¾Ð²ÐµÑÐµÑÐµ Ð´Ð°Ð»Ð¸ ÑÑÐµ Ð¸Ð·Ð±ÑÐ°Ð»Ð¸ Ð¿ÑÐ°Ð²Ð¸Ð»Ð½Ð¸Ñ ÐµÐ·Ð¸Ðº, Ð¿ÑÐµÐ´Ð¸ Ð´Ð° Ð½Ð°ÑÐ¸ÑÐ½ÐµÑÐµ "ÐÐ¾Ð´Ð°Ð²Ð°Ð½Ðµ"!'; -$roscms_langres['ContTrans_SAVE'] = '<b>ÐÐ°Ð¿Ð¸Ñ</b> (Ð½Ð¾Ð²Ð¾ ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ Ð¸ Ð½Ð¾Ð²Ð¾ Ð¿Ð¾Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ Ð² Ð±Ð°Ð·Ð°ÑÐ° Ð¾Ñ Ð´Ð°Ð½Ð½Ð¸)'; -$roscms_langres['ContTrans_UPDATE'] = '<b>ÐÐ±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ</b> (Ð·Ð°Ð¼ÐµÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐµÐ³Ð°ÑÐ½Ð¾ÑÐ¾ Ð¿Ð¾Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ)'; -$roscms_langres['ContTrans_Save1'] = 'ÐÐ°Ð¿Ð¸ÑÐ°Ð½Ð° Ðµ Ð½Ð¾Ð²Ð° Ð²ÐµÑÑÐ¸Ñ'; -$roscms_langres['ContTrans_Save2'] = 'Ð½Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸ÐµÑÐ¾!'; -$roscms_langres['ContTrans_Save3'] = 'ÐÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ° \'content edit\' '; -$roscms_langres['ContTrans_Save4'] = 'ÐÐ±ÑÐ°ÑÐ½Ð¾ Ð´Ð¾ ÑÑÑÐ°Ð½Ð¸ÑÐ° \'content edit\' '; -$roscms_langres['ContTrans_Save5'] = 'Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_Save6'] = 'ÐÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° (Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑÐ½Ð° Ð²ÐµÑÑÐ¸Ñ; Ð½Ð¾Ð² Ð¿ÑÐ¾Ð·Ð¾ÑÐµÑ)'; -$roscms_langres['ContTrans_Save7'] = 'ÐÐ±ÑÐ°ÑÐ½Ð¾ Ð´Ð¾ ÑÑÑÐ°Ð½Ð¸ÑÐ° \'page edit\' '; +$roscms_langres['ContTrans_ViewEditContent'] = 'View / Edit content'; +$roscms_langres['ContTrans_ViewEditpage'] = 'View / Edit page'; +$roscms_langres['ContTrans_SaveContent'] = 'Save content'; +$roscms_langres['ContTrans_Type'] = 'Type'; +$roscms_langres['ContTrans_Description'] = 'Description'; +$roscms_langres['ContTrans_Username'] = 'Username'; +$roscms_langres['ContTrans_egAbout'] = 'e.g. "about"'; +$roscms_langres['ContTrans_checklang'] = 'Please check, if you have selected the right language, before you click "submit"!'; +$roscms_langres['ContTrans_SAVE'] = '<b>Save</b> (new version and new db entry)'; +$roscms_langres['ContTrans_UPDATE'] = '<b>Update</b> (overwrite the current entry)'; +$roscms_langres['ContTrans_Save1'] = 'A new version of content'; +$roscms_langres['ContTrans_Save2'] = 'has been saved!'; +$roscms_langres['ContTrans_Save3'] = 'Go to the \'content edit\' page'; +$roscms_langres['ContTrans_Save4'] = 'Back to the \'content edit\' page'; +$roscms_langres['ContTrans_Save5'] = 'The page'; +$roscms_langres['ContTrans_Save6'] = 'View the page (dynamic version; new window)'; +$roscms_langres['ContTrans_Save7'] = 'Back to the \'page edit\' page'; -$roscms_langres['ContTrans_Preview'] = 'ÐÑÐµÐ³Ð»ÐµÐ´'; -$roscms_langres['ContTrans_PageTitle'] = 'ÐÐ°Ð³Ð»Ð°Ð²Ð¸Ðµ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ°'; -$roscms_langres['ContTrans_Extention'] = 'Ð Ð°Ð·ÑÐ¸ÑÐµÐ½Ð¸Ðµ'; +$roscms_langres['ContTrans_Preview'] = 'Preview'; +$roscms_langres['ContTrans_PageTitle'] = 'Page Title'; +$roscms_langres['ContTrans_Extention'] = 'Extention'; -$roscms_langres['ContTrans_DevPageGenerator'] = 'Ð Ð°Ð·Ð²Ð¾ÐµÐ½ Ð¸Ð½ÑÐµÑÑÐµÐ¹Ñ - Ð¡ÑÐ·Ð´Ð°ÑÐµÐ» Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['Dev_PageGenerator'] = 'Ð¡ÑÐ·Ð´Ð°ÑÐµÐ» Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['Dev_PageGeneratorOverview'] = 'ÐÐ±Ð·Ð¾Ñ Ð½Ð° ÑÑÐ·Ð´Ð°ÑÐµÐ»Ñ Ð½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Change'] = 'ÐÑÐ¾Ð¼ÑÐ½Ð°'; -$roscms_langres['ContTrans_LatestGen'] = 'ÐÐ¾ÑÐ»ÐµÐ´Ð½Ð¾ ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ'; -$roscms_langres['ContTrans_UserGen'] = 'ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ» (ÑÑÐ·Ð´Ð°ÑÐµÐ»)'; +$roscms_langres['ContTrans_DevPageGenerator'] = 'Developer Interface - Page Generator'; +$roscms_langres['Dev_PageGenerator'] = 'Page Generator'; +$roscms_langres['Dev_PageGeneratorOverview'] = 'Page Generator Overview'; +$roscms_langres['ContTrans_Change'] = 'Change'; +$roscms_langres['ContTrans_LatestGen'] = 'Latest Gen.'; +$roscms_langres['ContTrans_UserGen'] = 'User (Generator)'; -$roscms_langres['ContTrans_Gen_desc'] = 'Ð¡ÑÐ·Ð´Ð°ÑÐµÐ»ÑÑ Ð½Ð° ÑÑÐ°ÑÐ¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð²ÐµÐ´Ðµ ÑÑÑÐ°Ð½Ð¸ÑÐ¸ÑÐµ Ð²ÑÐ² ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð¸Ð»Ð¸ Ð² Ð¾Ð±Ð·Ð¾ÑÐ½Ð¸ÐºÐ°.'; -$roscms_langres['ContTrans_Gen_menu1'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ ÐÐÐÐÐÐÐÐ ÑÑÐ°ÑÐ¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Gen_menu2'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð²ÑÐ¸ÑÐºÐ¸ ÑÑÐ°ÑÐ¸ÑÐ½Ð¸ ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; -$roscms_langres['ContTrans_Gen_menu3'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ/ Ð¿ÑÐµÐ³Ð»ÐµÐ´ Ð½Ð° Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð° ÑÑÐ°ÑÐ¸ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°'; -$roscms_langres['ContTrans_Gen_menu4'] = 'ÐÑÐµÐ³Ð»ÐµÐ´ (Ð´Ð¸Ð½Ð°Ð¼Ð¸ÑÐ½Ð¾ Ð¾Ñ Ð±Ð°Ð·Ð°ÑÐ° Ð¾Ñ Ð´Ð°Ð½Ð½Ð¸)'; -$roscms_langres['ContTrans_Gen_menu3_desc'] = 'Ð¡ÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° ÐµÐ´Ð½Ð° ÑÑÐ°ÑÐ¸ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°; Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð°ÐºÐ¾ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¾Ð±Ð½Ð¾Ð²ÐµÑÐµ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°'; -$roscms_langres['ContTrans_allactivepages'] = 'Ð²ÑÐ¸ÑÐºÐ¸ (Ð´ÐµÐ¹Ð½Ð¸) ÑÑÑÐ°Ð½Ð¸ÑÐ¸'; +$roscms_langres['ContTrans_Gen_desc'] = 'The static page generator can output the pages to files or to the browser.'; +$roscms_langres['ContTrans_Gen_menu1'] = 'Generate all UPDATED static pages'; +$roscms_langres['ContTrans_Gen_menu2'] = 'Generate all static pages'; +$roscms_langres['ContTrans_Gen_menu3'] = 'Generate/view a specific static page'; +$roscms_langres['ContTrans_Gen_menu4'] = 'View page (dynamic from database)'; +$roscms_langres['ContTrans_Gen_menu3_desc'] = 'Generate one static page; e.g. if you want to update one specific page'; +$roscms_langres['ContTrans_allactivepages'] = 'all (active) pages'; -$roscms_langres['ContTrans_yes'] = 'Ð´Ð°'; -$roscms_langres['ContTrans_no'] = 'Ð½Ðµ'; +$roscms_langres['ContTrans_yes'] = 'yes'; +$roscms_langres['ContTrans_no'] = 'no'; ?> Modified: trunk/web/reactos.org/htdocs/roscms/lang.php URL: http://svn.reactos.org/svn/reactos/trunk/web/reactos.org/htdocs/roscms/lang… ============================================================================== --- trunk/web/reactos.org/htdocs/roscms/lang.php [iso-8859-1] (original) +++ trunk/web/reactos.org/htdocs/roscms/lang.php [iso-8859-1] Thu Sep 11 15:15:20 2008 @@ -6,24 +6,37 @@ if (preg_match('/^([a-zA-Z]+)(-[a-zA-Z]+)?$/', $lang, $matches)) { $checked_lang = strtolower($matches[1]); switch($checked_lang) { - case 'de': - case 'en': - case 'fr': - case 'ru': - case 'es': - case 'it': - case 'hu': - case 'sv': - case 'lt': - case 'nl': - case 'pl': - case 'no': - case 'da': - case 'id': - case 'zh': - break; - default: - $checked_lang = ''; + case 'ar': + case 'bg': + case 'ca': + case 'cz': + case 'da': + case 'de': + case 'el': + case 'en': + case 'es': + case 'fr': + case 'he': + case 'hu': + case 'id': + case 'it': + case 'ja': + case 'ko': + case 'lt': + case 'nl': + case 'no': + case 'pl': + case 'pt': + case 'ru': + case 'sv': + case 'uk': + case 'zh': + case 'ro': + case 'tw': + case 'sk': + break; + default: + $checked_lang = ''; } } else if ($lang == '*') { @@ -48,7 +61,12 @@ /* After parameter and cookie processing, we still don't have a valid language. So check whether the HTTP Accept-language header can help us. */ - $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; + if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { + $accept_language = $_SERVER['HTTP_ACCEPT_LANGUAGE']; + } + else { + $accept_language = "en"; + } $best_q = 0; while (preg_match('/^\s*([^,]+)((,(.*))|$)/', $accept_language, $matches)) { @@ -81,7 +99,6 @@ $roscms_page_lang = $rpm_lang . '/'; $rpm_lang_session = $rpm_lang . '/'; - if (isset($_COOKIE['roscms_usrset_lang']) || isset($_REQUEST['lang'])) { /* Delete an existing cookie (if any) which uses the full hostname */ setcookie('roscms_usrset_lang', '', -3600); @@ -91,6 +108,7 @@ '/', cookie_domain()); } + //echo "<h1>".$rpm_lang."</h1>"; require("inc/lang/en.php"); // preload the english language text require("inc/lang/".$rpm_lang.".php"); // load the and overwrite the language text

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs