Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[fireball] 25494: Delete 100 files which are completely unneeded in order to statically compile expat library (full source code is located in the vendor branch).
by fireball＠svn.reactos.org 17 Jan '07

17 Jan '07

Author: fireball Date: Wed Jan 17 15:42:43 2007 New Revision: 25494 URL: http://svn.reactos.org/svn/reactos?rev=25494&view=rev Log: Delete 100 files which are completely unneeded in order to statically compile expat library (full source code is located in the vendor branch). Removed: trunk/reactos/lib/3rdparty/expat/Changes trunk/reactos/lib/3rdparty/expat/MANIFEST trunk/reactos/lib/3rdparty/expat/bcb5/ trunk/reactos/lib/3rdparty/expat/buildconf.sh trunk/reactos/lib/3rdparty/expat/configure.in trunk/reactos/lib/3rdparty/expat/conftools/ trunk/reactos/lib/3rdparty/expat/doc/ trunk/reactos/lib/3rdparty/expat/examples/ trunk/reactos/lib/3rdparty/expat/gennmtab/ trunk/reactos/lib/3rdparty/expat/make-release.sh trunk/reactos/lib/3rdparty/expat/tests/ trunk/reactos/lib/3rdparty/expat/vms/ trunk/reactos/lib/3rdparty/expat/win32/ trunk/reactos/lib/3rdparty/expat/xmlwf/ Removed: trunk/reactos/lib/3rdparty/expat/Changes URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/expat/Changes… ============================================================================== --- trunk/reactos/lib/3rdparty/expat/Changes (original) +++ trunk/reactos/lib/3rdparty/expat/Changes (removed) @@ -1,148 +1,0 @@ -Release 2.0.0 Wed Jan 11 2006 - - We no longer use the "check" library for C unit testing; we - always use the (partial) internal implementation of the API. - - Report XML_NS setting via XML_GetFeatureList(). - - Fixed headers for use from C++. - - XML_GetCurrentLineNumber() and XML_GetCurrentColumnNumber() - now return unsigned integers. - - Added XML_LARGE_SIZE switch to enable 64-bit integers for - byte indexes and line/column numbers. - - Updated to use libtool 1.5.22 (the most recent). - - Added support for AmigaOS. - - Some mostly minor bug fixes. SF issues include: 1006708, - 1021776, 1023646, 1114960, 1156398, 1221160, 1271642. - -Release 1.95.8 Fri Jul 23 2004 - - Major new feature: suspend/resume. Handlers can now request - that a parse be suspended for later resumption or aborted - altogether. See "Temporarily Stopping Parsing" in the - documentation for more details. - - Some mostly minor bug fixes, but compilation should no - longer generate warnings on most platforms. SF issues - include: 827319, 840173, 846309, 888329, 896188, 923913, - 928113, 961698, 985192. - -Release 1.95.7 Mon Oct 20 2003 - - Fixed enum XML_Status issue (reported on SourceForge many - times), so compilers that are properly picky will be happy. - - Introduced an XMLCALL macro to control the calling - convention used by the Expat API; this macro should be used - to annotate prototypes and definitions of callback - implementations in code compiled with a calling convention - other than the default convention for the host platform. - - Improved ability to build without the configure-generated - expat_config.h header. This is useful for applications - which embed Expat rather than linking in the library. - - Fixed a variety of bugs: see SF issues 458907, 609603, - 676844, 679754, 692878, 692964, 695401, 699323, 699487, - 820946. - - Improved hash table lookups. - - Added more regression tests and improved documentation. - -Release 1.95.6 Tue Jan 28 2003 - - Added XML_FreeContentModel(). - - Added XML_MemMalloc(), XML_MemRealloc(), XML_MemFree(). - - Fixed a variety of bugs: see SF issues 615606, 616863, - 618199, 653180, 673791. - - Enhanced the regression test suite. - - Man page improvements: includes SF issue 632146. - -Release 1.95.5 Fri Sep 6 2002 - - Added XML_UseForeignDTD() for improved SAX2 support. - - Added XML_GetFeatureList(). - - Defined XML_Bool type and the values XML_TRUE and XML_FALSE. - - Use an incomplete struct instead of a void* for the parser - (may not retain). - - Fixed UTF-8 decoding bug that caused legal UTF-8 to be rejected. - - Finally fixed bug where default handler would report DTD - events that were already handled by another handler. - Initial patch contributed by Darryl Miles. - - Removed unnecessary DllMain() function that caused static - linking into a DLL to be difficult. - - Added VC++ projects for building static libraries. - - Reduced line-length for all source code and headers to be - no longer than 80 characters, to help with AS/400 support. - - Reduced memory copying during parsing (SF patch #600964). - - Fixed a variety of bugs: see SF issues 580793, 434664, - 483514, 580503, 581069, 584041, 584183, 584832, 585537, - 596555, 596678, 598352, 598944, 599715, 600479, 600971. - -Release 1.95.4 Fri Jul 12 2002 - - Added support for VMS, contributed by Craig Berry. See - vms/README.vms for more information. - - Added Mac OS (classic) support, with a makefile for MPW, - contributed by Thomas Wegner and Daryle Walker. - - Added Borland C++ Builder 5 / BCC 5.5 support, contributed - by Patrick McConnell (SF patch #538032). - - Fixed a variety of bugs: see SF issues 441449, 563184, - 564342, 566334, 566901, 569461, 570263, 575168, 579196. - - Made skippedEntityHandler conform to SAX2 (see source comment) - - Re-implemented WFC: Entity Declared from XML 1.0 spec and - added a new error "entity declared in parameter entity": - see SF bug report 569461 and SF patch 578161 - - Re-implemented section 5.1 from XML 1.0 spec: - see SF bug report 570263 and SF patch 578161 - -Release 1.95.3 Mon Jun 3 2002 - - Added a project to the MSVC workspace to create a wchar_t - version of the library; the DLLs are named libexpatw.dll. - - Changed the name of the Windows DLLs from expat.dll to - libexpat.dll; this fixes SF bug #432456. - - Added the XML_ParserReset() API function. - - Fixed XML_SetReturnNSTriplet() to work for element names. - - Made the XML_UNICODE builds usable (thanks, Karl!). - - Allow xmlwf to read from standard input. - - Install a man page for xmlwf on Unix systems. - - Fixed many bugs; see SF bug reports 231864, 461380, 464837, - 466885, 469226, 477667, 484419, 487840, 494749, 496505, - 547350. Other bugs which we can't test as easily may also - have been fixed, especially in the area of build support. - -Release 1.95.2 Fri Jul 27 2001 - - More changes to make MSVC happy with the build; add a single - workspace to support both the library and xmlwf application. - - Added a Windows installer for Windows users; includes - xmlwf.exe. - - Added compile-time constants that can be used to determine the - Expat version - - Removed a lot of GNU-specific dependencies to aide portability - among the various Unix flavors. - - Fix the UTF-8 BOM bug. - - Cleaned up warning messages for several compilers. - - Added the -Wall, -Wstrict-prototypes options for GCC. - -Release 1.95.1 Sun Oct 22 15:11:36 EDT 2000 - - Changes to get expat to build under Microsoft compiler - - Removed all aborts and instead return an UNEXPECTED_STATE error. - - Fixed a bug where a stray '%' in an entity value would cause an - abort. - - Defined XML_SetEndNamespaceDeclHandler. Thanks to Darryl Miles for - finding this oversight. - - Changed default patterns in lib/Makefile.in to fit non-GNU makes - Thanks to robin(a)unrated.net for reporting and providing an - account to test on. - - The reference had the wrong label for XML_SetStartNamespaceDecl. - Reported by an anonymous user. - -Release 1.95.0 Fri Sep 29 2000 - - XML_ParserCreate_MM - Allows you to set a memory management suite to replace the - standard malloc,realloc, and free. - - XML_SetReturnNSTriplet - If you turn this feature on when namespace processing is in - effect, then qualified, prefixed element and attribute names - are returned as "uri|name|prefix" where '|' is whatever - separator character is used in namespace processing. - - Merged in features from perl-expat - o XML_SetElementDeclHandler - o XML_SetAttlistDeclHandler - o XML_SetXmlDeclHandler - o XML_SetEntityDeclHandler - o StartDoctypeDeclHandler takes 3 additional parameters: - sysid, pubid, has_internal_subset - o Many paired handler setters (like XML_SetElementHandler) - now have corresponding individual handler setters - o XML_GetInputContext for getting the input context of - the current parse position. - - Added reference material - - Packaged into a distribution that builds a sharable library Removed: trunk/reactos/lib/3rdparty/expat/MANIFEST URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/expat/MANIFES… ============================================================================== --- trunk/reactos/lib/3rdparty/expat/MANIFEST (original) +++ trunk/reactos/lib/3rdparty/expat/MANIFEST (removed) @@ -1,128 +1,0 @@ -amiga/stdlib.c -amiga/launch.c -amiga/expat_vectors.c -amiga/expat_lib.c -amiga/expat.xml -amiga/README.txt -amiga/Makefile -amiga/include/proto/expat.h -amiga/include/libraries/expat.h -amiga/include/interfaces/expat.h -amiga/include/inline4/expat.h -bcb5/README.txt -bcb5/all_projects.bpg -bcb5/elements.bpf -bcb5/elements.bpr -bcb5/elements.mak -bcb5/expat.bpf -bcb5/expat.bpr -bcb5/expat.mak -bcb5/expat_static.bpf -bcb5/expat_static.bpr -bcb5/expat_static.mak -bcb5/expatw.bpf -bcb5/expatw.bpr -bcb5/expatw.mak -bcb5/expatw_static.bpf -bcb5/expatw_static.bpr -bcb5/expatw_static.mak -bcb5/libexpat_mtd.def -bcb5/libexpatw_mtd.def -bcb5/makefile.mak -bcb5/outline.bpf -bcb5/outline.bpr -bcb5/outline.mak -bcb5/setup.bat -bcb5/xmlwf.bpf -bcb5/xmlwf.bpr -bcb5/xmlwf.mak -doc/expat.png -doc/reference.html -doc/style.css -doc/valid-xhtml10.png -doc/xmlwf.1 -doc/xmlwf.sgml -COPYING -Changes -MANIFEST -Makefile.in -README -configure -configure.in -expat_config.h.in -expat.dsw -conftools/PrintPath -conftools/ac_c_bigendian_cross.m4 -conftools/config.guess -conftools/config.sub -conftools/expat.m4 -conftools/get-version.sh -conftools/install-sh -conftools/libtool.m4 -conftools/ltmain.sh -conftools/mkinstalldirs -examples/elements.c -examples/elements.dsp -examples/outline.c -examples/outline.dsp -lib/Makefile.MPW -lib/amigaconfig.h -lib/ascii.h -lib/asciitab.h -lib/expat.dsp -lib/expat.h -lib/expat_external.h -lib/expat_static.dsp -lib/expatw.dsp -lib/expatw_static.dsp -lib/iasciitab.h -lib/internal.h -lib/latin1tab.h -lib/libexpat.def -lib/libexpatw.def -lib/macconfig.h -lib/nametab.h -lib/utf8tab.h -lib/winconfig.h -lib/xmlparse.c -lib/xmlrole.c -lib/xmlrole.h -lib/xmltok.c -lib/xmltok.h -lib/xmltok_impl.c -lib/xmltok_impl.h -lib/xmltok_ns.c -tests/benchmark/README.txt -tests/benchmark/benchmark.c -tests/benchmark/benchmark.dsp -tests/benchmark/benchmark.dsw -tests/README.txt -tests/chardata.c -tests/chardata.h -tests/minicheck.c -tests/minicheck.h -tests/runtests.c -tests/runtestspp.cpp -tests/xmltest.sh -vms/README.vms -vms/descrip.mms -vms/expat_config.h -win32/MANIFEST.txt -win32/README.txt -win32/expat.iss -xmlwf/codepage.c -xmlwf/codepage.h -xmlwf/ct.c -xmlwf/filemap.h -xmlwf/readfilemap.c -xmlwf/unixfilemap.c -xmlwf/win32filemap.c -xmlwf/xmlfile.c -xmlwf/xmlfile.h -xmlwf/xmlmime.c -xmlwf/xmlmime.h -xmlwf/xmltchar.h -xmlwf/xmlurl.h -xmlwf/xmlwf.c -xmlwf/xmlwf.dsp -xmlwf/xmlwin32url.cxx Removed: trunk/reactos/lib/3rdparty/expat/buildconf.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/expat/buildco… ============================================================================== --- trunk/reactos/lib/3rdparty/expat/buildconf.sh (original) +++ trunk/reactos/lib/3rdparty/expat/buildconf.sh (removed) @@ -1,102 +1,0 @@ -#! /bin/sh - -#-------------------------------------------------------------------------- -# autoconf 2.52 or newer -# -ac_version="`${AUTOCONF:-autoconf} --version 2> /dev/null | head -1 | sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`" -if test -z "$ac_version"; then - echo "ERROR: autoconf not found." - echo " You need autoconf version 2.52 or newer installed." - exit 1 -fi -IFS=.; set $ac_version; IFS=' ' -if test "$1" = "2" -a "$2" -lt "52" || test "$1" -lt "2"; then - echo "ERROR: autoconf version $ac_version found." - echo " You need autoconf version 2.52 or newer installed." - exit 1 -fi - -echo "found: autoconf version $ac_version (ok)" - -#-------------------------------------------------------------------------- -# libtool 1.4 or newer -# - -# -# find libtoolize, or glibtoolize on MacOS X -# -libtoolize=`conftools/PrintPath glibtoolize libtoolize` -if [ "x$libtoolize" = "x" ]; then - echo "ERROR: libtoolize not found." - echo " You need libtool version 1.4 or newer installed" - exit 1 -fi - -lt_pversion="`$libtoolize --version 2> /dev/null | sed -e 's/^[^0-9]*//'`" - -# convert something like 1.4p1 to 1.4.p1 -lt_version="`echo $lt_pversion | sed -e 's/$[a-z]*$$/.\1/'`" - -IFS=.; set $lt_version; IFS=' ' -if test "$1" = "1" -a "$2" -lt "4"; then - echo "ERROR: libtool version $lt_pversion found." - echo " You need libtool version 1.4 or newer installed" - exit 1 -fi - -echo "found: libtool version $lt_pversion (ok)" - -#-------------------------------------------------------------------------- - -# Remove any libtool files so one can switch between libtool 1.3 -# and libtool 1.4 by simply rerunning the buildconf script. -(cd conftools/; rm -f ltmain.sh ltconfig) - -# -# Create the libtool helper files -# -echo "Copying libtool helper files ..." - -# -# Note: we don't use --force (any more) since we have a special -# config.guess/config.sub that we want to ensure is used. -# -# --copy to avoid symlinks; we want originals for the distro -# --automake to make it shut up about "things to do" -# -$libtoolize --copy --automake - -# -# Find the libtool.m4 file. The developer/packager can set the LIBTOOL_M4 -# environment variable to specify its location. If that variable is not -# set, then we'll assume a "standard" libtool installation and try to -# derive its location. -# -ltpath=`dirname $libtoolize` -ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4} -cp $ltfile conftools/libtool.m4 - -echo "Using libtool.m4 from ${ltfile}." - -#-------------------------------------------------------------------------- - -### for a little while... remove stray aclocal.m4 files from -### developers' working copies. we no longer use it. (nothing else -### will remove it, and leaving it creates big problems) -rm -f aclocal.m4 - -# -# Generate the autoconf header template (expat_config.h.in) and ./configure -# -echo "Creating expat_config.h.in ..." -${AUTOHEADER:-autoheader} - -echo "Creating configure ..." -### do some work to toss config.cache? -${AUTOCONF:-autoconf} - -# toss this; it gets created by autoconf on some systems -rm -rf autom4te*.cache - -# exit with the right value, so any calling script can continue -exit 0 Removed: trunk/reactos/lib/3rdparty/expat/configure.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/expat/configu… ============================================================================== --- trunk/reactos/lib/3rdparty/expat/configure.in (original) +++ trunk/reactos/lib/3rdparty/expat/configure.in (removed) @@ -1,153 +1,0 @@ -dnl configuration script for expat -dnl Process this file with autoconf to produce a configure script. -dnl -dnl Copyright 2000 Clark Cooper -dnl -dnl This file is part of EXPAT. -dnl -dnl EXPAT is free software; you can redistribute it and/or modify it -dnl under the terms of the License (based on the MIT/X license) contained -dnl in the file COPYING that comes with this distribution. -dnl - -dnl Ensure that Expat is configured with autoconf 2.52 or newer -AC_PREREQ(2.52) - -dnl Get the version number of Expat, using m4's esyscmd() command to run -dnl the command at m4-generation time. This allows us to create an m4 -dnl symbol holding the correct version number. AC_INIT() requires the -dnl version number at m4-time, rather than when ./configure is run, so -dnl all this must happen as part of m4, not as part of the shell code -dnl contained in ./configure. -dnl -dnl NOTE: esyscmd() is a GNU M4 extension. Thus, we wrap it in an appropriate -dnl test. I believe this test will work, but I don't have a place with non- -dnl GNU M4 to test it right now. -define([expat_version], ifdef([__gnu__], - [esyscmd(conftools/get-version.sh lib/expat.h)], - [2.0.x])) -AC_INIT(expat, expat_version, expat-bugs(a)libexpat.org) -undefine([expat_version]) - -AC_CONFIG_SRCDIR(Makefile.in) -AC_CONFIG_AUX_DIR(conftools) - - -dnl -dnl Increment LIBREVISION if source code has changed at all -dnl -dnl If the API has changed, increment LIBCURRENT and set LIBREVISION to 0 -dnl -dnl If the API changes compatibly (i.e. simply adding a new function -dnl without changing or removing earlier interfaces), then increment LIBAGE. -dnl -dnl If the API changes incompatibly set LIBAGE back to 0 -dnl - -LIBCURRENT=6 -LIBREVISION=0 -LIBAGE=5 - -AC_CONFIG_HEADER(expat_config.h) - -sinclude(conftools/libtool.m4) -sinclude(conftools/ac_c_bigendian_cross.m4) - -AC_LIBTOOL_WIN32_DLL -AC_PROG_LIBTOOL - -AC_SUBST(LIBCURRENT) -AC_SUBST(LIBREVISION) -AC_SUBST(LIBAGE) - -dnl Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL - -if test "$GCC" = yes ; then - dnl - dnl Be careful about adding the -fexceptions option; some versions of - dnl GCC don't support it and it causes extra warnings that are only - dnl distracting; avoid. - dnl - OLDCFLAGS="$CFLAGS -Wall -Wmissing-prototypes -Wstrict-prototypes" - CFLAGS="$OLDCFLAGS -fexceptions" - AC_MSG_CHECKING(whether gcc accepts -fexceptions) - AC_TRY_COMPILE(,(void)1, - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no); CFLAGS="$OLDCFLAGS") -fi - -dnl Checks for header files. -AC_HEADER_STDC - -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl Note: Avoid using AC_C_BIGENDIAN because it does not -dnl work in a cross compile. -AC_C_BIGENDIAN_CROSS - -AC_C_CONST -AC_TYPE_SIZE_T -AC_CHECK_FUNCS(memmove bcopy) - -dnl Only needed for xmlwf: -AC_CHECK_HEADERS(fcntl.h unistd.h) -AC_TYPE_OFF_T -AC_FUNC_MMAP - -if test "$ac_cv_func_mmap_fixed_mapped" = "yes"; then - FILEMAP=unixfilemap -else - FILEMAP=readfilemap -fi -AC_SUBST(FILEMAP) - -dnl Needed for the test support code; this was found at -dnl http://lists.gnu.org/archive/html/bug-autoconf/2002-07/msg00028.html - -# AC_CPP_FUNC -# ------------------ # -# Checks to see if ANSI C99 CPP variable __func__ works. -# If not, perhaps __FUNCTION__ works instead. -# If not, we'll just define __func__ to "". -AC_DEFUN([AC_CPP_FUNC], -[AC_REQUIRE([AC_PROG_CC_STDC])dnl -AC_CACHE_CHECK([for an ANSI C99-conforming __func__], ac_cv_cpp_func, -[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], -[[char *foo = __func__;]])], - [ac_cv_cpp_func=yes], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], -[[char *foo = __FUNCTION__;]])], - [ac_cv_cpp_func=__FUNCTION__], - [ac_cv_cpp_func=no])])]) -if test $ac_cv_cpp_func = __FUNCTION__; then - AC_DEFINE(__func__,__FUNCTION__, - [Define to __FUNCTION__ or "" if `__func__' does not conform to -ANSI C.]) -elif test $ac_cv_cpp_func = no; then - AC_DEFINE(__func__,"", - [Define to __FUNCTION__ or "" if `__func__' does not conform to -ANSI C.]) -fi -])# AC_CPP_FUNC - -AC_CPP_FUNC - - -dnl Some basic configuration: -AC_DEFINE([XML_NS], 1, - [Define to make XML Namespaces functionality available.]) -AC_DEFINE([XML_DTD], 1, - [Define to make parameter entity parsing functionality available.]) -AC_DEFINE([XML_CONTEXT_BYTES], 1024, - [Define to specify how much context to retain around the current parse point.]) - -AC_CONFIG_FILES(Makefile) -AC_OUTPUT - -abs_srcdir="`cd $srcdir && pwd`" -abs_builddir="`pwd`" -if test "$abs_srcdir" != "$abs_builddir"; then - make mkdir-init -fi Removed: trunk/reactos/lib/3rdparty/expat/make-release.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/expat/make-re… ============================================================================== --- trunk/reactos/lib/3rdparty/expat/make-release.sh (original) +++ trunk/reactos/lib/3rdparty/expat/make-release.sh (removed) @@ -1,76 +1,0 @@ -#! /bin/bash -# -# make-release.sh: make an Expat release -# -# USAGE: make-release.sh tagname -# -# Note: tagname may be HEAD to just grab the head revision (e.g. for testing) -# - -#CVSROOT=':ext:cvs.libexpat.org:/cvsroot/expat' -CVSROOT=':pserver:anonymous@cvs.libexpat.org:/cvsroot/expat' - -if test $# != 1; then - echo "USAGE: $0 tagname" - exit 1 -fi - -tmpdir=expat-release.$$ -if test -e $tmpdir; then - echo "ERROR: oops. chose the $tmpdir subdir, but it exists." - exit 1 -fi - -echo "Checking out into temporary area: $tmpdir" -cvs -fq -d "$CVSROOT" export -r "$1" -d $tmpdir expat || exit 1 - -echo "" -echo "----------------------------------------------------------------------" -echo "Preparing $tmpdir for release (running buildconf.sh)" -(cd $tmpdir && ./buildconf.sh) || exit 1 - -# figure out the release version -vsn="`$tmpdir/conftools/get-version.sh $tmpdir/lib/expat.h`" - -echo "" -echo "Release version: $vsn" - -if test "$1" = HEAD ; then - distdir=expat-`date '+%Y-%m-%d'` -else - distdir=expat-$vsn -fi -if test -e $distdir; then - echo "ERROR: for safety, you must manually remove $distdir." - rm -rf $tmpdir - exit 1 -fi -mkdir $distdir || exit 1 - -CPOPTS=-Pp -if (cp --version 2>/dev/null | grep -q 'Free Software Foundation') ; then - # If we're using GNU cp, we can avoid the warnings about forward - # compatibility of the options. - CPOPTS='--parents --preserve' -fi - -echo "" -echo "----------------------------------------------------------------------" -echo "Building $distdir based on the MANIFEST:" -files="`sed -e 's/[ ]:.*$//' $tmpdir/MANIFEST`" -for file in $files; do - echo "Copying $file..." - (cd $tmpdir && cp $CPOPTS $file ../$distdir) || exit 1 -done - -echo "" -echo "----------------------------------------------------------------------" -echo "Removing (temporary) checkout directory..." -rm -rf $tmpdir - -tarball=$distdir.tar.gz -echo "Constructing $tarball..." -tar cf - $distdir | gzip -9 > $tarball || exit $? -rm -r $distdir - -echo "Done."

1 0

[fireball] 25493: Vendor import expat-2.0.0 library
by fireball＠svn.reactos.org 17 Jan '07

17 Jan '07

Author: fireball Date: Wed Jan 17 15:30:14 2007 New Revision: 25493 URL: http://svn.reactos.org/svn/reactos?rev=25493&view=rev Log: Vendor import expat-2.0.0 library Added: vendor/expat/ vendor/expat/current/ vendor/expat/current/COPYING (with props) vendor/expat/current/Changes (with props) vendor/expat/current/MANIFEST (with props) vendor/expat/current/Makefile.in (with props) vendor/expat/current/README (with props) vendor/expat/current/amiga/ vendor/expat/current/amiga/Makefile (with props) vendor/expat/current/amiga/README.txt (with props) vendor/expat/current/amiga/expat.xml (with props) vendor/expat/current/amiga/expat_lib.c (with props) vendor/expat/current/amiga/expat_vectors.c (with props) vendor/expat/current/amiga/include/ vendor/expat/current/amiga/include/inline4/ vendor/expat/current/amiga/include/inline4/expat.h (with props) vendor/expat/current/amiga/include/interfaces/ vendor/expat/current/amiga/include/interfaces/expat.h (with props) vendor/expat/current/amiga/include/libraries/ vendor/expat/current/amiga/include/libraries/expat.h (with props) vendor/expat/current/amiga/include/proto/ vendor/expat/current/amiga/include/proto/expat.h (with props) vendor/expat/current/amiga/launch.c (with props) vendor/expat/current/amiga/stdlib.c (with props) vendor/expat/current/bcb5/ vendor/expat/current/bcb5/README.txt (with props) vendor/expat/current/bcb5/all_projects.bpg (with props) vendor/expat/current/bcb5/elements.bpf (with props) vendor/expat/current/bcb5/elements.bpr (with props) vendor/expat/current/bcb5/elements.mak (with props) vendor/expat/current/bcb5/expat.bpf (with props) vendor/expat/current/bcb5/expat.bpr (with props) vendor/expat/current/bcb5/expat.mak (with props) vendor/expat/current/bcb5/expat_static.bpf (with props) vendor/expat/current/bcb5/expat_static.bpr (with props) vendor/expat/current/bcb5/expat_static.mak (with props) vendor/expat/current/bcb5/expatw.bpf (with props) vendor/expat/current/bcb5/expatw.bpr (with props) vendor/expat/current/bcb5/expatw.mak (with props) vendor/expat/current/bcb5/expatw_static.bpf (with props) vendor/expat/current/bcb5/expatw_static.bpr (with props) vendor/expat/current/bcb5/expatw_static.mak (with props) vendor/expat/current/bcb5/libexpat_mtd.def (with props) vendor/expat/current/bcb5/libexpatw_mtd.def (with props) vendor/expat/current/bcb5/makefile.mak (with props) vendor/expat/current/bcb5/outline.bpf (with props) vendor/expat/current/bcb5/outline.bpr (with props) vendor/expat/current/bcb5/outline.mak (with props) vendor/expat/current/bcb5/setup.bat (with props) vendor/expat/current/bcb5/xmlwf.bpf (with props) vendor/expat/current/bcb5/xmlwf.bpr (with props) vendor/expat/current/bcb5/xmlwf.mak (with props) vendor/expat/current/configure (with props) vendor/expat/current/configure.in (with props) vendor/expat/current/conftools/ vendor/expat/current/conftools/PrintPath (with props) vendor/expat/current/conftools/ac_c_bigendian_cross.m4 (with props) vendor/expat/current/conftools/config.guess (with props) vendor/expat/current/conftools/config.sub (with props) vendor/expat/current/conftools/expat.m4 (with props) vendor/expat/current/conftools/get-version.sh (with props) vendor/expat/current/conftools/install-sh (with props) vendor/expat/current/conftools/libtool.m4 (with props) vendor/expat/current/conftools/ltmain.sh (with props) vendor/expat/current/conftools/mkinstalldirs (with props) vendor/expat/current/doc/ vendor/expat/current/doc/expat.png (with props) vendor/expat/current/doc/reference.html (with props) vendor/expat/current/doc/style.css (with props) vendor/expat/current/doc/valid-xhtml10.png (with props) vendor/expat/current/doc/xmlwf.1 (with props) vendor/expat/current/doc/xmlwf.sgml (with props) vendor/expat/current/examples/ vendor/expat/current/examples/elements.c (with props) vendor/expat/current/examples/elements.dsp (with props) vendor/expat/current/examples/outline.c (with props) vendor/expat/current/examples/outline.dsp (with props) vendor/expat/current/expat.dsw (with props) vendor/expat/current/expat_config.h.in (with props) vendor/expat/current/lib/ vendor/expat/current/lib/Makefile.MPW (with props) vendor/expat/current/lib/amigaconfig.h (with props) vendor/expat/current/lib/ascii.h (with props) vendor/expat/current/lib/asciitab.h (with props) vendor/expat/current/lib/expat.dsp (with props) vendor/expat/current/lib/expat.h (with props) vendor/expat/current/lib/expat_external.h (with props) vendor/expat/current/lib/expat_static.dsp (with props) vendor/expat/current/lib/expatw.dsp (with props) vendor/expat/current/lib/expatw_static.dsp (with props) vendor/expat/current/lib/iasciitab.h (with props) vendor/expat/current/lib/internal.h (with props) vendor/expat/current/lib/latin1tab.h (with props) vendor/expat/current/lib/libexpat.def (with props) vendor/expat/current/lib/libexpatw.def (with props) vendor/expat/current/lib/macconfig.h (with props) vendor/expat/current/lib/nametab.h (with props) vendor/expat/current/lib/utf8tab.h (with props) vendor/expat/current/lib/winconfig.h (with props) vendor/expat/current/lib/xmlparse.c (with props) vendor/expat/current/lib/xmlrole.c (with props) vendor/expat/current/lib/xmlrole.h (with props) vendor/expat/current/lib/xmltok.c (with props) vendor/expat/current/lib/xmltok.h (with props) vendor/expat/current/lib/xmltok_impl.c (with props) vendor/expat/current/lib/xmltok_impl.h (with props) vendor/expat/current/lib/xmltok_ns.c (with props) vendor/expat/current/tests/ vendor/expat/current/tests/README.txt (with props) vendor/expat/current/tests/benchmark/ vendor/expat/current/tests/benchmark/README.txt (with props) vendor/expat/current/tests/benchmark/benchmark.c (with props) vendor/expat/current/tests/benchmark/benchmark.dsp (with props) vendor/expat/current/tests/benchmark/benchmark.dsw (with props) vendor/expat/current/tests/chardata.c (with props) vendor/expat/current/tests/chardata.h (with props) vendor/expat/current/tests/minicheck.c (with props) vendor/expat/current/tests/minicheck.h (with props) vendor/expat/current/tests/runtests.c (with props) vendor/expat/current/tests/runtestspp.cpp (with props) vendor/expat/current/tests/xmltest.sh (with props) vendor/expat/current/vms/ vendor/expat/current/vms/README.vms (with props) vendor/expat/current/vms/descrip.mms (with props) vendor/expat/current/vms/expat_config.h (with props) vendor/expat/current/win32/ vendor/expat/current/win32/MANIFEST.txt (with props) vendor/expat/current/win32/README.txt (with props) vendor/expat/current/win32/expat.iss (with props) vendor/expat/current/xmlwf/ vendor/expat/current/xmlwf/codepage.c (with props) vendor/expat/current/xmlwf/codepage.h (with props) vendor/expat/current/xmlwf/ct.c (with props) vendor/expat/current/xmlwf/filemap.h (with props) vendor/expat/current/xmlwf/readfilemap.c (with props) vendor/expat/current/xmlwf/unixfilemap.c (with props) vendor/expat/current/xmlwf/win32filemap.c (with props) vendor/expat/current/xmlwf/xmlfile.c (with props) vendor/expat/current/xmlwf/xmlfile.h (with props) vendor/expat/current/xmlwf/xmlmime.c (with props) vendor/expat/current/xmlwf/xmlmime.h (with props) vendor/expat/current/xmlwf/xmltchar.h (with props) vendor/expat/current/xmlwf/xmlurl.h (with props) vendor/expat/current/xmlwf/xmlwf.c (with props) vendor/expat/current/xmlwf/xmlwf.dsp (with props) vendor/expat/current/xmlwf/xmlwin32url.cxx (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/expat/current/COPYING URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/COPYING?rev=25493&v… Added: vendor/expat/current/Changes URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/Changes?rev=25493&v… Added: vendor/expat/current/MANIFEST URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/MANIFEST?rev=25493&… Added: vendor/expat/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/Makefile.in?rev=254… Added: vendor/expat/current/README URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/README?rev=25493&vi… Added: vendor/expat/current/amiga/Makefile URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/Makefile?rev=… Added: vendor/expat/current/amiga/README.txt URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/README.txt?re… Added: vendor/expat/current/amiga/expat.xml URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/expat.xml?rev… Added: vendor/expat/current/amiga/expat_lib.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/expat_lib.c?r… Added: vendor/expat/current/amiga/expat_vectors.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/expat_vectors… Added: vendor/expat/current/amiga/include/inline4/expat.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/include/inlin… Added: vendor/expat/current/amiga/include/interfaces/expat.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/include/inter… Added: vendor/expat/current/amiga/include/libraries/expat.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/include/libra… Added: vendor/expat/current/amiga/include/proto/expat.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/include/proto… Added: vendor/expat/current/amiga/launch.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/launch.c?rev=… Added: vendor/expat/current/amiga/stdlib.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/amiga/stdlib.c?rev=… Added: vendor/expat/current/bcb5/README.txt URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/README.txt?rev… Added: vendor/expat/current/bcb5/all_projects.bpg URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/all_projects.b… Added: vendor/expat/current/bcb5/elements.bpf URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/elements.bpf?r… Added: vendor/expat/current/bcb5/elements.bpr URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/elements.bpr?r… Added: vendor/expat/current/bcb5/elements.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/elements.mak?r… Added: vendor/expat/current/bcb5/expat.bpf URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expat.bpf?rev=… Added: vendor/expat/current/bcb5/expat.bpr URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expat.bpr?rev=… Added: vendor/expat/current/bcb5/expat.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expat.mak?rev=… Added: vendor/expat/current/bcb5/expat_static.bpf URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expat_static.b… Added: vendor/expat/current/bcb5/expat_static.bpr URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expat_static.b… Added: vendor/expat/current/bcb5/expat_static.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expat_static.m… Added: vendor/expat/current/bcb5/expatw.bpf URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expatw.bpf?rev… Added: vendor/expat/current/bcb5/expatw.bpr URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expatw.bpr?rev… Added: vendor/expat/current/bcb5/expatw.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expatw.mak?rev… Added: vendor/expat/current/bcb5/expatw_static.bpf URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expatw_static.… Added: vendor/expat/current/bcb5/expatw_static.bpr URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expatw_static.… Added: vendor/expat/current/bcb5/expatw_static.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/expatw_static.… Added: vendor/expat/current/bcb5/libexpat_mtd.def URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/libexpat_mtd.d… Added: vendor/expat/current/bcb5/libexpatw_mtd.def URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/libexpatw_mtd.… Added: vendor/expat/current/bcb5/makefile.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/makefile.mak?r… Added: vendor/expat/current/bcb5/outline.bpf URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/outline.bpf?re… Added: vendor/expat/current/bcb5/outline.bpr URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/outline.bpr?re… Added: vendor/expat/current/bcb5/outline.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/outline.mak?re… Added: vendor/expat/current/bcb5/setup.bat URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/setup.bat?rev=… Added: vendor/expat/current/bcb5/xmlwf.bpf URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/xmlwf.bpf?rev=… Added: vendor/expat/current/bcb5/xmlwf.bpr URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/xmlwf.bpr?rev=… Added: vendor/expat/current/bcb5/xmlwf.mak URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/bcb5/xmlwf.mak?rev=… Added: vendor/expat/current/configure URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/configure?rev=25493… Added: vendor/expat/current/configure.in URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/configure.in?rev=25… Added: vendor/expat/current/conftools/PrintPath URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/PrintPath… Added: vendor/expat/current/conftools/ac_c_bigendian_cross.m4 URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/ac_c_bige… Added: vendor/expat/current/conftools/config.guess URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/config.gu… Added: vendor/expat/current/conftools/config.sub URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/config.su… Added: vendor/expat/current/conftools/expat.m4 URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/expat.m4?… Added: vendor/expat/current/conftools/get-version.sh URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/get-versi… Added: vendor/expat/current/conftools/install-sh URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/install-s… Added: vendor/expat/current/conftools/libtool.m4 URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/libtool.m… Added: vendor/expat/current/conftools/ltmain.sh URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/ltmain.sh… Added: vendor/expat/current/conftools/mkinstalldirs URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/conftools/mkinstall… Added: vendor/expat/current/doc/expat.png URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/doc/expat.png?rev=2… Added: vendor/expat/current/doc/reference.html URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/doc/reference.html?… Added: vendor/expat/current/doc/style.css URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/doc/style.css?rev=2… Added: vendor/expat/current/doc/valid-xhtml10.png URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/doc/valid-xhtml10.p… Added: vendor/expat/current/doc/xmlwf.1 URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/doc/xmlwf.1?rev=254… Added: vendor/expat/current/doc/xmlwf.sgml URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/doc/xmlwf.sgml?rev=… Added: vendor/expat/current/examples/elements.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/examples/elements.c… Added: vendor/expat/current/examples/elements.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/examples/elements.d… Added: vendor/expat/current/examples/outline.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/examples/outline.c?… Added: vendor/expat/current/examples/outline.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/examples/outline.ds… Added: vendor/expat/current/expat.dsw URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/expat.dsw?rev=25493… Added: vendor/expat/current/expat_config.h.in URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/expat_config.h.in?r… Added: vendor/expat/current/lib/Makefile.MPW URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/Makefile.MPW?re… Added: vendor/expat/current/lib/amigaconfig.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/amigaconfig.h?r… Added: vendor/expat/current/lib/ascii.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/ascii.h?rev=254… Added: vendor/expat/current/lib/asciitab.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/asciitab.h?rev=… Added: vendor/expat/current/lib/expat.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/expat.dsp?rev=2… Added: vendor/expat/current/lib/expat.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/expat.h?rev=254… Added: vendor/expat/current/lib/expat_external.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/expat_external.… Added: vendor/expat/current/lib/expat_static.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/expat_static.ds… Added: vendor/expat/current/lib/expatw.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/expatw.dsp?rev=… Added: vendor/expat/current/lib/expatw_static.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/expatw_static.d… Added: vendor/expat/current/lib/iasciitab.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/iasciitab.h?rev… Added: vendor/expat/current/lib/internal.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/internal.h?rev=… Added: vendor/expat/current/lib/latin1tab.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/latin1tab.h?rev… Added: vendor/expat/current/lib/libexpat.def URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/libexpat.def?re… Added: vendor/expat/current/lib/libexpatw.def URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/libexpatw.def?r… Added: vendor/expat/current/lib/macconfig.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/macconfig.h?rev… Added: vendor/expat/current/lib/nametab.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/nametab.h?rev=2… Added: vendor/expat/current/lib/utf8tab.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/utf8tab.h?rev=2… Added: vendor/expat/current/lib/winconfig.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/winconfig.h?rev… Added: vendor/expat/current/lib/xmlparse.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmlparse.c?rev=… Added: vendor/expat/current/lib/xmlrole.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmlrole.c?rev=2… Added: vendor/expat/current/lib/xmlrole.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmlrole.h?rev=2… Added: vendor/expat/current/lib/xmltok.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmltok.c?rev=25… Added: vendor/expat/current/lib/xmltok.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmltok.h?rev=25… Added: vendor/expat/current/lib/xmltok_impl.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmltok_impl.c?r… Added: vendor/expat/current/lib/xmltok_impl.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmltok_impl.h?r… Added: vendor/expat/current/lib/xmltok_ns.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/lib/xmltok_ns.c?rev… Added: vendor/expat/current/tests/README.txt URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/README.txt?re… Added: vendor/expat/current/tests/benchmark/README.txt URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/benchmark/REA… Added: vendor/expat/current/tests/benchmark/benchmark.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/benchmark/ben… Added: vendor/expat/current/tests/benchmark/benchmark.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/benchmark/ben… Added: vendor/expat/current/tests/benchmark/benchmark.dsw URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/benchmark/ben… Added: vendor/expat/current/tests/chardata.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/chardata.c?re… Added: vendor/expat/current/tests/chardata.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/chardata.h?re… Added: vendor/expat/current/tests/minicheck.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/minicheck.c?r… Added: vendor/expat/current/tests/minicheck.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/minicheck.h?r… Added: vendor/expat/current/tests/runtests.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/runtests.c?re… Added: vendor/expat/current/tests/runtestspp.cpp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/runtestspp.cp… Added: vendor/expat/current/tests/xmltest.sh URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/tests/xmltest.sh?re… Added: vendor/expat/current/vms/README.vms URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/vms/README.vms?rev=… Added: vendor/expat/current/vms/descrip.mms URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/vms/descrip.mms?rev… Added: vendor/expat/current/vms/expat_config.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/vms/expat_config.h?… Added: vendor/expat/current/win32/MANIFEST.txt URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/win32/MANIFEST.txt?… Added: vendor/expat/current/win32/README.txt URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/win32/README.txt?re… Added: vendor/expat/current/win32/expat.iss URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/win32/expat.iss?rev… Added: vendor/expat/current/xmlwf/codepage.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/codepage.c?re… Added: vendor/expat/current/xmlwf/codepage.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/codepage.h?re… Added: vendor/expat/current/xmlwf/ct.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/ct.c?rev=2549… Added: vendor/expat/current/xmlwf/filemap.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/filemap.h?rev… Added: vendor/expat/current/xmlwf/readfilemap.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/readfilemap.c… Added: vendor/expat/current/xmlwf/unixfilemap.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/unixfilemap.c… Added: vendor/expat/current/xmlwf/win32filemap.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/win32filemap.… Added: vendor/expat/current/xmlwf/xmlfile.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlfile.c?rev… Added: vendor/expat/current/xmlwf/xmlfile.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlfile.h?rev… Added: vendor/expat/current/xmlwf/xmlmime.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlmime.c?rev… Added: vendor/expat/current/xmlwf/xmlmime.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlmime.h?rev… Added: vendor/expat/current/xmlwf/xmltchar.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmltchar.h?re… Added: vendor/expat/current/xmlwf/xmlurl.h URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlurl.h?rev=… Added: vendor/expat/current/xmlwf/xmlwf.c URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlwf.c?rev=2… Added: vendor/expat/current/xmlwf/xmlwf.dsp URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlwf.dsp?rev… Added: vendor/expat/current/xmlwf/xmlwin32url.cxx URL: http://svn.reactos.org/svn/reactos/vendor/expat/current/xmlwf/xmlwin32url.c…

1 0

[fireball] 25492: set eol to native for this thing
by fireball＠svn.reactos.org 17 Jan '07

17 Jan '07

Author: fireball Date: Wed Jan 17 15:19:34 2007 New Revision: 25492 URL: http://svn.reactos.org/svn/reactos?rev=25492&view=rev Log: set eol to native for this thing Modified: vendor/rfsd/current/RFSD/RFSD.sln (contents, props changed) vendor/rfsd/current/RFSD/RFSD/MAKEFILE (contents, props changed) vendor/rfsd/current/RFSD/RFSD/RFSD.vcproj (contents, props changed) vendor/rfsd/current/RFSD/RFSD/Sources (contents, props changed) vendor/rfsd/current/RFSD/RFSD/block.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/cleanup.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/close.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/cmcb.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/create.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/debug.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/devctl.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/dircontrol.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/dispatch.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/except.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/fastio.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/fileinfo.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/flush.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/fsctl.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/fsparameters.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/init.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/config.h (props changed) vendor/rfsd/current/RFSD/RFSD/linux/errno.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/kernel.h (props changed) vendor/rfsd/current/RFSD/RFSD/linux/module.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/nls.h (props changed) vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_acl.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_fs.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_fs_i.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_fs_sb.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_xattr.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/slab.h (props changed) vendor/rfsd/current/RFSD/RFSD/linux/spinlock.h (props changed) vendor/rfsd/current/RFSD/RFSD/linux/string.h (props changed) vendor/rfsd/current/RFSD/RFSD/linux/types.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/linux/version.h (props changed) vendor/rfsd/current/RFSD/RFSD/lock.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/memory.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/misc.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/MAKEFILE (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/Sources (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_base.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_big5.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp1251.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp1255.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp437.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp737.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp775.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp850.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp852.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp855.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp857.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp860.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp861.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp862.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp863.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp864.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp865.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp866.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp869.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp874.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp932.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp936.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp949.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_cp950.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_euc-jp.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_euc-kr.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_gb2312.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-1.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-13.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-14.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-15.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-2.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-3.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-4.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-5.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-6.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-7.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-8.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-9.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_koi8-r.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_koi8-ru.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_koi8-u.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_sjis.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_tis-620.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/nls/nls_utf8.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/ntifs.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/pnp.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/protos.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/read.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/reiserfs.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/resource.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/rfsd.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/rfsdblock.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/rfsdfs.h (contents, props changed) vendor/rfsd/current/RFSD/RFSD/rfsdfsd.rc (contents, props changed) vendor/rfsd/current/RFSD/RFSD/rfsdfsd.reg (contents, props changed) vendor/rfsd/current/RFSD/RFSD/run-clean.bat (contents, props changed) vendor/rfsd/current/RFSD/RFSD/run-make-release.bat (contents, props changed) vendor/rfsd/current/RFSD/RFSD/run-make.bat (contents, props changed) vendor/rfsd/current/RFSD/RFSD/run-rebuild-all-release.bat (contents, props changed) vendor/rfsd/current/RFSD/RFSD/run-rebuild-all.bat (contents, props changed) vendor/rfsd/current/RFSD/RFSD/shutdown.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/volinfo.c (contents, props changed) vendor/rfsd/current/RFSD/RFSD/write.c (contents, props changed) vendor/rfsd/current/SampleFSD/SampleFSD.sln (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/MAKE-MC.BAT (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/MAKEFILE (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/README.TXT (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/SOURCES (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/dummy.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/errmsg.msg (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/errmsg.rc (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/event/sfsdevnt.def (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/filesys.vcproj (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/inc/errmsg.h (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/inc/ntifs.h (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/inc/protos.h (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/inc/sfsd.h (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/inc/struct.h (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/readme.txt (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/readme1.txt (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/run-make.bat (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/sfsd.reg (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/cleanup.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/close.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/create.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/debug.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/devcntrl.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/dircntrl.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/fastio.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/fileinfo.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/flush.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/fscontrol.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/makefile (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/misc.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/read.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/sfsdinit.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/shutdown.c (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/sources (contents, props changed) vendor/rfsd/current/SampleFSD/filesys/src/write.c (contents, props changed) vendor/rfsd/current/readme.txt (contents, props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: vendor/rfsd/current/RFSD/RFSD.sln URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD.sln?rev=25… Modified: vendor/rfsd/current/RFSD/RFSD/MAKEFILE URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/MAKEFILE?r… Modified: vendor/rfsd/current/RFSD/RFSD/RFSD.vcproj URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/RFSD.vcpro… Modified: vendor/rfsd/current/RFSD/RFSD/Sources URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/Sources?re… Modified: vendor/rfsd/current/RFSD/RFSD/block.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/block.c?re… Modified: vendor/rfsd/current/RFSD/RFSD/cleanup.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/cleanup.c?… Modified: vendor/rfsd/current/RFSD/RFSD/close.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/close.c?re… Modified: vendor/rfsd/current/RFSD/RFSD/cmcb.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/cmcb.c?rev… Modified: vendor/rfsd/current/RFSD/RFSD/create.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/create.c?r… Modified: vendor/rfsd/current/RFSD/RFSD/debug.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/debug.c?re… Modified: vendor/rfsd/current/RFSD/RFSD/devctl.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/devctl.c?r… Modified: vendor/rfsd/current/RFSD/RFSD/dircontrol.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/dircontrol… Modified: vendor/rfsd/current/RFSD/RFSD/dispatch.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/dispatch.c… Modified: vendor/rfsd/current/RFSD/RFSD/except.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/except.c?r… Modified: vendor/rfsd/current/RFSD/RFSD/fastio.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/fastio.c?r… Modified: vendor/rfsd/current/RFSD/RFSD/fileinfo.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/fileinfo.c… Modified: vendor/rfsd/current/RFSD/RFSD/flush.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/flush.c?re… Modified: vendor/rfsd/current/RFSD/RFSD/fsctl.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/fsctl.c?re… Modified: vendor/rfsd/current/RFSD/RFSD/fsparameters.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/fsparamete… Modified: vendor/rfsd/current/RFSD/RFSD/init.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/init.c?rev… Modified: vendor/rfsd/current/RFSD/RFSD/linux/errno.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/errn… Modified: vendor/rfsd/current/RFSD/RFSD/linux/module.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/modu… Modified: vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_acl.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/reis… Modified: vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_fs.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/reis… Modified: vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_fs_i.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/reis… Modified: vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_fs_sb.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/reis… Modified: vendor/rfsd/current/RFSD/RFSD/linux/reiserfs_xattr.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/reis… Modified: vendor/rfsd/current/RFSD/RFSD/linux/types.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/linux/type… Modified: vendor/rfsd/current/RFSD/RFSD/lock.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/lock.c?rev… Modified: vendor/rfsd/current/RFSD/RFSD/memory.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/memory.c?r… Modified: vendor/rfsd/current/RFSD/RFSD/misc.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/misc.c?rev… Modified: vendor/rfsd/current/RFSD/RFSD/nls.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls.c?rev=… Modified: vendor/rfsd/current/RFSD/RFSD/nls/MAKEFILE URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/MAKEFI… Modified: vendor/rfsd/current/RFSD/RFSD/nls/Sources URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/Source… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_base.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_ba… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_big5.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_bi… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp1251.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp1255.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp437.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp737.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp775.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp850.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp852.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp855.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp857.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp860.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp861.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp862.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp863.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp864.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp865.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp866.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp869.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp874.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp932.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp936.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp949.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_cp950.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_cp… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_euc-jp.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_eu… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_euc-kr.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_eu… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_gb2312.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_gb… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-1.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-13.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-14.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-15.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-2.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-3.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-4.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-5.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-6.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-7.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-8.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_iso8859-9.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_is… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_koi8-r.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_ko… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_koi8-ru.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_ko… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_koi8-u.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_ko… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_sjis.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_sj… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_tis-620.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_ti… Modified: vendor/rfsd/current/RFSD/RFSD/nls/nls_utf8.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/nls/nls_ut… Modified: vendor/rfsd/current/RFSD/RFSD/ntifs.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/ntifs.h?re… Modified: vendor/rfsd/current/RFSD/RFSD/pnp.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/pnp.c?rev=… Modified: vendor/rfsd/current/RFSD/RFSD/protos.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/protos.h?r… Modified: vendor/rfsd/current/RFSD/RFSD/read.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/read.c?rev… Modified: vendor/rfsd/current/RFSD/RFSD/reiserfs.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/reiserfs.h… Modified: vendor/rfsd/current/RFSD/RFSD/resource.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/resource.h… Modified: vendor/rfsd/current/RFSD/RFSD/rfsd.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/rfsd.c?rev… Modified: vendor/rfsd/current/RFSD/RFSD/rfsdblock.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/rfsdblock.… Modified: vendor/rfsd/current/RFSD/RFSD/rfsdfs.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/rfsdfs.h?r… Modified: vendor/rfsd/current/RFSD/RFSD/rfsdfsd.rc URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/rfsdfsd.rc… Modified: vendor/rfsd/current/RFSD/RFSD/rfsdfsd.reg URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/rfsdfsd.re… Modified: vendor/rfsd/current/RFSD/RFSD/run-clean.bat URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/run-clean.… Modified: vendor/rfsd/current/RFSD/RFSD/run-make-release.bat URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/run-make-r… Modified: vendor/rfsd/current/RFSD/RFSD/run-make.bat URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/run-make.b… Modified: vendor/rfsd/current/RFSD/RFSD/run-rebuild-all-release.bat URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/run-rebuil… Modified: vendor/rfsd/current/RFSD/RFSD/run-rebuild-all.bat URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/run-rebuil… Modified: vendor/rfsd/current/RFSD/RFSD/shutdown.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/shutdown.c… Modified: vendor/rfsd/current/RFSD/RFSD/volinfo.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/volinfo.c?… Modified: vendor/rfsd/current/RFSD/RFSD/write.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/RFSD/RFSD/write.c?re… Modified: vendor/rfsd/current/SampleFSD/SampleFSD.sln URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/SampleFSD.… Modified: vendor/rfsd/current/SampleFSD/filesys/event/MAKE-MC.BAT URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/event/MAKEFILE URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/event/README.TXT URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/event/SOURCES URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/event/dummy.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/event/errmsg.msg URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/event/errmsg.rc URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/event/sfsdevnt.def URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ev… Modified: vendor/rfsd/current/SampleFSD/filesys/filesys.vcproj URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/fi… Modified: vendor/rfsd/current/SampleFSD/filesys/inc/errmsg.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/in… Modified: vendor/rfsd/current/SampleFSD/filesys/inc/ntifs.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/in… Modified: vendor/rfsd/current/SampleFSD/filesys/inc/protos.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/in… Modified: vendor/rfsd/current/SampleFSD/filesys/inc/sfsd.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/in… Modified: vendor/rfsd/current/SampleFSD/filesys/inc/struct.h URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/in… Modified: vendor/rfsd/current/SampleFSD/filesys/readme.txt URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/re… Modified: vendor/rfsd/current/SampleFSD/filesys/readme1.txt URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/re… Modified: vendor/rfsd/current/SampleFSD/filesys/run-make.bat URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/ru… Modified: vendor/rfsd/current/SampleFSD/filesys/sfsd.reg URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sf… Modified: vendor/rfsd/current/SampleFSD/filesys/src/cleanup.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/close.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/create.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/debug.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/devcntrl.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/dircntrl.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/fastio.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/fileinfo.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/flush.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/fscontrol.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/makefile URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/misc.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/read.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/sfsdinit.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/shutdown.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/sources URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/SampleFSD/filesys/src/write.c URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/SampleFSD/filesys/sr… Modified: vendor/rfsd/current/readme.txt URL: http://svn.reactos.org/svn/reactos/vendor/rfsd/current/readme.txt?rev=25492…

1 0

[ion] 25491: - Simplify KiSelectReadyThread. - Disable KiSetAffinityThread to do nothing else but change affinity instead of doing re-scheduling (temporary change). - Cleanup KiQuantumEnd to prepare for new scheduler. - Fix up a large bug in KeInsertQueueDpc which was making every DPC become a Threaded DPC due to a bad assignment-instead-of-compare. - Copy KiSelectNextThread for new scheduler branch, without SMT support. - Fix a bug in KiAdjustQuantumThread under new scheduler. - Re-implement Ki
by ion＠svn.reactos.org 17 Jan '07

17 Jan '07

Author: ion Date: Wed Jan 17 04:56:15 2007 New Revision: 25491 URL: http://svn.reactos.org/svn/reactos?rev=25491&view=rev Log: - Simplify KiSelectReadyThread. - Disable KiSetAffinityThread to do nothing else but change affinity instead of doing re-scheduling (temporary change). - Cleanup KiQuantumEnd to prepare for new scheduler. - Fix up a large bug in KeInsertQueueDpc which was making every DPC become a Threaded DPC due to a bad assignment-instead-of-compare. - Copy KiSelectNextThread for new scheduler branch, without SMT support. - Fix a bug in KiAdjustQuantumThread under new scheduler. - Re-implement KiSetPriorityThread under new scheduler, leave hacks for current scheduler support. - Remove old testing assert from KiExitDispatcher. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h Wed Jan 17 04:56:15 2007 @@ -223,15 +223,14 @@ KiDeferredReadyThread(IN PKTHREAD Thread); KAFFINITY -NTAPI +FASTCALL KiSetAffinityThread( IN PKTHREAD Thread, - IN KAFFINITY Affinity, - IN PBOOLEAN Released // hack + IN KAFFINITY Affinity ); PKTHREAD -NTAPI +FASTCALL KiSelectNextThread( IN PKPRCB Prcb ); Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Wed Jan 17 04:56:15 2007 @@ -1259,12 +1259,12 @@ { LONG PriorityMask, PrioritySet, HighPriority; PLIST_ENTRY ListEntry; - PKTHREAD Thread; + PKTHREAD Thread = NULL; /* Save the current mask and get the priority set for the CPU */ PriorityMask = Priority; PrioritySet = Prcb->ReadySummary >> (UCHAR)Priority; - if (!PrioritySet) return NULL; + if (!PrioritySet) goto Quickie; /* Get the highest priority possible */ BitScanReverse((PULONG)&HighPriority, PrioritySet); @@ -1275,7 +1275,7 @@ ASSERT(IsListEmpty(&Prcb->DispatcherReadyListHead[HighPriority]) == FALSE); /* Get the first thread on the list */ - ListEntry = &Prcb->DispatcherReadyListHead[HighPriority]; + ListEntry = Prcb->DispatcherReadyListHead[HighPriority].Flink; Thread = CONTAINING_RECORD(ListEntry, KTHREAD, WaitListEntry); /* Make sure this thread is here for a reason */ @@ -1284,14 +1284,14 @@ ASSERT(Thread->NextProcessor == Prcb->Number); /* Remove it from the list */ - RemoveEntryList(&Thread->WaitListEntry); - if (IsListEmpty(&Thread->WaitListEntry)) + if (RemoveEntryList(&Thread->WaitListEntry)) { /* The list is empty now, reset the ready summary */ Prcb->ReadySummary ^= PRIORITY_MASK(HighPriority); } /* Sanity check and return the thread */ +Quickie: ASSERT((Thread == NULL) || (Thread->BasePriority == 0) || (Thread->Priority != 0)); Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2549… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Wed Jan 17 04:56:15 2007 @@ -70,7 +70,22 @@ /* Check if a new thread is scheduled */ if (!Prcb->NextThread) { - /* FIXME: TODO. Add code from new scheduler */ +#ifdef NEW_SCHEDULER + /* Get a new ready thread */ + NextThread = KiSelectReadyThread(Thread->Priority, Prcb); + if (NextThread) + { + /* Found one, set it on standby */ + NextThread->Standby; + Prcb->NextThread = NewThread; + } +#else + /* Just leave now */ + KiReleasePrcbLock(Prcb); + KeLowerIrql(DISPATCH_LEVEL); + KiDispatchThread(Ready); + return; +#endif } else { @@ -94,13 +109,8 @@ /* Just leave now */ KiReleasePrcbLock(Prcb); KeLowerIrql(DISPATCH_LEVEL); - KiDispatchThread(Ready); // FIXME: ROS return; } - - /* This shouldn't happen on ROS yet */ - DPRINT1("The impossible happened - Tell Alex\n"); - ASSERT(FALSE); /* Get the next thread now */ NextThread = Prcb->NextThread; @@ -296,7 +306,7 @@ } /* Check if this is a threaded DPC and threaded DPCs are enabled */ - if ((Dpc->Type = ThreadedDpcObject) && (Prcb->ThreadDpcEnable)) + if ((Dpc->Type == ThreadedDpcObject) && (Prcb->ThreadDpcEnable)) { /* Then use the threaded data */ DpcData = &Prcb->DpcData[DPC_THREADED]; Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Wed Jan 17 04:56:15 2007 @@ -1252,7 +1252,6 @@ { KIRQL OldIrql; KAFFINITY OldAffinity; - BOOLEAN Released; ASSERT_THREAD(Thread); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); @@ -1260,21 +1259,10 @@ OldIrql = KiAcquireDispatcherLock(); /* Call the internal function */ - OldAffinity = KiSetAffinityThread(Thread, Affinity, &Released); - - /* Check if lock was released */ - if (!Released) - { - /* Release the dispatcher database */ - KiReleaseDispatcherLock(OldIrql); - } - else - { - /* Lower IRQL only */ - KeLowerIrql(OldIrql); - } - - /* Return old affinity */ + OldAffinity = KiSetAffinityThread(Thread, Affinity); + + /* Release the dispatcher database and return old affinity */ + KiReleaseDispatcherLock(OldIrql); return OldAffinity; } Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Wed Jan 17 04:56:15 2007 @@ -23,17 +23,6 @@ static VOID -KiRequestReschedule(CCHAR Processor) -{ - PKPCR Pcr; - - Pcr = (PKPCR)(KPCR_BASE + Processor * PAGE_SIZE); - Pcr->Prcb->QuantumEnd = TRUE; - KiIpiSendRequest(1 << Processor, IPI_DPC); -} - -static -VOID KiInsertIntoThreadList(KPRIORITY Priority, PKTHREAD Thread) { @@ -166,6 +155,40 @@ return FALSE; } +VOID +NTAPI +KiDeferredReadyThread(IN PKTHREAD Thread) +{ + /* FIXME: Not yet implemented */ + KEBUGCHECK(0); +} + +PKTHREAD +FASTCALL +KiSelectNextThread(IN PKPRCB Prcb) +{ + PKTHREAD Thread; + + /* Select a ready thread */ + Thread = KiSelectReadyThread(0, Prcb); + if (!Thread) + { + /* Didn't find any, get the current idle thread */ + Thread = Prcb->IdleThread; + + /* Enable idle scheduling */ + InterlockedOr(&KiIdleSummary, Prcb->SetMember); + Prcb->IdleSchedule = TRUE; + + /* FIXME: SMT support */ + } + + /* Sanity checks and return the thread */ + ASSERT(Thread != NULL); + ASSERT((Thread->BasePriority == 0) || (Thread->Priority != 0)); + return Thread; +} + NTSTATUS FASTCALL KiSwapThread(IN PKTHREAD CurrentThread, @@ -174,8 +197,12 @@ BOOLEAN ApcState; ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); +#ifdef NEW_SCHEDULER + +#else /* Find a new thread to run */ ApcState = KiDispatchThreadNoLock(Waiting); +#endif /* Check if we need to deliver APCs */ if (ApcState) @@ -238,7 +265,7 @@ else { /* Insert the thread on the deferred ready list */ -#if 0 +#ifdef NEW_SCHEDULER KiInsertDeferredReadyList(Thread); #else /* Insert the thread into the thread list */ @@ -249,7 +276,7 @@ } VOID -STDCALL +NTAPI KiAdjustQuantumThread(IN PKTHREAD Thread) { PKPRCB Prcb = KeGetCurrentPrcb(); @@ -275,10 +302,14 @@ /* Check if there's no next thread scheduled */ if (!Prcb->NextThread) { - /* Select a new thread and set it on standby */ - NextThread = KiSelectNextThread(Prcb); - NextThread->State = Standby; - Prcb->NextThread = NextThread; + /* Select a ready thread and check if we found one */ + NextThread = KiSelectReadyThread(Thread->Priority, Prcb); + if (NextThread) + { + /* Set it on standby and switch to it */ + NextThread->State = Standby; + Prcb->NextThread = NextThread; + } } else { @@ -303,91 +334,213 @@ IN KPRIORITY Priority, OUT PBOOLEAN Released) { - KPRIORITY OldPriority = Thread->Priority; - ULONG Mask; - ULONG i; - PKPCR Pcr; + PKPRCB Prcb; + ULONG Processor; + BOOLEAN RequestInterrupt = FALSE; + KPRIORITY OldPriority; + PKTHREAD NewThread; ASSERT((Priority >= 0) && (Priority <= HIGH_PRIORITY)); /* Check if priority changed */ - if (OldPriority != Priority) - { - /* Set it */ - Thread->Priority = (SCHAR)Priority; - - /* Choose action based on thread's state */ - if (Thread->State == Ready) + if (Thread->Priority != Priority) + { + /* Loop priority setting in case we need to start over */ + for (;;) { - /* Remove it from the current queue */ - KiRemoveFromThreadList(Thread); - - /* Re-insert it at its current priority */ - KiInsertIntoThreadList(Priority, Thread); - - /* Check if the old priority was lower */ - if (KeGetCurrentThread()->Priority < Priority) - { - /* Dispatch it immediately */ - KiDispatchThreadNoLock(Ready); - *Released = TRUE; - return; - } - } - else if (Thread->State == Running) - { - /* Check if the new priority is lower */ - if (Priority < OldPriority) - { - /* Check for threads with a higher priority */ - Mask = ~((1 << (Priority + 1)) - 1); - if (PriorityListMask & Mask) - { - /* Found a thread, is it us? */ - if (Thread == KeGetCurrentThread()) + /* Choose action based on thread's state */ + if (Thread->State == Ready) + { + /* Make sure we're not on the ready queue */ + if (Thread->ProcessReadyQueue) + { + /* Get the PRCB for the thread and lock it */ + Processor = Thread->NextProcessor; + Prcb = KiProcessorBlock[Processor]; + KiAcquirePrcbLock(Prcb); + + /* Make sure the thread is still ready and on this CPU */ + if ((Thread->State == Ready) && + (Thread->NextProcessor == Prcb->Number)) { - /* Dispatch us */ + /* Sanity check */ + ASSERT((Prcb->ReadySummary & + PRIORITY_MASK(Thread->Priority))); + + /* Remove it from the current queue */ +#ifdef NEW_SCHEDULER + if (RemoveEntryList(&Thread->WaitListEntry)) + { + /* Update the ready summary */ + Prcb->ReadySummary ^= PRIORITY_MASK(Thread->Priority); + } +#else + KiRemoveFromThreadList(Thread); +#endif + + /* Update priority */ + Thread->Priority = (SCHAR)Priority; + + /* Re-insert it at its current priority */ +#ifndef NEW_SCHEDULER + KiInsertIntoThreadList(Priority, Thread); KiDispatchThreadNoLock(Ready); *Released = TRUE; - return; - } +#else + KiInsertDeferredReadyList(Thread); +#endif + + /* Release the PRCB Lock */ + KiReleasePrcbLock(Prcb); + } else { - /* Loop every CPU */ - for (i = 0; i < KeNumberProcessors; i++) + /* Release the lock and loop again */ + KEBUGCHECK(0); + KiReleasePrcbLock(Prcb); + continue; + } + } + else + { + /* It's already on the ready queue, just update priority */ + Thread->Priority = (SCHAR)Priority; + } + } + else if (Thread->State == Standby) + { + /* Get the PRCB for the thread and lock it */ + KEBUGCHECK(0); + Processor = Thread->NextProcessor; + Prcb = KiProcessorBlock[Processor]; + KiAcquirePrcbLock(Prcb); + + /* Check if we're still the next thread to run */ + if (Thread == Prcb->NextThread) + { + /* Get the old priority and update ours */ + OldPriority = Thread->Priority; + Thread->Priority = (SCHAR)Priority; + + /* Check if there was a change */ + if (Priority < OldPriority) + { + /* Find a new thread */ + NewThread = KiSelectReadyThread(Priority + 1, Prcb); + if (NewThread) { - /* Get the PCR for this CPU */ - Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); - - /* Reschedule if the new one is already on a CPU */ - if (Pcr->Prcb->CurrentThread == Thread) + /* Found a new one, set it on standby */ + NewThread->State = Standby; + Prcb->NextThread = NewThread; + + /* Dispatch our thread */ + KiInsertDeferredReadyList(Thread); + } + } + + /* Release the PRCB lock */ + KiReleasePrcbLock(Prcb); + } + else + { + /* Release the lock and try again */ + KiReleasePrcbLock(Prcb); + continue; + } + } + else if (Thread->State == Running) + { + /* Get the PRCB for the thread and lock it */ + Processor = Thread->NextProcessor; + Prcb = KiProcessorBlock[Processor]; + KiAcquirePrcbLock(Prcb); + + /* Check if we're still the current thread running */ + if (Thread == Prcb->CurrentThread) + { + /* Get the old priority and update ours */ + OldPriority = Thread->Priority; + Thread->Priority = (SCHAR)Priority; + + /* Check if there was a change and there's no new thread */ + if ((Priority < OldPriority) && !(Prcb->NextThread)) + { +#ifdef NEW_SCHEDULER + /* Find a new thread */ + NewThread = KiSelectReadyThread(Priority + 1, Prcb); + if (NewThread) + { + /* Found a new one, set it on standby */ + NewThread->State = Standby; + Prcb->NextThread = NewThread; + + /* Request an interrupt */ + RequestInterrupt = TRUE; + } +#else + /* Check for threads with a higher priority */ + if (PriorityListMask & ~((1 << (Priority + 1)) - 1)) + { + /* Found a thread, is it us? */ + if (Thread == KeGetCurrentThread()) { - KiReleaseDispatcherLockFromDpcLevel(); - KiRequestReschedule(i); + /* Dispatch us */ + KiDispatchThreadNoLock(Ready); *Released = TRUE; return; } } +#endif } - } - } + + /* Release the lock and check if we need an interrupt */ + KiReleasePrcbLock(Prcb); + if (RequestInterrupt) + { + /* Check if we're running on another CPU */ + if (KeGetCurrentProcessorNumber() != Processor) + { + /* We are, send an IPI */ + KiIpiSendRequest(AFFINITY_MASK(Processor), IPI_DPC); + } + } + } + else + { + /* Thread changed, release lock and restart */ + KiReleasePrcbLock(Prcb); + continue; + } + } + else if (Thread->State == DeferredReady) + { + /* FIXME: TODO */ + DPRINT1("Deferred state not yet supported\n"); + KEBUGCHECK(0); + } + else + { + /* Any other state, just change priority */ + Thread->Priority = (SCHAR)Priority; + } + + /* If we got here, then thread state was consistent, so bail out */ + break; } } /* Return to caller */ *Released = FALSE; - return; } KAFFINITY -NTAPI +FASTCALL KiSetAffinityThread(IN PKTHREAD Thread, - IN KAFFINITY Affinity, - PBOOLEAN Released) + IN KAFFINITY Affinity) { KAFFINITY OldAffinity; - ULONG ProcessorMask; - CCHAR i; - PKPCR Pcr; + + /* Get the current affinity */ + OldAffinity = Thread->UserAffinity; /* Make sure that the affinity is valid */ if (((Affinity & Thread->ApcState.Process->Affinity) != (Affinity)) || @@ -397,52 +550,17 @@ KeBugCheck(INVALID_AFFINITY_SET); } - /* Get the old affinity */ - OldAffinity = Thread->UserAffinity; - + /* Update the new affinity */ Thread->UserAffinity = Affinity; - if (Thread->SystemAffinityActive == FALSE) { - - Thread->Affinity = Affinity; - - if (Thread->State == Running) { - - ProcessorMask = 1 << KeGetCurrentProcessorNumber(); - if (Thread == KeGetCurrentThread()) { - - if (!(Affinity & ProcessorMask)) { - - KiDispatchThreadNoLock(Ready); - *Released = TRUE; - return OldAffinity; - } - - } else { - - for (i = 0; i < KeNumberProcessors; i++) { - - Pcr = (PKPCR)(KPCR_BASE + i * PAGE_SIZE); - if (Pcr->Prcb->CurrentThread == Thread) { - - if (!(Affinity & ProcessorMask)) { - - KiReleaseDispatcherLockFromDpcLevel(); - KiRequestReschedule(i); - *Released = TRUE; - return OldAffinity; - } - - break; - } - } - - ASSERT (i < KeNumberProcessors); - } - } - } - - *Released = FALSE; + /* Check if system affinity is disabled */ + if (!Thread->SystemAffinityActive) + { + /* FIXME: TODO */ + DPRINT1("Affinity support disabled!\n"); + } + + /* Return the old affinity */ return OldAffinity; } Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=254… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c (original) +++ trunk/reactos/ntoskrnl/ke/wait.c Wed Jan 17 04:56:15 2007 @@ -182,10 +182,6 @@ /* Make sure there's a new thread scheduled */ if (!Prcb->NextThread) goto Quickie; - - /* This shouldn't happen on ROS yet */ - DPRINT1("The impossible happened - Tell Alex\n"); - ASSERT(FALSE); /* Lock the PRCB */ KiAcquirePrcbLock(Prcb);

1 0

[ion] 25490: [22 bug fixes]: - Make KiComputeNewPriority accept various priority adjuments instead of always assuming an increase of 1 priority level. - Fix ASSERT in KeSetEventBoostPriority: API is valid *only* for Synchronization events, not notification ones. - Use proper KiComputeNewPriority call in KeSetEventBoostPriority, since we're not adjusting by 1. - Make sure the FreezeCount is also 0 in KeAlertResumeThread, before signalling the suspend semaphore. - Simply alert-mode check in KeAler
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 23:49:40 2007 New Revision: 25490 URL: http://svn.reactos.org/svn/reactos?rev=25490&view=rev Log: [22 bug fixes]: - Make KiComputeNewPriority accept various priority adjuments instead of always assuming an increase of 1 priority level. - Fix ASSERT in KeSetEventBoostPriority: API is valid *only* for Synchronization events, not notification ones. - Use proper KiComputeNewPriority call in KeSetEventBoostPriority, since we're not adjusting by 1. - Make sure the FreezeCount is also 0 in KeAlertResumeThread, before signalling the suspend semaphore. - Simply alert-mode check in KeAlertThread. - Don't exit the critical region in KeFreezeAllThreads, it needs to be held. - Don't enter a critical region in KeThawAllThreads, it should already have been entered; release it after thawing is complete. - Also change the list loop in these functions to always start with the first thread. - Copy over boost-disable flag in KeStartThread. - Don't acquire the dispatcher lock in KeTestAlertThread. - Set the KernelStackResident flag to TRUE in KeInitThread. - Fix KeSetIdealProcessorThread to check the CPU is valid on the system, not valid across all valid CPU numbers. Also fix it to compare affinity, not processor. - Fix KeSetBasePriorityThread to properly call KiComputeNewPriority with an adjustment of 0, and then properly manually adjust with the delta between the new base priority and the old base priority. - Also normalize the new priority if it's too low. - Always set the priority decrement back to 0 when KeSetPriorityThread is called. - Normalize the priority in KeSetPriorityThread if it falls too low. - Fix process stack count check in KeTerminateThread. - Acquire thread and PRCB lock in KiAdjustQuantumThread. - Use KiComputeNewPriority in KiAdjustQuantumThread. - Dispatch a new thread in KiAdjustQuantumThread to take into account the new scheduler settings. - Thread priorities should make more sense now... Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/event.c trunk/reactos/ntoskrnl/ke/thrdobj.c trunk/reactos/ntoskrnl/ke/thrdschd.c Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h Tue Jan 16 23:49:40 2007 @@ -1304,7 +1304,8 @@ // SCHAR FORCEINLINE -KiComputeNewPriority(IN PKTHREAD Thread) +KiComputeNewPriority(IN PKTHREAD Thread, + IN SCHAR Adjustment) { SCHAR Priority; @@ -1319,7 +1320,7 @@ if (Priority < LOW_REALTIME_PRIORITY) { /* Decrease priority by the priority decrement */ - Priority -= (Thread->PriorityDecrement + 1); + Priority -= (Thread->PriorityDecrement + Adjustment); /* Don't go out of bounds */ if (Priority < Thread->BasePriority) Priority = Thread->BasePriority; Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2549… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Tue Jan 16 23:49:40 2007 @@ -39,7 +39,6 @@ NTAPI KiQuantumEnd(VOID) { - KPRIORITY Priority; PKPRCB Prcb = KeGetCurrentPrcb(); PKTHREAD NextThread, Thread = Prcb->CurrentThread; @@ -66,7 +65,7 @@ Thread->Quantum = Thread->QuantumReset; /* Calculate new priority */ - Priority = Thread->Priority = KiComputeNewPriority(Thread); + Thread->Priority = KiComputeNewPriority(Thread, 1); /* Check if a new thread is scheduled */ if (!Prcb->NextThread) @@ -337,7 +336,7 @@ if (&Prcb->DpcData[DPC_THREADED].DpcListHead == &DpcData->DpcListHead) { /* Make sure a threaded DPC isn't already active */ - if (!(Prcb->DpcThreadActive) && (!Prcb->DpcThreadRequested)) + if (!(Prcb->DpcThreadActive) && !(Prcb->DpcThreadRequested)) { /* FIXME: Setup Threaded DPC */ ASSERT(FALSE); @@ -346,7 +345,7 @@ else { /* Make sure a DPC isn't executing already */ - if ((!Prcb->DpcRoutineActive) && (!Prcb->DpcInterruptRequested)) + if (!(Prcb->DpcRoutineActive) && !(Prcb->DpcInterruptRequested)) { /* Check if this is the same CPU */ if (Prcb != CurrentPrcb) Modified: trunk/reactos/ntoskrnl/ke/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/event.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ke/event.c (original) +++ trunk/reactos/ntoskrnl/ke/event.c Tue Jan 16 23:49:40 2007 @@ -237,7 +237,7 @@ KIRQL OldIrql; PKWAIT_BLOCK WaitBlock; PKTHREAD Thread = KeGetCurrentThread(), WaitThread; - ASSERT_EVENT(Event); + ASSERT(Event->Header.Type == SynchronizationEvent); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Acquire Dispatcher Database Lock */ @@ -275,14 +275,14 @@ if (WaitingThread) *WaitingThread = WaitThread; /* Calculate new priority */ - Thread->Priority = KiComputeNewPriority(Thread); + Thread->Priority = KiComputeNewPriority(Thread, 0); /* Unlink the waiting thread */ - KiUnlinkThread(WaitThread, STATUS_WAIT_0); + KiUnlinkThread(WaitThread, STATUS_SUCCESS); /* Request priority boosting */ WaitThread->AdjustIncrement = Thread->Priority; - WaitThread->AdjustReason = 2; + WaitThread->AdjustReason = AdjustBoost; /* Ready the thread */ KiReadyThread(WaitThread); Modified: trunk/reactos/ntoskrnl/ke/thrdobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdobj.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdobj.c Tue Jan 16 23:49:40 2007 @@ -134,7 +134,8 @@ if (PreviousCount) { /* Decrease count. If we are now zero, unwait it completely */ - if (--Thread->SuspendCount) + Thread->SuspendCount--; + if (!(Thread->SuspendCount) && !(Thread->FreezeCount)) { /* Signal and satisfy */ Thread->SuspendSemaphore.Header.SignalState++; @@ -171,8 +172,8 @@ { /* Check if the thread is alertable, and blocked in the given mode */ if ((Thread->State == Waiting) && - ((AlertMode == KernelMode) || (Thread->WaitMode == AlertMode)) && - (Thread->Alertable)) + (Thread->Alertable) && + (AlertMode <= Thread->WaitMode)) { /* Abort the wait to alert the thread */ KiUnwaitThread(Thread, STATUS_ALERTED, THREAD_ALERT_INCREMENT); @@ -260,7 +261,7 @@ /* Loop the Process's Threads */ ListHead = &Process->ThreadListHead; NextEntry = ListHead->Flink; - while (NextEntry != ListHead) + do { /* Get the current thread */ Current = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); @@ -307,14 +308,11 @@ /* Move to the next thread */ NextEntry = NextEntry->Flink; - } + } while (NextEntry != ListHead); /* Release the process lock and exit the dispatcher */ KiReleaseProcessLock(&LockHandle); KiExitDispatcher(LockHandle.OldIrql); - - /* Leave the critical region */ - KeLeaveCriticalRegion(); } ULONG @@ -367,6 +365,7 @@ PKTHREAD Thread = KeGetCurrentThread(); PLIST_ENTRY NextEntry, ListHead; PKMUTANT Mutant; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Optimized path if nothing is on the list at the moment */ if (IsListEmpty(&Thread->MutantListHead)) return; @@ -430,6 +429,7 @@ PKPROCESS Process = Thread->ApcState.Process; /* Setup static fields from parent */ + Thread->DisableBoost = Process->DisableBoost; Thread->Iopl = Process->Iopl; Thread->Quantum = Process->QuantumReset; Thread->QuantumReset = Process->QuantumReset; @@ -593,13 +593,10 @@ /* Lock the process */ KiAcquireProcessLock(Process, &LockHandle); - /* Enter a critical region */ - KeEnterCriticalRegion(); - /* Loop the Process's Threads */ ListHead = &Process->ThreadListHead; NextEntry = ListHead->Flink; - while (NextEntry != ListHead) + do { /* Get the current thread */ Current = CONTAINING_RECORD(NextEntry, KTHREAD, ThreadListEntry); @@ -634,7 +631,7 @@ /* Go to the next one */ NextEntry = NextEntry->Flink; - } + } while (NextEntry != ListHead); /* Release the process lock and exit the dispatcher */ KiReleaseProcessLock(&LockHandle); @@ -656,7 +653,6 @@ /* Lock the Dispatcher Database and the APC Queue */ KiAcquireApcLock(Thread, &ApcLock); - KiAcquireDispatcherLockAtDpcLevel(); /* Save the old State */ OldState = Thread->Alerted[AlertMode]; @@ -675,9 +671,7 @@ } /* Release Locks and return the Old State */ - KiReleaseDispatcherLockFromDpcLevel(); - KiReleaseApcLockFromDpcLevel(&ApcLock); - KiExitDispatcher(ApcLock.OldIrql); + KiReleaseApcLock(&ApcLock); return OldState; } @@ -718,7 +712,8 @@ Thread->EnableStackSwap = FALSE;//TRUE; Thread->IdealProcessor = 1; Thread->SwapBusy = FALSE; - Thread->AdjustReason = 0; + Thread->KernelStackResident = TRUE; + Thread->AdjustReason = AdjustNone; /* Initialize the lock */ KeInitializeSpinLock(&Thread->ThreadLock); @@ -1020,10 +1015,10 @@ OldIdealProcessor = Thread->UserIdealProcessor; /* Make sure a valid CPU was given */ - if (Processor < MAXIMUM_PROCESSORS) + if (Processor < KeNumberProcessors) { /* Check if the user ideal CPU is in the affinity */ - if (Thread->UserIdealProcessor & AFFINITY_MASK(Processor)) + if (Thread->Affinity & AFFINITY_MASK(Processor)) { /* Set the ideal processor */ Thread->IdealProcessor = Processor; @@ -1197,7 +1192,8 @@ else { /* Otherwise, calculate the new priority */ - Priority = KiComputeNewPriority(Thread); + Priority = KiComputeNewPriority(Thread, 0); + Priority += (BasePriority - OldBasePriority); /* Check if it entered the real-time range */ if (Priority >= LOW_REALTIME_PRIORITY) @@ -1205,6 +1201,11 @@ /* Normalize it down to the highest dynamic priority */ Priority = LOW_REALTIME_PRIORITY - 1; } + else if (Priority <= LOW_PRIORITY) + { + /* It went too low, normalize it */ + Priority = 1; + } } } @@ -1291,6 +1292,7 @@ ASSERT_THREAD(Thread); ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); ASSERT((Priority <= HIGH_PRIORITY) && (Priority >= LOW_PRIORITY)); + ASSERT(KeIsExecutingDpc() == FALSE); /* Lock the Dispatcher Database */ OldIrql = KiAcquireDispatcherLock(); @@ -1298,15 +1300,18 @@ /* Lock the thread */ KiAcquireThreadLock(Thread); - /* Save the old Priority */ + /* Save the old Priority and reset decrement */ OldPriority = Thread->Priority; + Thread->PriorityDecrement = 0; /* Make sure that an actual change is being done */ - if (OldPriority != Priority) - { - /* Reset the Quantum and Decrements */ + if (Priority != Thread->Priority) + { + /* Reset the quantum */ Thread->Quantum = Thread->QuantumReset; - Thread->PriorityDecrement = 0; + + /* Check if priority is being set too low and normalize if so */ + if ((Thread->BasePriority != 0) && !(Priority)) Priority = 1; /* Set the new Priority */ KiSetPriorityThread(Thread, Priority, &Released); @@ -1417,7 +1422,7 @@ ASSERT(Process->StackCount != 0); ASSERT(Process->State == ProcessInMemory); Process->StackCount--; - if (!Process->StackCount) + if (!(Process->StackCount) && !(IsListEmpty(&Process->ThreadListHead))) { /* FIXME: Swap stacks */ } Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c Tue Jan 16 23:49:40 2007 @@ -252,11 +252,15 @@ STDCALL KiAdjustQuantumThread(IN PKTHREAD Thread) { - KPRIORITY Priority; + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Acquire thread and PRCB lock */ + KiAcquireThreadLock(Thread); + KiAcquirePrcbLock(Prcb); /* Don't adjust for RT threads */ if ((Thread->Priority < LOW_REALTIME_PRIORITY) && - Thread->BasePriority < LOW_REALTIME_PRIORITY - 2) + (Thread->BasePriority < (LOW_REALTIME_PRIORITY - 2))) { /* Decrease Quantum by one and see if we've ran out */ if (--Thread->Quantum <= 0) @@ -265,46 +269,45 @@ Thread->Quantum = Thread->QuantumReset; /* Calculate new Priority */ - Priority = Thread->Priority - (Thread->PriorityDecrement + 1); - - /* Normalize it if we've gone too low */ - if (Priority < Thread->BasePriority) Priority = Thread->BasePriority; - - /* Reset the priority decrement, we've done it */ - Thread->PriorityDecrement = 0; - - /* Set the new priority, if needed */ - if (Priority != Thread->Priority) + Thread->Priority = KiComputeNewPriority(Thread, 1); + +#ifdef NEW_SCHEDULER + /* Check if there's no next thread scheduled */ + if (!Prcb->NextThread) { - /* - * FIXME: This should be a call to KiSetPriorityThread but - * due to the current ""scheduler"" in ROS, it can't be done - * cleanly since it actualyl dispatches threads instead. - */ - Thread->Priority = (SCHAR)Priority; + /* Select a new thread and set it on standby */ + NextThread = KiSelectNextThread(Prcb); + NextThread->State = Standby; + Prcb->NextThread = NextThread; } else { - /* FIXME: Priority hasn't changed, find a new thread */ - } - } - } - - /* Nothing to do... */ - return; + /* This thread can be preempted again */ + Thread->Preempted = FALSE; + } +#else + /* We need to dispatch a new thread */ + KiDispatchThread(Ready); +#endif + } + } + + /* Release locks */ + KiReleasePrcbLock(Prcb); + KiReleaseThreadLock(Thread); } VOID STDCALL -KiSetPriorityThread(PKTHREAD Thread, - KPRIORITY Priority, - PBOOLEAN Released) +KiSetPriorityThread(IN PKTHREAD Thread, + IN KPRIORITY Priority, + OUT PBOOLEAN Released) { KPRIORITY OldPriority = Thread->Priority; ULONG Mask; - int i; + ULONG i; PKPCR Pcr; - DPRINT("Changing prio to : %lx\n", Priority); + ASSERT((Priority >= 0) && (Priority <= HIGH_PRIORITY)); /* Check if priority changed */ if (OldPriority != Priority) @@ -459,3 +462,4 @@ return STATUS_SUCCESS; } +

1 0

[weiden] 25489: Fix difference in signedness warnings
by weiden＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: weiden Date: Tue Jan 16 21:55:06 2007 New Revision: 25489 URL: http://svn.reactos.org/svn/reactos?rev=25489&view=rev Log: Fix difference in signedness warnings Modified: trunk/reactos/ntoskrnl/ps/notify.c Modified: trunk/reactos/ntoskrnl/ps/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/notify.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/notify.c (original) +++ trunk/reactos/ntoskrnl/ps/notify.c Tue Jan 16 21:55:06 2007 @@ -60,7 +60,7 @@ CallBack)) { /* Decrement the number of routines */ - InterlockedDecrement(&PspProcessNotifyRoutineCount); + InterlockedDecrement((PLONG)&PspProcessNotifyRoutineCount); /* Dereference the block */ ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], @@ -97,7 +97,7 @@ NULL)) { /* Found and inserted into an empty slot, return */ - InterlockedIncrement(&PspProcessNotifyRoutineCount); + InterlockedIncrement((PLONG)&PspProcessNotifyRoutineCount); return STATUS_SUCCESS; } } @@ -149,7 +149,7 @@ CallBack)) { /* We removed it, now dereference the block */ - InterlockedDecrement(&PspLoadImageNotifyRoutineCount); + InterlockedDecrement((PLONG)&PspLoadImageNotifyRoutineCount); ExDereferenceCallBackBlock(&PspLoadImageNotifyRoutine[i], CallBack); @@ -195,7 +195,7 @@ NULL)) { /* Return success */ - InterlockedIncrement(&PspLoadImageNotifyRoutineCount); + InterlockedIncrement((PLONG)&PspLoadImageNotifyRoutineCount); PsImageNotifyEnabled = TRUE; return STATUS_SUCCESS; } @@ -233,7 +233,7 @@ CallBack)) { /* We removed it, now dereference the block */ - InterlockedDecrement(&PspThreadNotifyRoutineCount); + InterlockedDecrement((PLONG)&PspThreadNotifyRoutineCount); ExDereferenceCallBackBlock(&PspThreadNotifyRoutine[i], CallBack); @@ -279,7 +279,7 @@ NULL)) { /* Return success */ - InterlockedIncrement(&PspThreadNotifyRoutineCount); + InterlockedIncrement((PLONG)&PspThreadNotifyRoutineCount); return STATUS_SUCCESS; } }

1 0

[gedmurphy] 25488: improve cursor loading code
by gedmurphy＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: gedmurphy Date: Tue Jan 16 21:30:54 2007 New Revision: 25488 URL: http://svn.reactos.org/svn/reactos?rev=25488&view=rev Log: improve cursor loading code Modified: trunk/reactos/dll/win32/user32/windows/icon.c Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/i… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Tue Jan 16 21:30:54 2007 @@ -247,10 +247,10 @@ if (! fIcon) { wXHotspot = *(WORD*)pbIconBits; - pbIconBits+=sizeof(WORD); + pbIconBits += sizeof(WORD); wYHotspot = *(WORD*)pbIconBits; - pbIconBits+=sizeof(WORD); - cbIconBits-=2*sizeof(WORD); + pbIconBits += sizeof(WORD); + cbIconBits -= 2 * sizeof(WORD); } else { @@ -266,7 +266,7 @@ } memcpy(SafeIconImage, pbIconBits, cbIconBits); - /* take into acount the origonal height was for both the AND and XOR images */ + /* take into acount the original height was for both the AND and XOR images */ if(fIcon) SafeIconImage->icHeader.biHeight /= 2; @@ -326,7 +326,7 @@ return (HICON)0; } /* FIXME - does there really *have* to be a color bitmap? monochrome cursors don't have one */ - if(IconInfo->hbmColor && !GetObjectW(IconInfo->hbmColor, sizeof(BITMAP), &ColorBitmap)) + if(/*IconInfo->hbmColor &&*/ !GetObjectW(IconInfo->hbmColor, sizeof(BITMAP), &ColorBitmap)) { return (HICON)0; } @@ -526,39 +526,42 @@ int Height, int ColorBits) { - int i, MaxWidth, MaxHeight, cx, cy, Bits, BestEntry = -1; - - /* Double height to account for AND and XOR masks */ - Height *= 2; - - /* First find the largest one smaller than or equal to the requested size*/ - MaxWidth = MaxHeight = 0; + int i, cx, cy, Bits, BestBits = 0, BestEntry = -1; + UINT iTotalDiff, iXDiff=0, iYDiff=0, iColorDiff; + UINT iTempXDiff, iTempYDiff, iTempColorDiff; + + /* Find Best Fit */ + iTotalDiff = 0xFFFFFFFF; + iColorDiff = 0xFFFFFFFF; for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) { - if ((cx <= Width) && (cy <= Height) && - (cx > MaxWidth) && (cy > MaxHeight) && - (Bits == 1)) + iTempXDiff = abs(Width - cx); + iTempYDiff = abs(Height - cy); + + if(iTotalDiff > (iTempXDiff + iTempYDiff)) { - BestEntry = i; - MaxWidth = cx; - MaxHeight = cy; + iXDiff = iTempXDiff; + iYDiff = iTempYDiff; + iTotalDiff = iXDiff + iYDiff; } } - if (BestEntry != -1) - return BestEntry; - - /* Now find the smallest one larger than the requested size */ - MaxWidth = MaxHeight = 255; + + /* Find Best Colors for Best Fit */ for (i = 0; get_entry(dir, i, &cx, &cy, &Bits); i++ ) { - if (((cx < MaxWidth) && (cy < MaxHeight) && (Bits == 1)) || - (BestEntry == -1)) + if(abs(Width - cx) == iXDiff && abs(Height - cy) == iYDiff) { - BestEntry = i; - MaxWidth = cx; - MaxHeight = cy; + iTempColorDiff = abs(ColorBits - Bits); + if(iColorDiff > iTempColorDiff) + { + BestEntry = i; + BestBits = Bits; + iColorDiff = iTempColorDiff; + } } } + + DPRINT("Best Cursor: ResId: %d, bits : %d\n", BestEntry, BestBits); return BestEntry; }

1 0

[fireball] 25487: - Sync desk.cpl with trunk
by fireball＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: fireball Date: Tue Jan 16 20:46:06 2007 New Revision: 25487 URL: http://svn.reactos.org/svn/reactos?rev=25487&view=rev Log: - Sync desk.cpl with trunk Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Fr.rc Tue Jan 16 20:46:06 2007 @@ -60,8 +60,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Vide pour l'instant....",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/It.rc Tue Jan 16 20:46:06 2007 @@ -53,8 +53,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Questo spazio è stato intenzionalmente lasciato in bianco.",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -133,3 +133,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ja.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "±±ÍÓ}IÉó¯½ÜÜÉµÄ èÜ·",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -137,3 +137,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Ru.rc Tue Jan 16 20:46:06 2007 @@ -56,7 +56,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Íàñòðîéêè âðåìåííî îòñóòñâóþò",IDC_STATIC,65,150,114,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX 0, 0, 246, 188 @@ -147,3 +148,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/Uk.rc Tue Jan 16 20:46:06 2007 @@ -61,8 +61,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Öå ì³ñöå íàâìèñíî çàëèøåíå ïóñòèì",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -141,3 +141,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/appearance.c Tue Jan 16 20:46:06 2007 @@ -9,6 +9,23 @@ */ #include "desk.h" + + +static VOID +OnInitDialog(HWND hwndDlg) +{ + TCHAR szBuffer[256]; + UINT i; + + for (i = IDS_ITEM_FIRST; i < IDS_ITEM_LAST; i++) + { + LoadString(hApplet, i, szBuffer, 256); + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_ADDSTRING, 0, (LPARAM)szBuffer); + } + + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, 2, 0); +} + INT_PTR CALLBACK AppearancePageProc(HWND hwndDlg, @@ -23,9 +40,14 @@ switch (uMsg) { case WM_INITDIALOG: + OnInitDialog(hwndDlg); break; case WM_COMMAND: + break; + + case WM_USER: + SendDlgItemMessage(hwndDlg, IDC_APPEARANCE_UI_ITEM, CB_SETCURSEL, lParam, 0); break; } Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/cz.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -131,3 +131,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/de.rc Tue Jan 16 20:46:06 2007 @@ -55,9 +55,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 228 @@ -135,3 +134,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D-Objekte" + IDS_ITEM_SCROLLBAR "Bildlaufleiste" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Dialogfeld" + IDS_ITEM_WINDOW "Fenster" + IDS_ITEM_APP_BACKGROUND "Hintergrund der Anwendung" + IDS_ITEM_SELECTED_ITEMS "Markierte Elemente" + IDS_ITEM_MENU "Menü" + IDS_ITEM_PALETTE_TITLE "Palettentitel" + IDS_ITEM_TOOLTIP "Quickinfo" + IDS_ITEM_INACTIVE_WINDOW "Rahmen der inaktiven Fenster" + IDS_ITEM_ACTIVE_WINDOW "Rahmen der aktiven Fenster" + IDS_ITEM_ICON "Symbol" + IDS_ITEM_ICON_SPACE_HORZ "Symbolabstand (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Symbolabstand (Vertikal)" + IDS_ITEM_INACTIVE_TITLE "Titelleiste des inaktiven Fensters" + IDS_ITEM_ACTIVE_TITLE "Titelleiste des aktiven Fensters" + IDS_ITEM_CAPTION_BUTTONS "Titelleistenschaltfläche" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/en.rc Tue Jan 16 20:46:06 2007 @@ -53,8 +53,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -133,3 +133,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/es.rc Tue Jan 16 20:46:06 2007 @@ -64,8 +64,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Este espacio se ha dejado en blanco intencionadamente",IDC_STATIC,33, - 150,181,10 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -138,3 +138,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/gr.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -137,3 +137,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/hu.rc Tue Jan 16 20:46:06 2007 @@ -49,7 +49,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Ez a terület szándékosan lett üresen hagyva",IDC_STATIC,66,150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -125,3 +126,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/nl.rc Tue Jan 16 20:46:06 2007 @@ -57,8 +57,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "This space is intentionally left blank",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -131,3 +131,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/pl.rc Tue Jan 16 20:46:06 2007 @@ -58,8 +58,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "To miejsce pozosta³o celowo puste",IDC_STATIC,66, - 150,112,8 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -132,3 +132,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.c Tue Jan 16 20:46:06 2007 @@ -3,7 +3,7 @@ * LICENSE: GPL - See COPYING in the top level directory * FILE: lib/cpl/desk/preview.c * PURPOSE: Draws the preview control - * COPYRIGHT: Copyright 2006 Eric Kohl + * COPYRIGHT: Copyright 2006, 2007 Eric Kohl */ #include "desk.h" @@ -13,6 +13,8 @@ typedef struct _PREVIEW_DATA { + HWND hwndParent; + DWORD clrDesktop; HBRUSH hbrDesktop; @@ -35,15 +37,19 @@ RECT rcDesktop; RECT rcInactiveFrame; RECT rcInactiveCaption; + RECT rcInactiveCaptionButtons; RECT rcActiveFrame; RECT rcActiveCaption; + RECT rcActiveCaptionButtons; RECT rcActiveMenuBar; + RECT rcSelectedMenuItem; RECT rcActiveClient; RECT rcActiveScroll; RECT rcDialogFrame; RECT rcDialogCaption; + RECT rcDialogCaptionButtons; RECT rcDialogClient; RECT rcDialogButton; @@ -176,6 +182,9 @@ HiliteMenuItem(hwnd, pPreviewData->hMenu, ID_MENU_SELECTED, MF_BYCOMMAND | MF_HILITE); +// GetMenuItemRect(hwnd, pPreviewData->hMenu, +// ID_MENU_SELECTED, &pPreviewData->rcSelectedMenuItem); + AllocAndLoadString(&pPreviewData->lpInAct, hApplet, IDS_INACTWIN); AllocAndLoadString(&pPreviewData->lpAct, hApplet, IDS_ACTWIN); @@ -209,6 +218,12 @@ pPreviewData->rcInactiveCaption.right = pPreviewData->rcInactiveFrame.right - pPreviewData->cxEdge - 1/*3*/ - 1; pPreviewData->rcInactiveCaption.bottom = pPreviewData->rcInactiveFrame.top + pPreviewData->cyCaption /*20*/ + 2; + /* Calculate the inactive caption buttons rectangle */ + pPreviewData->rcInactiveCaptionButtons.left = pPreviewData->rcInactiveCaption.right - 2 - 2 - 3 * 16; + pPreviewData->rcInactiveCaptionButtons.top = pPreviewData->rcInactiveCaption.top + 2; + pPreviewData->rcInactiveCaptionButtons.right = pPreviewData->rcInactiveCaption.right - 2; + pPreviewData->rcInactiveCaptionButtons.bottom = pPreviewData->rcInactiveCaption.bottom - 2; + /* Calculate the active window rectangle */ pPreviewData->rcActiveFrame.left = pPreviewData->rcInactiveFrame.left + 3 + 1; pPreviewData->rcActiveFrame.top = pPreviewData->rcInactiveCaption.bottom + 1; @@ -221,6 +236,12 @@ pPreviewData->rcActiveCaption.right = pPreviewData->rcActiveFrame.right - 3 - 1; pPreviewData->rcActiveCaption.bottom = pPreviewData->rcActiveFrame.top + pPreviewData->cyCaption/*20*/ + 2; + /* Calculate the active caption buttons rectangle */ + pPreviewData->rcActiveCaptionButtons.left = pPreviewData->rcActiveCaption.right - 2 - 2 - 3 * 16; + pPreviewData->rcActiveCaptionButtons.top = pPreviewData->rcActiveCaption.top + 2; + pPreviewData->rcActiveCaptionButtons.right = pPreviewData->rcActiveCaption.right - 2; + pPreviewData->rcActiveCaptionButtons.bottom = pPreviewData->rcActiveCaption.bottom - 2; + /* Calculate the active menu bar rectangle */ pPreviewData->rcActiveMenuBar.left = pPreviewData->rcActiveFrame.left + 3 + 1; pPreviewData->rcActiveMenuBar.top = pPreviewData->rcActiveCaption.bottom + 1; @@ -251,6 +272,12 @@ pPreviewData->rcDialogCaption.top = pPreviewData->rcDialogFrame.top + 3; pPreviewData->rcDialogCaption.right = pPreviewData->rcDialogFrame.right - 3; pPreviewData->rcDialogCaption.bottom = pPreviewData->rcDialogFrame.top + 20 + 1; + + /* Calculate the inactive caption buttons rectangle */ + pPreviewData->rcDialogCaptionButtons.left = pPreviewData->rcDialogCaption.right - 2 - 16; + pPreviewData->rcDialogCaptionButtons.top = pPreviewData->rcDialogCaption.top + 2; + pPreviewData->rcDialogCaptionButtons.right = pPreviewData->rcDialogCaption.right - 2; + pPreviewData->rcDialogCaptionButtons.bottom = pPreviewData->rcDialogCaption.bottom - 2; /* Calculate the dialog client rectangle */ pPreviewData->rcDialogClient.left = pPreviewData->rcDialogFrame.left + 3; @@ -348,6 +375,61 @@ static VOID +OnLButtonDown(HWND hwnd, int xPos, int yPos, PPREVIEW_DATA pPreviewData) +{ + UINT type = IDX_DESKTOP; + POINT pt; + + pt.x = xPos; + pt.y = yPos; + + if (PtInRect(&pPreviewData->rcInactiveFrame, pt)) + type = IDX_INACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcInactiveCaption, pt)) + type = IDX_INACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcInactiveCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcActiveFrame, pt)) + type = IDX_ACTIVE_BORDER; + + if (PtInRect(&pPreviewData->rcActiveCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcActiveCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcActiveMenuBar, pt)) + type = IDX_MENU; + +// if (PtInRect(&pPreviewData->rcSelectedMenuItem, pt)) +// type = IDX_SELECTION; + + if (PtInRect(&pPreviewData->rcActiveClient, pt)) + type = IDX_WINDOW; + + if (PtInRect(&pPreviewData->rcActiveScroll, pt)) + type = IDX_SCROLLBAR; + + if (PtInRect(&pPreviewData->rcDialogFrame, pt)) + type = IDX_DIALOG; + + if (PtInRect(&pPreviewData->rcDialogCaption, pt)) + type = IDX_ACTIVE_CAPTION; + + if (PtInRect(&pPreviewData->rcDialogCaptionButtons, pt)) + type = IDX_CAPTION_BUTTON; + + if (PtInRect(&pPreviewData->rcDialogButton, pt)) + type = IDX_3D_OBJECTS; + + SendMessage(GetParent(hwnd), WM_USER, 0, type); +} + + +static VOID OnDestroy(PPREVIEW_DATA pPreviewData) { DeleteObject(pPreviewData->hbrScrollbar); @@ -400,6 +482,10 @@ OnPaint(hwnd, pPreviewData); break; + case WM_LBUTTONDOWN: + OnLButtonDown(hwnd, LOWORD(lParam), HIWORD(lParam), pPreviewData); + break; + case WM_DESTROY: OnDestroy(pPreviewData); HeapFree(GetProcessHeap(), 0, pPreviewData); Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/preview.h Tue Jan 16 20:46:06 2007 @@ -1,3 +1,20 @@ + +#define IDX_3D_OBJECTS 0 +#define IDX_SCROLLBAR 1 +#define IDX_DESKTOP 2 +#define IDX_DIALOG 3 +#define IDX_WINDOW 4 +#define IDX_APPSPACE 5 +#define IDX_SELECTION 6 +#define IDX_MENU 7 + +#define IDX_QUICKINFO 9 +#define IDX_INACTIVE_BORDER 10 +#define IDX_ACTIVE_BORDER 11 + +#define IDX_INACTIVE_CAPTION 15 +#define IDX_ACTIVE_CAPTION 16 +#define IDX_CAPTION_BUTTON 17 BOOL RegisterPreviewControl(IN HINSTANCE hInstance); Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/resource.h Tue Jan 16 20:46:06 2007 @@ -84,7 +84,8 @@ /* Appearance Page */ -#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_PREVIEW 1500 +#define IDC_APPEARANCE_UI_ITEM 1501 #define IDS_INACTWIN 1510 #define IDS_ACTWIN 1511 @@ -93,6 +94,29 @@ #define IDS_MESSTEXT 1514 #define IDS_BUTTEXT 1515 +#define IDS_ITEM_3D_OBJECTS 1601 +#define IDS_ITEM_SCROLLBAR 1602 +#define IDS_ITEM_DESKTOP 1603 +#define IDS_ITEM_MESSAGE_BOX 1604 +#define IDS_ITEM_WINDOW 1605 +#define IDS_ITEM_APP_BACKGROUND 1606 +#define IDS_ITEM_SELECTED_ITEMS 1607 +#define IDS_ITEM_MENU 1608 +#define IDS_ITEM_PALETTE_TITLE 1609 +#define IDS_ITEM_TOOLTIP 1610 +#define IDS_ITEM_INACTIVE_WINDOW 1611 +#define IDS_ITEM_ACTIVE_WINDOW 1612 +#define IDS_ITEM_ICON 1613 +#define IDS_ITEM_ICON_SPACE_HORZ 1614 +#define IDS_ITEM_ICON_SPACE_VERT 1615 +#define IDS_ITEM_INACTIVE_TITLE 1616 +#define IDS_ITEM_ACTIVE_TITLE 1617 +#define IDS_ITEM_CAPTION_BUTTONS 1618 + +/* Update these IDs when you change the string id list */ +#define IDS_ITEM_FIRST (IDS_ITEM_3D_OBJECTS) +#define IDS_ITEM_LAST (IDS_ITEM_CAPTION_BUTTONS + 1) + #endif /* __CPL_DESK_RESOURCE_H__ */ Modified: branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/cp… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc (original) +++ branches/ros-branch-0_3_1/reactos/dll/cpl/desk/sv.rc Tue Jan 16 20:46:06 2007 @@ -60,8 +60,8 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Det här utrymmet har avsiktligt\nlämnats tomt",IDC_STATIC,66, - 150,112,20 + LTEXT "Item:", IDC_STATIC, 7, 159, 26, 9 + COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP END IDD_SETTINGS DIALOGEX DISCARDABLE 0, 0, 246, 188 @@ -134,3 +134,25 @@ IDS_MESSTEXT "Message Text" IDS_BUTTEXT "OK" END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_ITEM_3D_OBJECTS "3D Objects" + IDS_ITEM_SCROLLBAR "Scrollbar" + IDS_ITEM_DESKTOP "Desktop" + IDS_ITEM_MESSAGE_BOX "Message Box" + IDS_ITEM_WINDOW "Window" + IDS_ITEM_APP_BACKGROUND "Application Background" + IDS_ITEM_SELECTED_ITEMS "Selected Items" + IDS_ITEM_MENU "Menu" + IDS_ITEM_PALETTE_TITLE "Palette Title" + IDS_ITEM_TOOLTIP "Tooltip" + IDS_ITEM_INACTIVE_WINDOW "Inactive Window Border" + IDS_ITEM_ACTIVE_WINDOW "Active Window Border" + IDS_ITEM_ICON "Icon" + IDS_ITEM_ICON_SPACE_HORZ "Icon Spacing (Horizontal)" + IDS_ITEM_ICON_SPACE_VERT "Icon Spacing (Vertical)" + IDS_ITEM_INACTIVE_TITLE "Inactive Title Bar" + IDS_ITEM_ACTIVE_TITLE "Active Title Bar" + IDS_ITEM_CAPTION_BUTTONS "Caption Buttons" +END

1 0

[ion] 25486: - Reimplement Process/Thread/Image notification callbacks by using the new executive lightweight callback implementation. - Remove corresponding entry from kernel fun.
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 18:09:53 2007 New Revision: 25486 URL: http://svn.reactos.org/svn/reactos?rev=25486&view=rev Log: - Reimplement Process/Thread/Image notification callbacks by using the new executive lightweight callback implementation. - Remove corresponding entry from kernel fun. Modified: trunk/reactos/ntoskrnl/KrnlFun.c trunk/reactos/ntoskrnl/ex/callback.c trunk/reactos/ntoskrnl/include/internal/ex.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/include/internal/ps_x.h trunk/reactos/ntoskrnl/ps/notify.c Modified: trunk/reactos/ntoskrnl/KrnlFun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/KrnlFun.c?rev=254… ============================================================================== --- trunk/reactos/ntoskrnl/KrnlFun.c (original) +++ trunk/reactos/ntoskrnl/KrnlFun.c Tue Jan 16 18:09:53 2007 @@ -9,7 +9,6 @@ // Failure to respect this will *ACHIEVE NOTHING*. // // Ex: -// - Implement Generic Callback mechanism. // - Use pushlocks for handle implementation. // // Ke1: Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Tue Jan 16 18:09:53 2007 @@ -230,31 +230,6 @@ return CallbackRoutineBlock; } -VOID -NTAPI // FIXME: FORCEINLINE AFTER TESTING! -ExDoCallBack(IN OUT PEX_CALLBACK Callback, - IN PVOID Context, - IN PVOID Argument1, - IN PVOID Argument2) -{ - PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock; - PEX_CALLBACK_FUNCTION Function; - - /* Reference the block */ - CallbackRoutineBlock = ExReferenceCallBackBlock(Callback); - if (CallbackRoutineBlock) - { - /* Get the function */ - Function = ExGetCallBackBlockRoutine(CallbackRoutineBlock); - - /* Do the callback */ - Function(Context, Argument1, Argument2); - - /* Now dereference it */ - ExDereferenceCallBackBlock(Callback, CallbackRoutineBlock); - } -} - BOOLEAN NTAPI ExCompareExchangeCallBack(IN OUT PEX_CALLBACK CallBack, Modified: trunk/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ex.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ex.h Tue Jan 16 18:09:53 2007 @@ -169,7 +169,59 @@ VOID NTAPI ExInitializeCallBack( - IN PEX_CALLBACK Callback + IN OUT PEX_CALLBACK Callback +); + +PEX_CALLBACK_ROUTINE_BLOCK +NTAPI +ExAllocateCallBack( + IN PEX_CALLBACK_FUNCTION Function, + IN PVOID Context +); + +VOID +NTAPI +ExFreeCallBack( + IN PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock +); + +BOOLEAN +NTAPI +ExCompareExchangeCallBack ( + IN OUT PEX_CALLBACK CallBack, + IN PEX_CALLBACK_ROUTINE_BLOCK NewBlock, + IN PEX_CALLBACK_ROUTINE_BLOCK OldBlock +); + +PEX_CALLBACK_ROUTINE_BLOCK +NTAPI +ExReferenceCallBackBlock( + IN OUT PEX_CALLBACK CallBack +); + +VOID +NTAPI +ExDereferenceCallBackBlock( + IN OUT PEX_CALLBACK CallBack, + IN PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock +); + +PEX_CALLBACK_FUNCTION +NTAPI +ExGetCallBackBlockRoutine( + IN PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock +); + +PVOID +NTAPI +ExGetCallBackBlockContext( + IN PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock +); + +VOID +NTAPI +ExWaitForCallBacks( + IN PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock ); /* Rundown Functions ********************************************************/ @@ -336,6 +388,33 @@ static __inline _SEH_FILTER(_SEH_ExSystemExceptionFilter) { return ExSystemExceptionFilter(); +} + +/* CALLBACKS *****************************************************************/ + +VOID +FORCEINLINE +ExDoCallBack(IN OUT PEX_CALLBACK Callback, + IN PVOID Context, + IN PVOID Argument1, + IN PVOID Argument2) +{ + PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock; + PEX_CALLBACK_FUNCTION Function; + + /* Reference the block */ + CallbackRoutineBlock = ExReferenceCallBackBlock(Callback); + if (CallbackRoutineBlock) + { + /* Get the function */ + Function = ExGetCallBackBlockRoutine(CallbackRoutineBlock); + + /* Do the callback */ + Function(Context, Argument1, Argument2); + + /* Now dereference it */ + ExDereferenceCallBackBlock(Callback, CallbackRoutineBlock); + } } /* RUNDOWN *******************************************************************/ Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h Tue Jan 16 18:09:53 2007 @@ -365,14 +365,11 @@ extern LARGE_INTEGER ShortPsLockDelay; extern EPROCESS_QUOTA_BLOCK PspDefaultQuotaBlock; extern PHANDLE_TABLE PspCidTable; -extern PCREATE_THREAD_NOTIFY_ROUTINE -PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; -extern PCREATE_PROCESS_NOTIFY_ROUTINE -PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; -extern PLOAD_IMAGE_NOTIFY_ROUTINE -PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; +extern EX_CALLBACK PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; +extern EX_CALLBACK PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; +extern EX_CALLBACK PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; extern PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; -extern ULONG PspThreadNotifyRoutineCount; +extern ULONG PspThreadNotifyRoutineCount, PspProcessNotifyRoutineCount; extern BOOLEAN PsImageNotifyEnabled; extern PKWIN32_PROCESS_CALLOUT PspW32ProcessCallout; extern PKWIN32_THREAD_CALLOUT PspW32ThreadCallout; Modified: trunk/reactos/ntoskrnl/include/internal/ps_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps_x.h (original) +++ trunk/reactos/ntoskrnl/include/internal/ps_x.h Tue Jan 16 18:09:53 2007 @@ -33,13 +33,19 @@ IN BOOLEAN Create) { ULONG i; - CLIENT_ID Cid = CurrentThread->Cid; - /* Loop the notify routines */ - for (i = 0; i < PspThreadNotifyRoutineCount; i++) + /* Check if we have registered routines */ + if (PspThreadNotifyRoutineCount) { - /* Call it */ - PspThreadNotifyRoutine[i](Cid.UniqueProcess, Cid.UniqueThread, Create); + /* Loop callbacks */ + for (i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) + { + /* Do the callback */ + ExDoCallBack(&PspThreadNotifyRoutine[i], + CurrentThread->Cid.UniqueProcess, + CurrentThread->Cid.UniqueThread, + (PVOID)(ULONG_PTR)Create); + } } } @@ -49,17 +55,18 @@ IN BOOLEAN Create) { ULONG i; - HANDLE ProcessId = (HANDLE)CurrentProcess->UniqueProcessId; - HANDLE ParentId = CurrentProcess->InheritedFromUniqueProcessId; - /* Loop the notify routines */ - for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; ++i) + /* Check if we have registered routines */ + if (PspProcessNotifyRoutineCount) { - /* Make sure it exists */ - if(PspProcessNotifyRoutine[i]) + /* Loop callbacks */ + for (i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) { - /* Call it */ - PspProcessNotifyRoutine[i](ParentId, ProcessId, Create); + /* Do the callback */ + ExDoCallBack(&PspProcessNotifyRoutine[i], + CurrentProcess->InheritedFromUniqueProcessId, + (PVOID)(ULONG_PTR)Create, + NULL); } } } @@ -75,12 +82,11 @@ /* Loop the notify routines */ for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; ++ i) { - /* Make sure it exists */ - if (PspLoadImageNotifyRoutine[i]) - { - /* Call it */ - PspLoadImageNotifyRoutine[i](FullImageName, ProcessId, ImageInfo); - } + /* Do the callback */ + ExDoCallBack(&PspLoadImageNotifyRoutine[i], + FullImageName, + ProcessId, + ImageInfo); } } Modified: trunk/reactos/ntoskrnl/ps/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/notify.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ps/notify.c (original) +++ trunk/reactos/ntoskrnl/ps/notify.c Tue Jan 16 18:09:53 2007 @@ -15,14 +15,12 @@ /* GLOBALS *******************************************************************/ -BOOLEAN PsImageNotifyEnabled = TRUE; -ULONG PspThreadNotifyRoutineCount; -PCREATE_THREAD_NOTIFY_ROUTINE -PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; -PCREATE_PROCESS_NOTIFY_ROUTINE -PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; -PLOAD_IMAGE_NOTIFY_ROUTINE -PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; +BOOLEAN PsImageNotifyEnabled = FALSE; +ULONG PspThreadNotifyRoutineCount, PspProcessNotifyRoutineCount; +ULONG PspLoadImageNotifyRoutineCount; +EX_CALLBACK PspThreadNotifyRoutine[PSP_MAX_CREATE_THREAD_NOTIFY]; +EX_CALLBACK PspProcessNotifyRoutine[PSP_MAX_CREATE_PROCESS_NOTIFY]; +EX_CALLBACK PspLoadImageNotifyRoutine[PSP_MAX_LOAD_IMAGE_NOTIFY]; PLEGO_NOTIFY_ROUTINE PspLegoNotifyRoutine; /* PUBLIC FUNCTIONS **********************************************************/ @@ -36,39 +34,78 @@ IN BOOLEAN Remove) { ULONG i; - - /* Check if it's a removal or addition */ + PEX_CALLBACK_ROUTINE_BLOCK CallBack; + PAGED_CODE(); + + /* Check if we're removing */ if (Remove) { - /* Loop the routines */ - for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) - { - /* Check for a match */ - if (PspProcessNotifyRoutine[i] == NotifyRoutine) - { - /* Remove and return */ - PspProcessNotifyRoutine[i] = NULL; + /* Loop all the routines */ + for (i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) + { + /* Reference the callback block */ + CallBack = ExReferenceCallBackBlock(&PspProcessNotifyRoutine[i]); + if (!CallBack) continue; + + /* Check it this is a matching block */ + if (ExGetCallBackBlockRoutine(CallBack) != (PVOID)NotifyRoutine) + { + /* It's not, try the next one */ + continue; + } + + /* It is, clear the current routine */ + if (ExCompareExchangeCallBack(&PspProcessNotifyRoutine[i], + NULL, + CallBack)) + { + /* Decrement the number of routines */ + InterlockedDecrement(&PspProcessNotifyRoutineCount); + + /* Dereference the block */ + ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], + CallBack); + + /* Wait for actice callbacks */ + ExWaitForCallBacks(CallBack); + + /* Free the callback and exit */ + ExFreeCallBack (CallBack); return STATUS_SUCCESS; } - } + + /* Dereference the block */ + ExDereferenceCallBackBlock(&PspProcessNotifyRoutine[i], + CallBack); + } + + /* We didn't find any matching block */ + return STATUS_PROCEDURE_NOT_FOUND; } else { - /* Loop the routines */ - for(i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) - { - /* Find an empty one */ - if (!PspProcessNotifyRoutine[i]) - { - /* Add it */ - PspProcessNotifyRoutine[i] = NotifyRoutine; + /* Allocate a callback */ + CallBack = ExAllocateCallBack((PVOID)NotifyRoutine, NULL); + if (!CallBack) return STATUS_INSUFFICIENT_RESOURCES; + + /* Loop all callbacks */ + for (i = 0; i < PSP_MAX_CREATE_PROCESS_NOTIFY; i++) + { + /* Add this routine if it's an empty slot */ + if (ExCompareExchangeCallBack(&PspProcessNotifyRoutine[i], + CallBack, + NULL)) + { + /* Found and inserted into an empty slot, return */ + InterlockedIncrement(&PspProcessNotifyRoutineCount); return STATUS_SUCCESS; } } - } - - /* Nothing found */ - return Remove ? STATUS_PROCEDURE_NOT_FOUND : STATUS_INVALID_PARAMETER; + + /* We didn't find a free slot, free the callback and fail */ + ExFreeCallBack(CallBack); + return STATUS_INVALID_PARAMETER; + } } /* @@ -93,90 +130,163 @@ PsRemoveLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) { ULONG i; - - /* Loop the routines */ - for(i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) - { - /* Check for a match */ - if (PspLoadImageNotifyRoutine[i] == NotifyRoutine) - { - /* Remove and return */ - PspLoadImageNotifyRoutine[i] = NULL; + PEX_CALLBACK_ROUTINE_BLOCK CallBack; + PAGED_CODE(); + + /* Loop all callbacks */ + for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) + { + /* Reference this slot */ + CallBack = ExReferenceCallBackBlock(&PspLoadImageNotifyRoutine[i]); + if (CallBack) + { + /* Check for a match */ + if (ExGetCallBackBlockRoutine(CallBack) == (PVOID)NotifyRoutine) + { + /* Try removing it if it matches */ + if (ExCompareExchangeCallBack(&PspLoadImageNotifyRoutine[i], + NULL, + CallBack)) + { + /* We removed it, now dereference the block */ + InterlockedDecrement(&PspLoadImageNotifyRoutineCount); + ExDereferenceCallBackBlock(&PspLoadImageNotifyRoutine[i], + CallBack); + + /* Wait for active callbacks */ + ExWaitForCallBacks(CallBack); + + /* Free the callback and return */ + ExFreeCallBack(CallBack); + return STATUS_SUCCESS; + } + } + + /* Dereference the callback */ + ExDereferenceCallBackBlock(&PspLoadImageNotifyRoutine[i], CallBack); + } + } + + /* Nothing found to remove */ + return STATUS_PROCEDURE_NOT_FOUND; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsSetLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) +{ + ULONG i; + PEX_CALLBACK_ROUTINE_BLOCK CallBack; + PAGED_CODE(); + + /* Allocate a callback */ + CallBack = ExAllocateCallBack((PVOID)NotifyRoutine, NULL); + if (!CallBack) return STATUS_INSUFFICIENT_RESOURCES; + + /* Loop callbacks */ + for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) + { + /* Add this entry if the slot is empty */ + if (ExCompareExchangeCallBack(&PspLoadImageNotifyRoutine[i], + CallBack, + NULL)) + { + /* Return success */ + InterlockedIncrement(&PspLoadImageNotifyRoutineCount); + PsImageNotifyEnabled = TRUE; return STATUS_SUCCESS; } } - /* Nothing found */ - return STATUS_INVALID_PARAMETER; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsSetLoadImageNotifyRoutine(IN PLOAD_IMAGE_NOTIFY_ROUTINE NotifyRoutine) -{ - ULONG i; - - /* Loop the routines */ - for (i = 0; i < PSP_MAX_LOAD_IMAGE_NOTIFY; i++) - { - /* Find an empty one */ - if (!PspLoadImageNotifyRoutine[i]) - { - /* Add it */ - PspLoadImageNotifyRoutine[i] = NotifyRoutine; + /* No free space found, fail */ + ExFreeCallBack(CallBack); + return STATUS_INSUFFICIENT_RESOURCES; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsRemoveCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) +{ + ULONG i; + PEX_CALLBACK_ROUTINE_BLOCK CallBack; + PAGED_CODE(); + + /* Loop all callbacks */ + for (i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) + { + /* Reference this slot */ + CallBack = ExReferenceCallBackBlock(&PspThreadNotifyRoutine[i]); + if (CallBack) + { + /* Check for a match */ + if (ExGetCallBackBlockRoutine(CallBack) == (PVOID)NotifyRoutine) + { + /* Try removing it if it matches */ + if (ExCompareExchangeCallBack(&PspThreadNotifyRoutine[i], + NULL, + CallBack)) + { + /* We removed it, now dereference the block */ + InterlockedDecrement(&PspThreadNotifyRoutineCount); + ExDereferenceCallBackBlock(&PspThreadNotifyRoutine[i], + CallBack); + + /* Wait for active callbacks */ + ExWaitForCallBacks(CallBack); + + /* Free the callback and return */ + ExFreeCallBack(CallBack); + return STATUS_SUCCESS; + } + } + + /* Dereference the callback */ + ExDereferenceCallBackBlock(&PspThreadNotifyRoutine[i], CallBack); + } + } + + /* Nothing found to remove */ + return STATUS_PROCEDURE_NOT_FOUND; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +PsSetCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) +{ + ULONG i; + PEX_CALLBACK_ROUTINE_BLOCK CallBack; + PAGED_CODE(); + + /* Allocate a callback */ + CallBack = ExAllocateCallBack((PVOID)NotifyRoutine, NULL); + if (!CallBack) return STATUS_INSUFFICIENT_RESOURCES; + + /* Loop callbacks */ + for (i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) + { + /* Add this entry if the slot is empty */ + if (ExCompareExchangeCallBack(&PspThreadNotifyRoutine[i], + CallBack, + NULL)) + { + /* Return success */ + InterlockedIncrement(&PspThreadNotifyRoutineCount); return STATUS_SUCCESS; } } - /* Nothing found */ - return STATUS_INVALID_PARAMETER; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsRemoveCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) -{ - ULONG i; - - /* Loop the routines */ - for(i = 0; i < PSP_MAX_CREATE_THREAD_NOTIFY; i++) - { - /* Check for a match */ - if (PspThreadNotifyRoutine[i] == NotifyRoutine) - { - /* Remove and return */ - PspThreadNotifyRoutine[i] = NULL; - return STATUS_SUCCESS; - } - } - - /* Nothing found */ - return STATUS_INVALID_PARAMETER; -} - -/* - * @implemented - */ -NTSTATUS -NTAPI -PsSetCreateThreadNotifyRoutine(IN PCREATE_THREAD_NOTIFY_ROUTINE NotifyRoutine) -{ - /* Make sure we didn't register too many */ - if (PspThreadNotifyRoutineCount >= PSP_MAX_CREATE_THREAD_NOTIFY) - { - /* Fail */ - return STATUS_INSUFFICIENT_RESOURCES; - } - - /* Register this one */ - PspThreadNotifyRoutine[PspThreadNotifyRoutineCount++] = NotifyRoutine; - return STATUS_SUCCESS; + /* No free space found, fail */ + ExFreeCallBack(CallBack); + return STATUS_INSUFFICIENT_RESOURCES; } /* EOF */

1 0

[ion] 25485: - Implement ExCompareExchangeCallBack. The CallBack implementation is now ready for testing.
by ion＠svn.reactos.org 16 Jan '07

16 Jan '07

Author: ion Date: Tue Jan 16 17:20:19 2007 New Revision: 25485 URL: http://svn.reactos.org/svn/reactos?rev=25485&view=rev Log: - Implement ExCompareExchangeCallBack. The CallBack implementation is now ready for testing. Modified: trunk/reactos/ntoskrnl/ex/callback.c Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Tue Jan 16 17:20:19 2007 @@ -37,6 +37,7 @@ POBJECT_TYPE ExCallbackObjectType; KEVENT ExpCallbackEvent; +EX_PUSH_LOCK ExpCallBackFlush; /* PRIVATE FUNCTIONS *********************************************************/ @@ -254,6 +255,98 @@ } } +BOOLEAN +NTAPI +ExCompareExchangeCallBack(IN OUT PEX_CALLBACK CallBack, + IN PEX_CALLBACK_ROUTINE_BLOCK NewBlock, + IN PEX_CALLBACK_ROUTINE_BLOCK OldBlock) +{ + EX_FAST_REF Value, NewValue; + PEX_CALLBACK_ROUTINE_BLOCK CallbackRoutineBlock; + PEX_FAST_REF FastRef = &CallBack->RoutineBlock; + + /* Check that we have a new block */ + if (NewBlock) + { + /* Acquire rundown */ + if (!ExfAcquireRundownProtectionEx(&NewBlock->RundownProtect, + MAX_FAST_REFS + 1)) + { + /* This should never happen */ + ASSERTMSG("Callback block is already undergoing rundown", FALSE); + return FALSE; + } + } + + /* Sanity check and start swap loop */ + ASSERT(!(((ULONG_PTR)NewBlock) & MAX_FAST_REFS)); + for (;;) + { + /* Get the current value */ + Value = *FastRef; + + /* Make sure there's enough references to swap */ + if (!((Value.Value ^ (ULONG_PTR)OldBlock) <= MAX_FAST_REFS)) break; + + /* Check if we have an object to swap */ + if (NewBlock) + { + /* Set up the value with maximum fast references */ + NewValue.Value = (ULONG_PTR)NewBlock | MAX_FAST_REFS; + } + else + { + /* Write the object address itself (which is empty) */ + NewValue.Value = (ULONG_PTR)NewBlock; + } + + /* Do the actual compare exchange */ + NewValue.Object = InterlockedCompareExchangePointer(&FastRef->Object, + NewValue.Object, + Value.Object); + if (NewValue.Object != Value.Object) continue; + + /* All done */ + break; + } + + /* Get the routine block */ + CallbackRoutineBlock = (PVOID)(Value.Value & ~MAX_FAST_REFS); + + /* Make sure the swap worked */ + if (CallbackRoutineBlock == OldBlock) + { + /* Make sure we replaced a valid pointer */ + if (CallbackRoutineBlock) + { + /* Acquire the flush lock and immediately release it */ + KeEnterCriticalRegion(); + ExWaitOnPushLock(&ExpCallBackFlush); + + /* Release rundown protection */ + KeLeaveCriticalRegion(); + ExfReleaseRundownProtectionEx(&CallbackRoutineBlock->RundownProtect, + Value.RefCnt + 1); + } + + /* Compare worked */ + return TRUE; + } + else + { + /* It failed, check if we had a block */ + if (NewBlock) + { + /* We did, remove the refernces that we had added */ + ExfReleaseRundownProtectionEx(&NewBlock->RundownProtect, + MAX_FAST_REFS + 1); + } + + /* Return failure */ + return FALSE; + } +} + VOID NTAPI ExpDeleteCallback(IN PVOID Object) @@ -286,6 +379,9 @@ OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; HANDLE DirectoryHandle; ULONG i; + + /* Setup lightweight callback lock */ + ExpCallBackFlush.Value = 0; /* Initialize the Callback Object type */ RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer));

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007