Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 20877: Fix msvc warnings
by ion＠svn.reactos.org 15 Jan '06

15 Jan '06

Fix msvc warnings Modified: trunk/reactos/subsys/system/cacls/cacls.c _____ Modified: trunk/reactos/subsys/system/cacls/cacls.c --- trunk/reactos/subsys/system/cacls/cacls.c 2006-01-15 00:09:32 UTC (rev 20876) +++ trunk/reactos/subsys/system/cacls/cacls.c 2006-01-15 00:45:06 UTC (rev 20877) @@ -45,24 +45,28 @@ lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1); /* Find the string table block */ - if ((hrSrc = FindResourceW(hInst, - lpName, - (LPWSTR)RT_STRING)) && - (hRes = LoadResource(hInst, - hrSrc)) && - (lpStr = LockResource(hRes))) + hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING); + if (hrSrc) { - UINT x; + hRes = LoadResource(hInst, hrSrc); + if (hRes) + { + lpStr = LockResource(hRes); + if (lpStr) + { + UINT x; - /* Find the string we're looking for */ - uID &= 0xF; /* position in the block, same as % 16 */ - for (x = 0; x < uID; x++) - { - lpStr += (*lpStr) + 1; + /* Find the string we're looking for */ + uID &= 0xF; /* position in the block, same as % 16 */ + for (x = 0; x < uID; x++) + { + lpStr += (*lpStr) + 1; + } + + /* Found the string */ + return (int)(*lpStr); + } } - - /* Found the string */ - return (int)(*lpStr); } return -1; } @@ -85,10 +89,11 @@ if ((*lpTarget) != NULL) { INT Ret; - if (!(Ret = LoadString(hInst, - uID, - *lpTarget, - ln))) + Ret = LoadString(hInst, + uID, + *lpTarget, + ln); + if (!Ret) { HeapFree(GetProcessHeap(), 0, @@ -322,7 +327,7 @@ _tprintf(_T("%s\\%s:"), Domain, Name); - IndentAccess = _tcslen(Domain) + _tcslen(Name); + IndentAccess = (DWORD)_tcslen(Domain) + _tcslen(Name); } else { @@ -330,7 +335,7 @@ _tprintf(_T("%s:"), DisplayString); - IndentAccess = _tcslen(DisplayString); + IndentAccess = (DWORD)_tcslen(DisplayString); } /* print the ACE Flags */ @@ -503,9 +508,9 @@ #ifdef _UNICODE -int main(void) +int __cdecl main(void) #else -int _main (int argc, char *argv[]) +int __cdecl _main (int argc, char *argv[]) #endif { #ifdef _UNICODE

1 0

[mf] 20876: Update XMLStorage to Expat 2.0
by mf＠svn.reactos.org 15 Jan '06

15 Jan '06

Update XMLStorage to Expat 2.0 Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp _____ Modified: trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp --- trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2006-01-15 00:06:30 UTC (rev 20875) +++ trunk/reactos/subsys/system/explorer/utility/xmlstorage.cpp 2006-01-15 00:09:32 UTC (rev 20876) @@ -443,8 +443,8 @@ case XML_ERROR_ABORTED: return "XML_ERROR_ABORTED"; case XML_ERROR_FINISHED: return "XML_ERROR_FINISHED"; case XML_ERROR_SUSPEND_PE: return "XML_ERROR_SUSPEND_PE"; -//#endif -//#if XML_MAJOR_VERSION>=2 +#endif +#if XML_MAJOR_VERSION>=2 /* Added in 2.0. */ case XML_ERROR_RESERVED_PREFIX_XML: return "XML_ERROR_RESERVED_PREFIX_XML"; case XML_ERROR_RESERVED_PREFIX_XMLNS: return "XML_ERROR_RESERVED_PREFIX_XMLNS";

1 0

[mf] 20875: update header files to Expat Version 2.0
by mf＠svn.reactos.org 15 Jan '06

15 Jan '06

update header files to Expat Version 2.0 Modified: trunk/reactos/include/libs/expat/expat.h Modified: trunk/reactos/include/libs/expat/expat_external.h _____ Modified: trunk/reactos/include/libs/expat/expat.h --- trunk/reactos/include/libs/expat/expat.h 2006-01-15 00:06:16 UTC (rev 20874) +++ trunk/reactos/include/libs/expat/expat.h 2006-01-15 00:06:30 UTC (rev 20875) @@ -905,9 +905,9 @@ was detected; otherwise the location is the location of the last parse event, as described above. */ -XMLPARSEAPI(int) XML_GetCurrentLineNumber(XML_Parser parser); -XMLPARSEAPI(int) XML_GetCurrentColumnNumber(XML_Parser parser); -XMLPARSEAPI(long) XML_GetCurrentByteIndex(XML_Parser parser); +XMLPARSEAPI(XML_Size) XML_GetCurrentLineNumber(XML_Parser parser); +XMLPARSEAPI(XML_Size) XML_GetCurrentColumnNumber(XML_Parser parser); +XMLPARSEAPI(XML_Index) XML_GetCurrentByteIndex(XML_Parser parser); /* Return the number of bytes in the current event. Returns 0 if the event is in an internal entity. @@ -1002,9 +1002,9 @@ releases. Micro is bumped with each release, and set to 0 with each change to major or minor version. */ -#define XML_MAJOR_VERSION 1 -#define XML_MINOR_VERSION 95 -#define XML_MICRO_VERSION 8 +#define XML_MAJOR_VERSION 2 +#define XML_MINOR_VERSION 0 +#define XML_MICRO_VERSION 0 #ifdef __cplusplus } _____ Modified: trunk/reactos/include/libs/expat/expat_external.h --- trunk/reactos/include/libs/expat/expat_external.h 2006-01-15 00:06:16 UTC (rev 20874) +++ trunk/reactos/include/libs/expat/expat_external.h 2006-01-15 00:06:30 UTC (rev 20875) @@ -65,6 +65,7 @@ #endif #endif /* not defined XML_STATIC */ + /* If we didn't define it above, define it away: */ #ifndef XMLIMPORT #define XMLIMPORT @@ -94,6 +95,19 @@ typedef char XML_LChar; #endif /* XML_UNICODE */ +#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */ +#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 +typedef __int64 XML_Index; +typedef unsigned __int64 XML_Size; +#else +typedef long long XML_Index; +typedef unsigned long long XML_Size; +#endif +#else +typedef long XML_Index; +typedef unsigned long XML_Size; +#endif /* XML_LARGE_SIZE */ + #ifdef __cplusplus } #endif

1 0

[mf] 20874: update to Expat Version 2.0
by mf＠svn.reactos.org 15 Jan '06

15 Jan '06

update to Expat Version 2.0 Modified: trunk/reactos/lib/expat/COPYING Modified: trunk/reactos/lib/expat/Changes Modified: trunk/reactos/lib/expat/MANIFEST Modified: trunk/reactos/lib/expat/README Modified: trunk/reactos/lib/expat/configure.in Modified: trunk/reactos/lib/expat/doc/reference.html Modified: trunk/reactos/lib/expat/examples/elements.c Modified: trunk/reactos/lib/expat/examples/outline.c Modified: trunk/reactos/lib/expat/lib/internal.h Modified: trunk/reactos/lib/expat/lib/xmlparse.c Modified: trunk/reactos/lib/expat/lib/xmlrole.c Modified: trunk/reactos/lib/expat/lib/xmltok.c Modified: trunk/reactos/lib/expat/lib/xmltok.h Modified: trunk/reactos/lib/expat/lib/xmltok_impl.c Modified: trunk/reactos/lib/expat/make-release.sh Modified: trunk/reactos/lib/expat/tests/README.txt Modified: trunk/reactos/lib/expat/tests/benchmark/README.txt Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.c Modified: trunk/reactos/lib/expat/tests/runtests.c Modified: trunk/reactos/lib/expat/win32/MANIFEST.txt Modified: trunk/reactos/lib/expat/win32/README.txt Modified: trunk/reactos/lib/expat/win32/expat.iss Modified: trunk/reactos/lib/expat/xmlwf/codepage.c Modified: trunk/reactos/lib/expat/xmlwf/xmlfile.c Modified: trunk/reactos/lib/expat/xmlwf/xmlfile.h Modified: trunk/reactos/lib/expat/xmlwf/xmlwf.c _____ Modified: trunk/reactos/lib/expat/COPYING --- trunk/reactos/lib/expat/COPYING 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/COPYING 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,6 +1,6 @@ Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper -Copyright (c) 2001, 2002, 2003 Expat maintainers. +Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006 Expat maintainers. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the _____ Modified: trunk/reactos/lib/expat/Changes --- trunk/reactos/lib/expat/Changes 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/Changes 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,9 +1,16 @@ -Release 1.95.9 TBD +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++. - - Updated to use libtool 1.5.10 (the most recent). + - 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 _____ Modified: trunk/reactos/lib/expat/MANIFEST --- trunk/reactos/lib/expat/MANIFEST 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/MANIFEST 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,3 +1,14 @@ +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 @@ -55,6 +66,7 @@ examples/outline.c examples/outline.dsp lib/Makefile.MPW +lib/amigaconfig.h lib/ascii.h lib/asciitab.h lib/expat.dsp _____ Modified: trunk/reactos/lib/expat/README --- trunk/reactos/lib/expat/README 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/README 2006-01-15 00:06:16 UTC (rev 20874) @@ -1,5 +1,5 @@ - Expat, Release 1.95.8 + Expat, Release 2.0.0 This is Expat, a C library for parsing XML, written by James Clark. Expat is a stream-oriented XML parser. This means that you register @@ -9,7 +9,7 @@ structures for which you may register handlers. Windows users should use the expat_win32bin package, which includes -both precompiled libraries and executalbes, and source code for +both precompiled libraries and executables, and source code for developers. Expat is free software. You may copy, distribute, and modify it under @@ -48,14 +48,20 @@ /home/me/mystuff/bin, you can tell configure about that with: ./configure --prefix=/home/me/mystuff + +Another interesting option is to enable 64-bit integer support for +line and column numbers and the over-all byte index: + ./configure CPPFLAGS=-DXML_LARGE_SIZE + After running the configure script, the "make" command will build things and "make install" will install things into their proper -location. Note that you need to have write permission into the -directories into which things will be installed. +location. Have a look at the "Makefile" to learn about additional +"make" options. Note that you need to have write permission into +the directories into which things will be installed. If you are interested in building Expat to provide document -information in UTF-16 rather than the default UTF-8, following these +information in UTF-16 rather than the default UTF-8, follow these instructions: 1. For UTF-16 output as unsigned short (and version/error _____ Modified: trunk/reactos/lib/expat/configure.in --- trunk/reactos/lib/expat/configure.in 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/configure.in 2006-01-15 00:06:16 UTC (rev 20874) @@ -25,8 +25,8 @@ dnl GNU M4 to test it right now. define([expat_version], ifdef([__gnu__], [esyscmd(conftools/get-version.sh lib/expat.h)], - [1.95.x])) -AC_INIT(expat, expat_version, expat-bugs(a)mail.libexpat.org) + [2.0.x])) +AC_INIT(expat, expat_version, expat-bugs(a)libexpat.org) undefine([expat_version]) AC_CONFIG_SRCDIR(Makefile.in) @@ -44,7 +44,7 @@ dnl If the API changes incompatibly set LIBAGE back to 0 dnl -LIBCURRENT=5 +LIBCURRENT=6 LIBREVISION=0 LIBAGE=5 _____ Modified: trunk/reactos/lib/expat/doc/reference.html --- trunk/reactos/lib/expat/doc/reference.html 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/doc/reference.html 2006-01-15 00:06:16 UTC (rev 20874) @@ -19,7 +19,7 @@ <td class="banner"><h1>The Expat XML Parser</h1></td> </tr> <tr> - <td class="releaseno">Release 1.95.8</td> + <td class="releaseno">Release 2.0.0</td> <td></td> </tr> </table> @@ -344,6 +344,16 @@ short</code> is used. Defining this implies <code>XML_UNICODE</code>.</dd> +<dt>XML_LARGE_SIZE</dt> +<dd>If defined, causes the <code>XML_Size</code> and <code>XML_Index</code> +integer types to be at least 64 bits in size. This is intended to support +processing of very large input streams, where the return values of +<code><a href="#XML_GetCurrentByteIndex" >XML_GetCurrentByteIndex</a></code>, +<code><a href="#XML_GetCurrentLineNumber" >XML_GetCurrentLineNumber</a></code> and +<code><a href="#XML_GetCurrentColumnNumber" >XML_GetCurrentColumnNumber</a></code> +could overflow. It may not be supported by all compilers, and is turned +off by default.</dd> + <dt>XML_CONTEXT_BYTES</dt> <dd>The number of input bytes of markup context which the parser will ensure are available for reporting via <code><a href= @@ -984,14 +994,22 @@ <p>To state the obvious: the three parsing functions <code><a href= "#XML_Parse" >XML_Parse</a></code>, <code><a href= "#XML_ParseBuffer"> XML_ParseBuffer</a></code> and <code><a href= "#XML_GetBuffer"> -XML_GetBuffer</a></code> must not be -called from within a handler unless they operate on a separate parser -instance, that is, one that did not call the handler. For example, it -is OK to call the parsing functions from within an -<code>XML_ExternalEntityRefHandler</code>, if they apply to the parser -created by <code><a href= "#XML_ExternalEntityParserCreate" +XML_GetBuffer</a></code> must not be called from within a handler +unless they operate on a separate parser instance, that is, one that +did not call the handler. For example, it is OK to call the parsing +functions from within an <code>XML_ExternalEntityRefHandler</code>, +if they apply to the parser created by +<code><a href= "#XML_ExternalEntityParserCreate" >XML_ExternalEntityParserCreate</a></code>.</p> +<p>Note: the <code>len</code> argument passed to these functions +should be considerably less than the maximum value for an integer, +as it could create an integer overflow situation if the added +lengths of a buffer and the unprocessed portion of the previous buffer +exceed the maximum integer value. Input data at the end of a buffer +will remain unprocessed if it is part of an XML token for which the +end is not part of that buffer.</p> + <pre class="fcndec" id="XML_Parse"> enum XML_Status XMLCALL XML_Parse(XML_Parser p, @@ -1201,10 +1219,11 @@ a return value.</p> <p>Your handlers will be receiving strings in arrays of type -<code>XML_Char</code>. This type is defined in expat.h as <code>char -*</code> and contains bytes encoding UTF-8. Note that you'll receive -them in this form independent of the original encoding of the -document.</p> +<code>XML_Char</code>. This type is conditionally defined in expat.h as +either <code>char</code>, <code>wchar_t</code> or <code>unsigned short</code>. +The former implies UTF-8 encoding, the latter two imply UTF-16 encoding. +Note that you'll receive them in this form independent of the original +encoding of the document.</p> <div class="handler"> <pre class="setter" id="XML_SetStartElementHandler"> @@ -1896,7 +1915,7 @@ </div> <pre class="fcndec" id="XML_GetCurrentByteIndex"> -long XMLCALL +XML_Index XMLCALL XML_GetCurrentByteIndex(XML_Parser p); </pre> <div class="fcndef"> @@ -1907,7 +1926,7 @@ </div> <pre class="fcndec" id="XML_GetCurrentLineNumber"> -int XMLCALL +XML_Size XMLCALL XML_GetCurrentLineNumber(XML_Parser p); </pre> <div class="fcndef"> @@ -1916,7 +1935,7 @@ </div> <pre class="fcndec" id="XML_GetCurrentColumnNumber"> -int XMLCALL +XML_Size XMLCALL XML_GetCurrentColumnNumber(XML_Parser p); </pre> <div class="fcndef"> _____ Modified: trunk/reactos/lib/expat/examples/elements.c --- trunk/reactos/lib/expat/examples/elements.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/examples/elements.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -2,11 +2,22 @@ reads an XML document from standard input and writes a line with the name of each element to standard output indenting child elements by one tab stop more than their parent element. + It must be used with Expat compiled for UTF-8 output. */ #include <stdio.h> #include "expat.h" +#ifdef XML_LARGE_SIZE +#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 +#define XML_FMT_INT_MOD "I64" +#else +#define XML_FMT_INT_MOD "ll" +#endif +#else +#define XML_FMT_INT_MOD "l" +#endif + static void XMLCALL startElement(void *userData, const char *name, const char **atts) { @@ -25,8 +36,14 @@ *depthPtr -= 1; } +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> int +amiga_main(int argc, char *argv[]) +#else +int main(int argc, char *argv[]) +#endif { char buf[BUFSIZ]; XML_Parser parser = XML_ParserCreate(NULL); @@ -39,7 +56,7 @@ done = len < sizeof(buf); if (XML_Parse(parser, buf, len, done) == XML_STATUS_ERROR) { fprintf(stderr, - "%s at line %d\n", + "%s at line %" XML_FMT_INT_MOD "u\n", XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser)); return 1; _____ Modified: trunk/reactos/lib/expat/examples/outline.c --- trunk/reactos/lib/expat/examples/outline.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/examples/outline.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -18,12 +18,23 @@ * * Read an XML document from standard input and print an element * outline on standard output. + * Must be used with Expat compiled for UTF-8 output. */ #include <stdio.h> #include <expat.h> +#ifdef XML_LARGE_SIZE +#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 +#define XML_FMT_INT_MOD "I64" +#else +#define XML_FMT_INT_MOD "ll" +#endif +#else +#define XML_FMT_INT_MOD "l" +#endif + #define BUFFSIZE 8192 char Buff[BUFFSIZE]; @@ -54,8 +65,14 @@ Depth--; } +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> int +amiga_main(int argc, char *argv[]) +#else +int main(int argc, char *argv[]) +#endif { XML_Parser p = XML_ParserCreate(NULL); if (! p) { @@ -77,7 +94,7 @@ done = feof(stdin); if (XML_Parse(p, Buff, len, done) == XML_STATUS_ERROR) { - fprintf(stderr, "Parse error at line %d:\n%s\n", + fprintf(stderr, "Parse error at line %" XML_FMT_INT_MOD "u:\n%s\n", XML_GetCurrentLineNumber(p), XML_ErrorString(XML_GetErrorCode(p))); exit(-1); _____ Modified: trunk/reactos/lib/expat/lib/internal.h --- trunk/reactos/lib/expat/lib/internal.h 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/internal.h 2006-01-15 00:06:16 UTC (rev 20874) @@ -20,7 +20,7 @@ and therefore subject to change. */ -#if defined(__GNUC__) && defined(__i386__) && !defined(__MINGW32__) +#if defined(__GNUC__) && defined(__i386__) /* We'll use this version by default only where we know it helps. regparm() generates warnings on Solaris boxes. See SF bug #692878. _____ Modified: trunk/reactos/lib/expat/lib/xmlparse.c --- trunk/reactos/lib/expat/lib/xmlparse.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmlparse.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -12,11 +12,13 @@ #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" +#elif defined(__amigaos4__) +#include "amigaconfig.h" #elif defined(HAVE_EXPAT_CONFIG_H) #include <expat_config.h> #endif /* ndef COMPILED_FROM_DSP */ -#include <expat/expat.h> +#include "expat.h" #ifdef XML_UNICODE #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX @@ -456,7 +458,7 @@ char *m_bufferEnd; /* allocated end of buffer */ const char *m_bufferLim; - long m_parseEndByteIndex; + XML_Index m_parseEndByteIndex; const char *m_parseEndPtr; XML_Char *m_dataBuf; XML_Char *m_dataBufEnd; @@ -1604,9 +1606,9 @@ if (len > bufferLim - bufferEnd) { /* FIXME avoid integer overflow */ - int neededSize = len + (bufferEnd - bufferPtr); + int neededSize = len + (int)(bufferEnd - bufferPtr); #ifdef XML_CONTEXT_BYTES - int keep = bufferPtr - buffer; + int keep = (int)(bufferPtr - buffer); if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES; @@ -1615,7 +1617,7 @@ if (neededSize <= bufferLim - buffer) { #ifdef XML_CONTEXT_BYTES if (keep < bufferPtr - buffer) { - int offset = (bufferPtr - buffer) - keep; + int offset = (int)(bufferPtr - buffer) - keep; memmove(buffer, &buffer[offset], bufferEnd - bufferPtr + keep); bufferEnd -= offset; bufferPtr -= offset; @@ -1628,7 +1630,7 @@ } else { char *newBuf; - int bufferSize = bufferLim - bufferPtr; + int bufferSize = (int)(bufferLim - bufferPtr); if (bufferSize == 0) bufferSize = INIT_BUFFER_SIZE; do { @@ -1642,7 +1644,7 @@ bufferLim = newBuf + bufferSize; #ifdef XML_CONTEXT_BYTES if (bufferPtr) { - int keep = bufferPtr - buffer; + int keep = (int)(bufferPtr - buffer); if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES; memcpy(newBuf, &bufferPtr[-keep], bufferEnd - bufferPtr + keep); @@ -1749,7 +1751,7 @@ return errorCode; } -long XMLCALL +XML_Index XMLCALL XML_GetCurrentByteIndex(XML_Parser parser) { if (eventPtr) @@ -1761,7 +1763,7 @@ XML_GetCurrentByteCount(XML_Parser parser) { if (eventEndPtr && eventPtr) - return eventEndPtr - eventPtr; + return (int)(eventEndPtr - eventPtr); return 0; } @@ -1770,15 +1772,15 @@ { #ifdef XML_CONTEXT_BYTES if (eventPtr && buffer) { - *offset = eventPtr - buffer; - *size = bufferEnd - buffer; + *offset = (int)(eventPtr - buffer); + *size = (int)(bufferEnd - buffer); return buffer; } #endif /* defined XML_CONTEXT_BYTES */ return (char *) 0; } -int XMLCALL +XML_Size XMLCALL XML_GetCurrentLineNumber(XML_Parser parser) { if (eventPtr && eventPtr >= positionPtr) { @@ -1788,7 +1790,7 @@ return position.lineNumber + 1; } -int XMLCALL +XML_Size XMLCALL XML_GetCurrentColumnNumber(XML_Parser parser) { if (eventPtr && eventPtr >= positionPtr) { @@ -2324,12 +2326,12 @@ XmlConvert(enc, &fromPtr, rawNameEnd, (ICHAR **)&toPtr, (ICHAR *)tag->bufEnd - 1); - convLen = toPtr - (XML_Char *)tag->buf; + convLen = (int)(toPtr - (XML_Char *)tag->buf); if (fromPtr == rawNameEnd) { tag->name.strLen = convLen; break; } - bufSize = (tag->bufEnd - tag->buf) << 1; + bufSize = (int)(tag->bufEnd - tag->buf) << 1; { char *temp = (char *)REALLOC(tag->buf, bufSize); if (temp == NULL) @@ -2517,12 +2519,12 @@ ICHAR *dataPtr = (ICHAR *)dataBuf; XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); characterDataHandler(handlerArg, dataBuf, - dataPtr - (ICHAR *)dataBuf); + (int)(dataPtr - (ICHAR *)dataBuf)); } else characterDataHandler(handlerArg, (XML_Char *)s, - (XML_Char *)end - (XML_Char *)s); + (int)((XML_Char *)end - (XML_Char *)s)); } else if (defaultHandler) reportDefault(parser, enc, s, end); @@ -2547,7 +2549,7 @@ XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = s; characterDataHandler(handlerArg, dataBuf, - dataPtr - (ICHAR *)dataBuf); + (int)(dataPtr - (ICHAR *)dataBuf)); if (s == next) break; *eventPP = s; @@ -2556,7 +2558,7 @@ else characterDataHandler(handlerArg, (XML_Char *)s, - (XML_Char *)next - (XML_Char *)s); + (int)((XML_Char *)next - (XML_Char *)s)); } else if (defaultHandler) reportDefault(parser, enc, s, next); @@ -2854,8 +2856,10 @@ nsAtts[j].hash = uriHash; nsAtts[j].uriName = s; - if (!--nPrefixes) + if (!--nPrefixes) { + i += 2; break; + } } else /* not prefixed */ ((XML_Char *)s)[-1] = 0; /* clear flag */ @@ -3125,7 +3129,7 @@ XmlConvert(enc, &s, next, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = next; characterDataHandler(handlerArg, dataBuf, - dataPtr - (ICHAR *)dataBuf); + (int)(dataPtr - (ICHAR *)dataBuf)); if (s == next) break; *eventPP = s; @@ -3134,7 +3138,7 @@ else characterDataHandler(handlerArg, (XML_Char *)s, - (XML_Char *)next - (XML_Char *)s); + (int)((XML_Char *)next - (XML_Char *)s)); } else if (defaultHandler) reportDefault(parser, enc, s, next); @@ -3799,7 +3803,8 @@ */ #ifdef XML_DTD if (doctypeSysid || useForeignDTD) { - dtd->hasParamEntityRefs = XML_TRUE; /* when docTypeSysid == NULL */ + XML_Bool hadParamEntityRefs = dtd->hasParamEntityRefs; + dtd->hasParamEntityRefs = XML_TRUE; if (paramEntityParsing && externalEntityRefHandler) { ENTITY *entity = (ENTITY *)lookup(&dtd->paramEntities, externalSubsetName, @@ -3815,11 +3820,17 @@ entity->systemId, entity->publicId)) return XML_ERROR_EXTERNAL_ENTITY_HANDLING; - if (dtd->paramEntityRead && - !dtd->standalone && - notStandaloneHandler && - !notStandaloneHandler(handlerArg)) - return XML_ERROR_NOT_STANDALONE; + if (dtd->paramEntityRead) { + if (!dtd->standalone && + notStandaloneHandler && + !notStandaloneHandler(handlerArg)) + return XML_ERROR_NOT_STANDALONE; + } + /* if we didn't read the foreign DTD then this means that there + is no external subset and we must reset dtd->hasParamEntityRefs + */ + else if (!doctypeSysid) + dtd->hasParamEntityRefs = hadParamEntityRefs; /* end of DTD - no need to update dtd->keepProcessing */ } useForeignDTD = XML_FALSE; @@ -3836,6 +3847,7 @@ last chance to read the foreign DTD */ if (useForeignDTD) { + XML_Bool hadParamEntityRefs = dtd->hasParamEntityRefs; dtd->hasParamEntityRefs = XML_TRUE; if (paramEntityParsing && externalEntityRefHandler) { ENTITY *entity = (ENTITY *)lookup(&dtd->paramEntities, @@ -3851,11 +3863,17 @@ entity->systemId, entity->publicId)) return XML_ERROR_EXTERNAL_ENTITY_HANDLING; - if (dtd->paramEntityRead && - !dtd->standalone && - notStandaloneHandler && - !notStandaloneHandler(handlerArg)) - return XML_ERROR_NOT_STANDALONE; + if (dtd->paramEntityRead) { + if (!dtd->standalone && + notStandaloneHandler && + !notStandaloneHandler(handlerArg)) + return XML_ERROR_NOT_STANDALONE; + } + /* if we didn't read the foreign DTD then this means that there + is no external subset and we must reset dtd->hasParamEntityRefs + */ + else + dtd->hasParamEntityRefs = hadParamEntityRefs; /* end of DTD - no need to update dtd->keepProcessing */ } } @@ -3996,7 +4014,7 @@ next - enc->minBytesPerChar); if (declEntity) { declEntity->textPtr = poolStart(&dtd->entityValuePool); - declEntity->textLen = poolLength(&dtd->entityValuePool); + declEntity->textLen = (int)(poolLength(&dtd->entityValuePool)); poolFinish(&dtd->entityValuePool); if (entityDeclHandler) { *eventEndPP = s; @@ -4681,7 +4699,7 @@ if (result == XML_ERROR_NONE) { if (textEnd != next && ps_parsing == XML_SUSPENDED) { - entity->processed = next - textStart; + entity->processed = (int)(next - textStart); processor = internalEntityProcessor; } else { @@ -4727,7 +4745,7 @@ if (result != XML_ERROR_NONE) return result; else if (textEnd != next && ps_parsing == XML_SUSPENDED) { - entity->processed = next - (char *)entity->textPtr; + entity->processed = (int)(next - (char *)entity->textPtr); return result; } else { @@ -4861,9 +4879,8 @@ return XML_ERROR_NO_MEMORY; entity = (ENTITY *)lookup(&dtd->generalEntities, name, 0); poolDiscard(&temp2Pool); - /* first, determine if a check for an existing declaration is needed; - if yes, check that the entity exists, and that it is internal, - otherwise call the default handler (if called from content) + /* First, determine if a check for an existing declaration is needed; + if yes, check that the entity exists, and that it is internal. */ if (pool == &dtd->pool) /* are we called from prolog? */ checkEntityDecl = @@ -4882,13 +4899,16 @@ return XML_ERROR_ENTITY_DECLARED_IN_PE; } else if (!entity) { - /* cannot report skipped entity here - see comments on - skippedEntityHandler + /* Cannot report skipped entity here - see comments on + skippedEntityHandler. if (skippedEntityHandler) skippedEntityHandler(handlerArg, name, 0); */ + /* Cannot call the default handler because this would be + out of sync with the call to the startElementHandler. if ((pool == &tempPool) && defaultHandler) reportDefault(parser, enc, ptr, next); + */ break; } if (entity->open) { @@ -5188,12 +5208,12 @@ ICHAR *dataPtr = (ICHAR *)dataBuf; XmlConvert(enc, &s, end, &dataPtr, (ICHAR *)dataBufEnd); *eventEndPP = s; - defaultHandler(handlerArg, dataBuf, dataPtr - (ICHAR *)dataBuf); + defaultHandler(handlerArg, dataBuf, (int)(dataPtr - (ICHAR *)dataBuf)); *eventPP = s; } while (s != end); } else - defaultHandler(handlerArg, (XML_Char *)s, (XML_Char *)end - (XML_Char *)s); + defaultHandler(handlerArg, (XML_Char *)s, (int)((XML_Char *)end - (XML_Char *)s)); } @@ -6075,7 +6095,7 @@ } } if (pool->blocks && pool->start == pool->blocks->s) { - int blockSize = (pool->end - pool->start)*2; + int blockSize = (int)(pool->end - pool->start)*2; pool->blocks = (BLOCK *) pool->mem->realloc_fcn(pool->blocks, (offsetof(BLOCK, s) @@ -6089,7 +6109,7 @@ } else { BLOCK *tem; - int blockSize = pool->end - pool->start; + int blockSize = (int)(pool->end - pool->start); if (blockSize < INIT_BLOCK_SIZE) blockSize = INIT_BLOCK_SIZE; else _____ Modified: trunk/reactos/lib/expat/lib/xmlrole.c --- trunk/reactos/lib/expat/lib/xmlrole.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmlrole.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -8,13 +8,15 @@ #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" +#elif defined(__amigaos4__) +#include "amigaconfig.h" #else #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> #endif #endif /* ndef COMPILED_FROM_DSP */ -#include <expat/expat_external.h> +#include "expat_external.h" #include "internal.h" #include "xmlrole.h" #include "ascii.h" _____ Modified: trunk/reactos/lib/expat/lib/xmltok.c --- trunk/reactos/lib/expat/lib/xmltok.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmltok.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -8,13 +8,15 @@ #include "winconfig.h" #elif defined(MACOS_CLASSIC) #include "macconfig.h" +#elif defined(__amigaos4__) +#include "amigaconfig.h" #else #ifdef HAVE_EXPAT_CONFIG_H #include <expat_config.h> #endif #endif /* ndef COMPILED_FROM_DSP */ -#include <expat/expat_external.h> +#include "expat_external.h" #include "internal.h" #include "xmltok.h" #include "nametab.h" _____ Modified: trunk/reactos/lib/expat/lib/xmltok.h --- trunk/reactos/lib/expat/lib/xmltok.h 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmltok.h 2006-01-15 00:06:16 UTC (rev 20874) @@ -111,8 +111,8 @@ typedef struct position { /* first line and first column are 0 not 1 */ - unsigned long lineNumber; - unsigned long columnNumber; + XML_Size lineNumber; + XML_Size columnNumber; } POSITION; typedef struct { _____ Modified: trunk/reactos/lib/expat/lib/xmltok_impl.c --- trunk/reactos/lib/expat/lib/xmltok_impl.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/lib/xmltok_impl.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -1714,7 +1714,7 @@ ptr += MINBPC(enc); break; default: - return ptr - start; + return (int)(ptr - start); } } } @@ -1750,7 +1750,7 @@ LEAD_CASE(2) LEAD_CASE(3) LEAD_CASE(4) #undef LEAD_CASE case BT_LF: - pos->columnNumber = (unsigned)-1; + pos->columnNumber = (XML_Size)-1; pos->lineNumber++; ptr += MINBPC(enc); break; @@ -1759,7 +1759,7 @@ ptr += MINBPC(enc); if (ptr != end && BYTE_TYPE(enc, ptr) == BT_LF) ptr += MINBPC(enc); - pos->columnNumber = (unsigned)-1; + pos->columnNumber = (XML_Size)-1; break; default: ptr += MINBPC(enc); _____ Modified: trunk/reactos/lib/expat/make-release.sh --- trunk/reactos/lib/expat/make-release.sh 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/make-release.sh 2006-01-15 00:06:16 UTC (rev 20874) @@ -7,8 +7,8 @@ # 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' +#CVSROOT=':ext:cvs.libexpat.org:/cvsroot/expat' +CVSROOT=':pserver:anonymous@cvs.libexpat.org:/cvsroot/expat' if test $# != 1; then echo "USAGE: $0 tagname" _____ Modified: trunk/reactos/lib/expat/tests/README.txt --- trunk/reactos/lib/expat/tests/README.txt 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/README.txt 2006-01-15 00:06:16 UTC (rev 20874) @@ -3,12 +3,12 @@ are not expected to be useful examples of Expat usage; see the examples/ directory for that. -The Expat tests use the "Check" unit testing framework for C. More -information on Check can be found at: +The Expat tests use a partial internal implementation of the "Check" +unit testing framework for C. More information on Check can be found at: http://check.sourceforge.net/ -Check 0.8 must be installed before the unit tests can be compiled & run. +Expat must be built and installed before "make check" can be executed. Since both Check and this test suite are young, it can all change in a later version. _____ Modified: trunk/reactos/lib/expat/tests/benchmark/README.txt --- trunk/reactos/lib/expat/tests/benchmark/README.txt 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/benchmark/README.txt 2006-01-15 00:06:16 UTC (rev 20874) @@ -4,7 +4,7 @@ The command line arguments are: - -n ... optional; if supplied, then namespace processing is turned on + -n ... optional; if supplied, namespace processing is turned on <file name> ... name/path of test xml file <buffer size> ... size of processing buffer; the file is parsed in chunks of this size @@ -13,4 +13,4 @@ Returns: The time (in seconds) it takes to parse the test file, - averaged of the number of iterations. \ No newline at end of file + averaged over the number of iterations. \ No newline at end of file _____ Modified: trunk/reactos/lib/expat/tests/benchmark/benchmark.c --- trunk/reactos/lib/expat/tests/benchmark/benchmark.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/benchmark/benchmark.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -4,6 +4,12 @@ #include <time.h> #include "expat.h" +#ifdef XML_LARGE_SIZE +#define XML_FMT_INT_MOD "ll" +#else +#define XML_FMT_INT_MOD "l" +#endif + static void usage(const char *prog, int rc) { @@ -12,7 +18,13 @@ exit(rc); } +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> +int +amiga_main(int argc, char *argv[]) +#else int main (int argc, char *argv[]) +#endif { XML_Parser parser; char *XMLBuf, *XMLBufEnd, *XMLBufPtr; @@ -77,7 +89,8 @@ else parseBufferSize = bufferSize; if (!XML_Parse (parser, XMLBufPtr, parseBufferSize, isFinal)) { - fprintf (stderr, "error '%s' at line %d character %d\n", + fprintf (stderr, "error '%s' at line %" XML_FMT_INT_MOD \ + "u character %" XML_FMT_INT_MOD "u\n", XML_ErrorString (XML_GetErrorCode (parser)), XML_GetCurrentLineNumber (parser), XML_GetCurrentColumnNumber (parser)); _____ Modified: trunk/reactos/lib/expat/tests/runtests.c --- trunk/reactos/lib/expat/tests/runtests.c 2006-01-14 23:54:05 UTC (rev 20873) +++ trunk/reactos/lib/expat/tests/runtests.c 2006-01-15 00:06:16 UTC (rev 20874) @@ -17,7 +17,16 @@ #include "chardata.h" #include "minicheck.h" +#ifdef AMIGA_SHARED_LIB +#include <proto/expat.h> +#endif +#ifdef XML_LARGE_SIZE +#define XML_FMT_INT_MOD "ll" +#else +#define XML_FMT_INT_MOD "l" +#endif + static XML_Parser parser; @@ -45,7 +54,8 @@ { char buffer[1024]; sprintf(buffer, - "\n %s (line %d, offset %d)\n reported from %s, line %d", + "\n %s (line %" XML_FMT_INT_MOD "u, offset %"\ + XML_FMT_INT_MOD "u)\n reported from %s, line %d", XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser), XML_GetCurrentColumnNumber(parser), @@ -397,14 +407,15 @@ "<tag>\n" "\n" "\n</tag>"; - int lineno; + XML_Size lineno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR) xml_failure(parser); lineno = XML_GetCurrentLineNumber(parser); if (lineno != 4) { char buffer[100]; - sprintf(buffer, "expected 4 lines, saw %d", lineno); + sprintf(buffer, + "expected 4 lines, saw %" XML_FMT_INT_MOD "u", lineno); fail(buffer); } } @@ -414,14 +425,15 @@ START_TEST(test_column_number_after_parse) { char *text = "<tag></tag>"; - int colno; + XML_Size colno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) == XML_STATUS_ERROR) xml_failure(parser); colno = XML_GetCurrentColumnNumber(parser); if (colno != 11) { char buffer[100]; - sprintf(buffer, "expected 11 columns, saw %d", colno); + sprintf(buffer, + "expected 11 columns, saw %" XML_FMT_INT_MOD "u", colno); fail(buffer); } } @@ -434,7 +446,9 @@ CharData *storage = (CharData *) userData; char buffer[100]; - sprintf(buffer, "<%s> at col:%d line:%d\n", name, + sprintf(buffer, + "<%s> at col:%" XML_FMT_INT_MOD "u line:%"\ + XML_FMT_INT_MOD "u\n", name, XML_GetCurrentColumnNumber(parser), XML_GetCurrentLineNumber(parser)); CharData_AppendString(storage, buffer); @@ -446,7 +460,9 @@ CharData *storage = (CharData *) userData; char buffer[100]; - sprintf(buffer, "</%s> at col:%d line:%d\n", name, + sprintf(buffer, + "</%s> at col:%" XML_FMT_INT_MOD "u line:%"\ + XML_FMT_INT_MOD "u\n", name, XML_GetCurrentColumnNumber(parser), XML_GetCurrentLineNumber(parser)); CharData_AppendString(storage, buffer); @@ -495,14 +511,14 @@ "<a>\n" " <b>\n" " </a>"; /* missing </b> */ - int lineno; + XML_Size lineno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR) fail("Expected a parse error"); lineno = XML_GetCurrentLineNumber(parser); if (lineno != 3) { char buffer[100]; - sprintf(buffer, "expected 3 lines, saw %d", lineno); + sprintf(buffer, "expected 3 lines, saw %" XML_FMT_INT_MOD "u", lineno); fail(buffer); } } @@ -515,14 +531,15 @@ "<a>\n" " <b>\n" " </a>"; /* missing </b> */ - int colno; + XML_Size colno; if (XML_Parse(parser, text, strlen(text), XML_FALSE) != XML_STATUS_ERROR) fail("Expected a parse error"); colno = XML_GetCurrentColumnNumber(parser); if (colno != 4) { char buffer[100]; - sprintf(buffer, "expected 4 columns, saw %d", colno); + sprintf(buffer, + "expected 4 columns, saw %" XML_FMT_INT_MOD "u", colno); [truncated at 1000 lines; 299 more skipped]

1 0

[weiden] 20873: RegDisablePredefinedCacheEx() should also disable the cache for HKU
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

RegDisablePredefinedCacheEx() should also disable the cache for HKU Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2006-01-14 23:37:56 UTC (rev 20872) +++ trunk/reactos/lib/advapi32/reg/reg.c 2006-01-14 23:54:05 UTC (rev 20873) @@ -325,6 +325,7 @@ { RtlEnterCriticalSection (&HandleTableCS); DefaultHandlesDisabled = TRUE; + DefaultHandleHKUDisabled = TRUE; RtlLeaveCriticalSection (&HandleTableCS); return ERROR_SUCCESS; }

1 0

[weiden] 20872: fixed a buffer overflow when the referenced domain length is 0
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

fixed a buffer overflow when the referenced domain length is 0 Modified: trunk/reactos/subsys/system/cacls/cacls.c _____ Modified: trunk/reactos/subsys/system/cacls/cacls.c --- trunk/reactos/subsys/system/cacls/cacls.c 2006-01-14 23:35:20 UTC (rev 20871) +++ trunk/reactos/subsys/system/cacls/cacls.c 2006-01-14 23:37:56 UTC (rev 20872) @@ -248,7 +248,7 @@ &DomainSize, &Use)) { - if (GetLastError() == ERROR_NONE_MAPPED) + if (GetLastError() == ERROR_NONE_MAPPED || NameSize == 0) { goto BuildSidString; } @@ -271,7 +271,9 @@ } Domain = Name + NameSize; - Name[0] = Domain[0] = _T('\0'); + Name[0] = _T('\0'); + if (DomainSize != 0) + Domain[0] = _T('\0'); if (!LookupAccountSid(NULL, Sid, Name,

1 0

[npwoods] 20871: Freeloader: Check return code of RegOpenKey() in FrLdrLoadBootDrivers() for failure
by npwoods＠svn.reactos.org 14 Jan '06

14 Jan '06

Freeloader: Check return code of RegOpenKey() in FrLdrLoadBootDrivers() for failure Another one... Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2006-01-14 23:17:26 UTC (rev 20870) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c 2006-01-14 23:35:20 UTC (rev 20871) @@ -499,53 +499,55 @@ /* open driver Key */ rc = RegOpenKey(hServiceKey, ServiceName, &hDriverKey); + if (rc == ERROR_SUCCESS) + { + /* Read the Start Value */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); + if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; + DbgPrint((DPRINT_REACTOS, " Start: %x \n", (int)StartValue)); - /* Read the Start Value */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Start", &ValueType, (PUCHAR)&StartValue, &ValueSize); - if (rc != ERROR_SUCCESS) StartValue = (ULONG)-1; - DbgPrint((DPRINT_REACTOS, " Start: %x \n", (int)StartValue)); + /* Read the Tag */ + ValueSize = sizeof(ULONG); + rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); + if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; + DbgPrint((DPRINT_REACTOS, " Tag: %x \n", (int)TagValue)); - /* Read the Tag */ - ValueSize = sizeof(ULONG); - rc = RegQueryValue(hDriverKey, L"Tag", &ValueType, (PUCHAR)&TagValue, &ValueSize); - if (rc != ERROR_SUCCESS) TagValue = (ULONG)-1; - DbgPrint((DPRINT_REACTOS, " Tag: %x \n", (int)TagValue)); + /* Read the driver's group */ + DriverGroupSize = sizeof(DriverGroup); + rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); + DbgPrint((DPRINT_REACTOS, " Group: '%S' \n", DriverGroup)); - /* Read the driver's group */ - DriverGroupSize = sizeof(DriverGroup); - rc = RegQueryValue(hDriverKey, L"Group", NULL, (PUCHAR)DriverGroup, &DriverGroupSize); - DbgPrint((DPRINT_REACTOS, " Group: '%S' \n", DriverGroup)); + for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { + if (TagValue == OrderList[TagIndex]) break; + } - for (TagIndex = 1; TagIndex <= OrderList[0]; TagIndex++) { - if (TagValue == OrderList[TagIndex]) break; - } + if ((StartValue == 0) && + (TagIndex > OrderList[0]) && + (_wcsicmp(DriverGroup, GroupName) == 0)) { - if ((StartValue == 0) && - (TagIndex > OrderList[0]) && - (_wcsicmp(DriverGroup, GroupName) == 0)) { + ValueSize = sizeof(TempImagePath); + rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); + if (rc != ERROR_SUCCESS) { + DbgPrint((DPRINT_REACTOS, " ImagePath: not found\n")); + sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", szSystemRoot, ServiceName); + } else if (TempImagePath[0] != L'\\') { + sprintf(ImagePath, "%s%S", szSystemRoot, TempImagePath); + } else { + sprintf(ImagePath, "%S", TempImagePath); + DbgPrint((DPRINT_REACTOS, " ImagePath: '%s'\n", ImagePath)); + } + DbgPrint((DPRINT_REACTOS, " Loading driver: '%s'\n", ImagePath)); - ValueSize = sizeof(TempImagePath); - rc = RegQueryValue(hDriverKey, L"ImagePath", NULL, (PUCHAR)TempImagePath, &ValueSize); - if (rc != ERROR_SUCCESS) { - DbgPrint((DPRINT_REACTOS, " ImagePath: not found\n")); - sprintf(ImagePath, "%ssystem32\\drivers\\%S.sys", szSystemRoot, ServiceName); - } else if (TempImagePath[0] != L'\\') { - sprintf(ImagePath, "%s%S", szSystemRoot, TempImagePath); - } else { - sprintf(ImagePath, "%S", TempImagePath); - DbgPrint((DPRINT_REACTOS, " ImagePath: '%s'\n", ImagePath)); - } - DbgPrint((DPRINT_REACTOS, " Loading driver: '%s'\n", ImagePath)); + if (nPos < 100) nPos += 5; - if (nPos < 100) nPos += 5; + FrLdrLoadDriver(ImagePath, nPos); - FrLdrLoadDriver(ImagePath, nPos); + } else { - } else { - - DbgPrint((DPRINT_REACTOS, " Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n", - ServiceName, StartValue, TagValue, DriverGroup, GroupName)); + DbgPrint((DPRINT_REACTOS, " Skipping driver '%S' with Start %d, Tag %d and Group '%S' (Current group '%S')\n", + ServiceName, StartValue, TagValue, DriverGroup, GroupName)); + } } Index++;

1 0

[weiden] 20870: - implemented RegDisablePredefinedCache()
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

- implemented RegDisablePredefinedCache() - added stubs for RegEnableReflectionKey(), RegDisableReflectionKey() and RegQueryReflectionKey() Modified: trunk/reactos/lib/advapi32/advapi32.def Modified: trunk/reactos/lib/advapi32/reg/reg.c Modified: trunk/reactos/w32api/include/winreg.h _____ Modified: trunk/reactos/lib/advapi32/advapi32.def --- trunk/reactos/lib/advapi32/advapi32.def 2006-01-14 22:47:35 UTC (rev 20869) +++ trunk/reactos/lib/advapi32/advapi32.def 2006-01-14 23:17:26 UTC (rev 20870) @@ -482,8 +482,10 @@ RegDeleteTreeW@8 RegDeleteValueA@8 RegDeleteValueW@8 -;RegDisablePredefinedCache +RegDisablePredefinedCache@0 RegDisablePredefinedCacheEx@0 +RegDisableReflectionKey@4 +RegEnableReflectionKey@4 RegEnumKeyA@16 RegEnumKeyExA@32 RegEnumKeyExW@32 @@ -508,6 +510,7 @@ RegQueryInfoKeyW@48 RegQueryMultipleValuesA@20 RegQueryMultipleValuesW@20 +RegQueryReflectionKey@8 RegQueryValueA@16 RegQueryValueExA@24 RegQueryValueExW@24 _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2006-01-14 22:47:35 UTC (rev 20869) +++ trunk/reactos/lib/advapi32/reg/reg.c 2006-01-14 23:17:26 UTC (rev 20870) @@ -30,6 +30,7 @@ static HANDLE DefaultHandleTable[MAX_DEFAULT_HANDLES]; static HANDLE ProcessHeap; static BOOLEAN DefaultHandlesDisabled = FALSE; +static BOOLEAN DefaultHandleHKUDisabled = FALSE; /* PROTOTYPES ***************************************************************/ @@ -143,7 +144,7 @@ { PHANDLE Handle; ULONG Index; - BOOLEAN DoOpen; + BOOLEAN DoOpen, DefDisabled; NTSTATUS Status = STATUS_SUCCESS; TRACE("MapDefaultKey (Key %x)\n", Key); @@ -162,8 +163,13 @@ } RtlEnterCriticalSection (&HandleTableCS); - - if (!DefaultHandlesDisabled) + + if (Key == HKEY_CURRENT_USER) + DefDisabled = DefaultHandleHKUDisabled; + else + DefDisabled = DefaultHandlesDisabled; + + if (!DefDisabled) { Handle = &DefaultHandleTable[Index]; DoOpen = (*Handle == NULL); @@ -183,7 +189,7 @@ if (NT_SUCCESS(Status)) { - if (!DefaultHandlesDisabled) + if (!DefDisabled) *RealKey = *Handle; else *(PULONG_PTR)Handle |= 0x1; @@ -295,6 +301,21 @@ /*********************************************************************** * + * RegDisablePredefinedCache + * + * @implemented + */ +LONG WINAPI +RegDisablePredefinedCache(VOID) +{ + RtlEnterCriticalSection (&HandleTableCS); + DefaultHandleHKUDisabled = TRUE; + RtlLeaveCriticalSection (&HandleTableCS); + return ERROR_SUCCESS; +} + + +/********************************************************************** ** * RegDisablePredefinedCacheEx * * @implemented @@ -1634,6 +1655,32 @@ /*********************************************************************** * + * RegDisableReflectionKey + * + * @unimplemented + */ +LONG WINAPI +RegDisableReflectionKey(IN HKEY hBase) +{ + DPRINT1("RegDisableReflectionKey(0x%p) UNIMPLEMENTED!\n", hBase); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** ** + * RegEnableReflectionKey + * + * @unimplemented + */ +LONG WINAPI +RegEnableReflectionKey(IN HKEY hBase) +{ + DPRINT1("RegEnableReflectionKey(0x%p) UNIMPLEMENTED!\n", hBase); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** ** * RegSetKeyValueW * * @implemented @@ -3372,6 +3419,21 @@ /*********************************************************************** * + * RegQueryReflectionKey + * + * @unimplemented + */ +LONG WINAPI +RegQueryReflectionKey(IN HKEY hBase, + OUT BOOL* bIsReflectionDisabled) +{ + DPRINT1("RegQueryReflectionKey(0x%p, 0x%p) UNIMPLEMENTED!\n", + hBase, bIsReflectionDisabled); + return ERROR_CALL_NOT_IMPLEMENTED; +} + + +/********************************************************************** ** * RegQueryValueExW * * @implemented _____ Modified: trunk/reactos/w32api/include/winreg.h --- trunk/reactos/w32api/include/winreg.h 2006-01-14 22:47:35 UTC (rev 20869) +++ trunk/reactos/w32api/include/winreg.h 2006-01-14 23:17:26 UTC (rev 20870) @@ -78,8 +78,13 @@ #endif LONG WINAPI RegDeleteValueA(HKEY,LPCSTR); LONG WINAPI RegDeleteValueW(HKEY,LPCWSTR); +#if (_WIN32_WINNT >= 0x0500) +LONG WINAPI RegDisablePredefinedCache(VOID); +#endif #if (_WIN32_WINNT >= 0x0600) LONG WINAPI RegDisablePredefinedCacheEx(VOID); +LONG WINAPI RegDisableReflectionKey(HKEY); +LONG WINAPI RegEnableReflectionKey(HKEY); #endif LONG WINAPI RegEnumKeyA(HKEY,DWORD,LPSTR,DWORD); LONG WINAPI RegEnumKeyW(HKEY,DWORD,LPWSTR,DWORD); @@ -104,6 +109,9 @@ LONG WINAPI RegQueryInfoKeyW(HKEY,LPWSTR,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,PDWORD,P DWORD,PDWORD,PDWORD,PFILETIME); LONG WINAPI RegQueryMultipleValuesA(HKEY,PVALENTA,DWORD,LPSTR,LPDWORD); LONG WINAPI RegQueryMultipleValuesW(HKEY,PVALENTW,DWORD,LPWSTR,LPDWORD); +#if (_WIN32_WINNT >= 0x0600) +LONG WINAPI RegQueryReflectionKey(HKEY,BOOL*); +#endif LONG WINAPI RegQueryValueA(HKEY,LPCSTR,LPSTR,PLONG); LONG WINAPI RegQueryValueExA(HKEY,LPCSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD); LONG WINAPI RegQueryValueExW(HKEY,LPCWSTR,LPDWORD,LPDWORD,LPBYTE,LPDWORD);

1 0

[weiden] 20869: add stubs for CancelIoEx() and CancelSynchronousIo()
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

add stubs for CancelIoEx() and CancelSynchronousIo() Modified: trunk/reactos/lib/kernel32/file/iocompl.c Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/w32api/include/winbase.h _____ Modified: trunk/reactos/lib/kernel32/file/iocompl.c --- trunk/reactos/lib/kernel32/file/iocompl.c 2006-01-14 22:25:20 UTC (rev 20868) +++ trunk/reactos/lib/kernel32/file/iocompl.c 2006-01-14 22:47:35 UTC (rev 20869) @@ -187,4 +187,29 @@ return(TRUE); } + +/* + * @unimplemented + */ +BOOL +WINAPI +CancelIoEx(IN HANDLE hFile, + IN LPOVERLAPPED lpOverlapped) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +CancelSynchronousIo(IN HANDLE hThread) +{ + UNIMPLEMENTED; + return FALSE; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 22:25:20 UTC (rev 20868) +++ trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 22:47:35 UTC (rev 20869) @@ -70,6 +70,8 @@ CallNamedPipeW@28 CancelDeviceWakeupRequest@4 CancelIo@4 +CancelIoEx@8 +CancelSynchronousIo@4 CancelTimerQueueTimer@8 CancelWaitableTimer@4 ChangeTimerQueueTimer@16 _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2006-01-14 22:25:20 UTC (rev 20868) +++ trunk/reactos/w32api/include/winbase.h 2006-01-14 22:47:35 UTC (rev 20869) @@ -1116,6 +1116,10 @@ BOOL WINAPI CallNamedPipeW(LPCWSTR,PVOID,DWORD,PVOID,DWORD,PDWORD,DWORD); BOOL WINAPI CancelDeviceWakeupRequest(HANDLE); BOOL WINAPI CancelIo(HANDLE); +#if (_WIN32_WINNT >= 0x0600) +BOOL WINAPI CancelIoEx(HANDLE,LPOVERLAPPED); +BOOL WINAPI CancelSynchronousIo(HANDLE); +#endif BOOL WINAPI CancelWaitableTimer(HANDLE); #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI CheckNameLegalDOS8Dot3A(LPCSTR,LPSTR,DWORD,PBOOL,PBOOL);

1 0

[weiden] 20868: added stubs for SetFileBandwidthReservation(), GetFileBandwidthReservation(), SetFileCompletionNotificationModes() and OpenFileById(). Thanks also to Alex
by weiden＠svn.reactos.org 14 Jan '06

14 Jan '06

added stubs for SetFileBandwidthReservation(), GetFileBandwidthReservation(), SetFileCompletionNotificationModes() and OpenFileById(). Thanks also to Alex Modified: trunk/reactos/lib/kernel32/file/file.c Modified: trunk/reactos/lib/kernel32/kernel32.def Modified: trunk/reactos/w32api/include/winbase.h Modified: trunk/reactos/w32api/include/winnt.h _____ Modified: trunk/reactos/lib/kernel32/file/file.c --- trunk/reactos/lib/kernel32/file/file.c 2006-01-14 22:18:07 UTC (rev 20867) +++ trunk/reactos/lib/kernel32/file/file.c 2006-01-14 22:25:20 UTC (rev 20868) @@ -1679,8 +1679,85 @@ IN DWORD cchFilePath, IN DWORD dwFlags) { + if (dwFlags & ~(VOLUME_NAME_DOS | VOLUME_NAME_GUID | VOLUME_NAME_NT | + VOLUME_NAME_NONE | FILE_NAME_NORMALIZED | FILE_NAME_OPENED)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return 0; + } + UNIMPLEMENTED; return 0; } + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFileBandwidthReservation(IN HANDLE hFile, + IN DWORD nPeriodMilliseconds, + IN DWORD nBytesPerPeriod, + IN BOOL bDiscardable, + OUT LPDWORD lpTransferSize, + OUT LPDWORD lpNumOutstandingRequests) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +GetFileBandwidthReservation(IN HANDLE hFile, + OUT LPDWORD lpPeriodMilliseconds, + OUT LPDWORD lpBytesPerPeriod, + OUT LPBOOL pDiscardable, + OUT LPDWORD lpTransferSize, + OUT LPDWORD lpNumOutstandingRequests) +{ + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +BOOL +WINAPI +SetFileCompletionNotificationModes(IN HANDLE FileHandle, + IN UCHAR Flags) +{ + if (Flags & ~(FILE_SKIP_COMPLETION_PORT_ON_SUCCESS | FILE_SKIP_SET_EVENT_ON_HANDLE)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + UNIMPLEMENTED; + return FALSE; +} + + +/* + * @unimplemented + */ +HANDLE +WINAPI +OpenFileById(IN HANDLE hFile, + IN LPFILE_ID_DESCRIPTOR lpFileID, + IN DWORD dwDesiredAccess, + IN DWORD dwShareMode, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes OPTIONAL, + IN DWORD dwFlags) +{ + UNIMPLEMENTED; + return INVALID_HANDLE_VALUE; +} + /* EOF */ _____ Modified: trunk/reactos/lib/kernel32/kernel32.def --- trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 22:18:07 UTC (rev 20867) +++ trunk/reactos/lib/kernel32/kernel32.def 2006-01-14 22:25:20 UTC (rev 20868) @@ -382,6 +382,7 @@ GetFileAttributesByHandle@12 GetFileAttributesExA@12 GetFileAttributesExW@12 +GetFileBandwidthReservation@24 GetFileInformationByHandle@8 GetFileSize@8 GetFileSizeEx@8 @@ -663,6 +664,7 @@ OpenEventA@12 OpenEventW@12 OpenFile@12 +OpenFileById@24 OpenFileMappingA@12 OpenFileMappingW@12 OpenJobObjectA@12 @@ -822,6 +824,8 @@ SetFileAttributesA@8 SetFileAttributesW@8 SetFileAttributesByHandle@12 +SetFileBandwidthReservation@24 +SetFileCompletionNotificationModes@8 SetFilePointer@16 SetFilePointerEx@20 SetFileShortNameA@8 _____ Modified: trunk/reactos/w32api/include/winbase.h --- trunk/reactos/w32api/include/winbase.h 2006-01-14 22:18:07 UTC (rev 20867) +++ trunk/reactos/w32api/include/winbase.h 2006-01-14 22:25:20 UTC (rev 20868) @@ -519,6 +519,14 @@ #define RESTART_CYCLICAL 0x1 #define RESTART_NOTIFY_SOLUTION 0x2 #define RESTART_NOTIFY_FAULT 0x4 +#define VOLUME_NAME_DOS 0x0 +#define VOLUME_NAME_GUID 0x1 +#define VOLUME_NAME_NT 0x2 +#define VOLUME_NAME_NONE 0x4 +#define FILE_NAME_NORMALIZED 0x0 +#define FILE_NAME_OPENED 0x8 +#define FILE_SKIP_COMPLETION_PORT_ON_SUCCESS 0x1 +#define FILE_SKIP_SET_EVENT_ON_HANDLE 0x2 #endif #if (_WIN32_WINNT >= 0x0500) #define GET_MODULE_HANDLE_EX_FLAG_PIN 0x1 @@ -808,6 +816,19 @@ DWORD dwStreamNameSize; WCHAR cStreamName[ANYSIZE_ARRAY]; } WIN32_STREAM_ID, *LPWIN32_STREAM_ID; +#if (_WIN32_WINNT >= 0x0600) +typedef enum _FILE_ID_TYPE { + FileIdType, + MaximumFileIdType +} FILE_ID_TYPE, *PFILE_ID_TYPE; +typedef struct _FILE_ID_DESCRIPTOR { + DWORD dwSize; + FILE_ID_TYPE Type; + _ANONYMOUS_UNION union { + LARGE_INTEGER FileID; + } DUMMYUNIONNAME; +} FILE_ID_DESCRIPTOR, *LPFILE_ID_DESCRIPTOR; +#endif typedef enum _FINDEX_INFO_LEVELS { FindExInfoStandard, FindExInfoMaxInfoLevel @@ -1374,6 +1395,9 @@ DWORD WINAPI GetFileAttributesW(LPCWSTR); BOOL WINAPI GetFileAttributesExA(LPCSTR,GET_FILEEX_INFO_LEVELS,PVOID); BOOL WINAPI GetFileAttributesExW(LPCWSTR,GET_FILEEX_INFO_LEVELS,PVOID); +#if (_WIN32_WINNT >= 0x0600) +BOOL WINAPI GetFileBandwidthReservation(HANDLE,LPDWORD,LPDWORD,LPBOOL,LPDWORD,LPDWOR D); +#endif BOOL WINAPI GetFileInformationByHandle(HANDLE,LPBY_HANDLE_FILE_INFORMATION); BOOL WINAPI GetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD, PDWORD); BOOL WINAPI GetFileSecurityW(LPCWSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,DWORD ,PDWORD); @@ -1703,6 +1727,9 @@ HANDLE WINAPI OpenEventLogW(LPCWSTR,LPCWSTR); HANDLE WINAPI OpenEventW(DWORD,BOOL,LPCWSTR); HFILE WINAPI OpenFile(LPCSTR,LPOFSTRUCT,UINT); +#if (_WIN32_WINNT >= 0x0600) +HANDLE WINAPI OpenFileById(HANDLE,LPFILE_ID_DESCRIPTOR,DWORD,DWORD,LPSECURITY_ATTRIBUT ES,DWORD); +#endif HANDLE WINAPI OpenFileMappingA(DWORD,BOOL,LPCSTR); HANDLE WINAPI OpenFileMappingW(DWORD,BOOL,LPCWSTR); HANDLE WINAPI OpenMutexA(DWORD,BOOL,LPCSTR); @@ -1814,6 +1841,10 @@ BOOL WINAPI SetFileAttributesByHandle(HANDLE,DWORD,DWORD); #endif BOOL WINAPI SetFileAttributesW(LPCWSTR,DWORD); +#if (_WIN32_WINNT >= 0x0600) +BOOL WINAPI SetFileBandwidthReservation(HANDLE,DWORD,DWORD,BOOL,LPDWORD,LPDWORD); +BOOL WINAPI SetFileCompletionNotificationModes(HANDLE,UCHAR); +#endif DWORD WINAPI SetFilePointer(HANDLE,LONG,PLONG,DWORD); BOOL WINAPI SetFilePointerEx(HANDLE,LARGE_INTEGER,PLARGE_INTEGER,DWORD); BOOL WINAPI SetFileSecurityA(LPCSTR,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR); _____ Modified: trunk/reactos/w32api/include/winnt.h --- trunk/reactos/w32api/include/winnt.h 2006-01-14 22:18:07 UTC (rev 20867) +++ trunk/reactos/w32api/include/winnt.h 2006-01-14 22:25:20 UTC (rev 20868) @@ -2171,29 +2171,29 @@ PCONTEXT ContextRecord; } EXCEPTION_POINTERS,*PEXCEPTION_POINTERS,*LPEXCEPTION_POINTERS; typedef union _LARGE_INTEGER { - struct { - DWORD LowPart; - LONG HighPart; - } u; #if ! defined(NONAMELESSUNION) || defined(__cplusplus) _ANONYMOUS_STRUCT struct { DWORD LowPart; LONG HighPart; }; #endif /* NONAMELESSUNION */ + struct { + DWORD LowPart; + LONG HighPart; + } u; LONGLONG QuadPart; } LARGE_INTEGER, *PLARGE_INTEGER; typedef union _ULARGE_INTEGER { - struct { - DWORD LowPart; - DWORD HighPart; - } u; #if ! defined(NONAMELESSUNION) || defined(__cplusplus) _ANONYMOUS_STRUCT struct { DWORD LowPart; DWORD HighPart; }; #endif /* NONAMELESSUNION */ + struct { + DWORD LowPart; + DWORD HighPart; + } u; ULONGLONG QuadPart; } ULARGE_INTEGER, *PULARGE_INTEGER; typedef struct _LUID {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs