Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 43623: - Add VLC to rapps. See issue #4882 for more details.
by fireball＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: fireball Date: Mon Oct 19 21:38:57 2009 New Revision: 43623 URL: http://svn.reactos.org/svn/reactos?rev=43623&view=rev Log: - Add VLC to rapps. See issue #4882 for more details. Added: trunk/reactos/base/applications/rapps/rapps/vlc.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/vlc.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vlc.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/vlc.txt [iso-8859-1] Mon Oct 19 21:38:57 2009 @@ -1,0 +1,12 @@ +; UTF-8 + +[Section] +Name = VLC media player +Version = 1.0.2 +Licence = GPL +Description = A media player. +Size = 18MB +Category = 1 +URLSite = http://www.videolan.org/vlc/ +URLDownload = http://mirror.services.wisc.edu/mirrors/videolan/vlc/1.0.2/win32/vlc-1.0.2-… +CDPath = none Propchange: trunk/reactos/base/applications/rapps/rapps/vlc.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 43622: update libxslt headers as well
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 21:28:32 2009 New Revision: 43622 URL: http://svn.reactos.org/svn/reactos?rev=43622&view=rev Log: update libxslt headers as well Added: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h (with props) Modified: trunk/reactos/include/reactos/libs/libxslt/extensions.h trunk/reactos/include/reactos/libs/libxslt/libxslt.h trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h Modified: trunk/reactos/include/reactos/libs/libxslt/extensions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/extensions.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxslt/extensions.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -22,6 +22,16 @@ /** * Extension Modules API. */ + +/** + * xsltInitGlobals: + * + * Initialize the global variables for extensions + * + */ + +XSLTPUBFUN void XSLTCALL + xsltInitGlobals (void); /** * xsltStyleExtInitFunction: @@ -86,11 +96,11 @@ XSLTPUBFUN int XSLTCALL xsltUnregisterExtModule (const xmlChar * URI); -XSLTPUBFUN void * XSLTCALL +XSLTPUBFUN void * XSLTCALL xsltGetExtData (xsltTransformContextPtr ctxt, const xmlChar *URI); -XSLTPUBFUN void * XSLTCALL +XSLTPUBFUN void * XSLTCALL xsltStyleGetExtData (xsltStylesheetPtr style, const xmlChar *URI); #ifdef XSLT_REFACTORED @@ -99,33 +109,29 @@ xsltStylesheetPtr style, const xmlChar * URI); #endif -XSLTPUBFUN void XSLTCALL - xsltShutdownCtxtExts (xsltTransformContextPtr ctxt); - -XSLTPUBFUN void XSLTCALL - xsltShutdownExts (xsltStylesheetPtr style); - -XSLTPUBFUN xsltTransformContextPtr XSLTCALL - xsltXPathGetTransformContext +XSLTPUBFUN void XSLTCALL + xsltShutdownCtxtExts (xsltTransformContextPtr ctxt); + +XSLTPUBFUN void XSLTCALL + xsltShutdownExts (xsltStylesheetPtr style); + +XSLTPUBFUN xsltTransformContextPtr XSLTCALL + xsltXPathGetTransformContext (xmlXPathParserContextPtr ctxt); /* * extension functions */ -XSLTPUBFUN int XSLTCALL - xsltRegisterExtModuleFunction +XSLTPUBFUN int XSLTCALL + xsltRegisterExtModuleFunction (const xmlChar *name, const xmlChar *URI, xmlXPathFunction function); XSLTPUBFUN xmlXPathFunction XSLTCALL - xsltExtFunctionLookup (xsltTransformContextPtr ctxt, - const xmlChar *name, - const xmlChar *URI); -XSLTPUBFUN xmlXPathFunction XSLTCALL xsltExtModuleFunctionLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleFunction +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleFunction (const xmlChar *name, const xmlChar *URI); @@ -133,7 +139,7 @@ * extension elements */ typedef xsltElemPreCompPtr (*xsltPreComputeFunction) - (xsltStylesheetPtr style, + (xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function); @@ -141,33 +147,33 @@ xsltNewElemPreComp (xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltInitElemPreComp (xsltElemPreCompPtr comp, xsltStylesheetPtr style, xmlNodePtr inst, xsltTransformFunction function, xsltElemPreCompDeallocator freeFunc); -XSLTPUBFUN int XSLTCALL - xsltRegisterExtModuleElement +XSLTPUBFUN int XSLTCALL + xsltRegisterExtModuleElement (const xmlChar *name, const xmlChar *URI, xsltPreComputeFunction precomp, xsltTransformFunction transform); -XSLTPUBFUN xsltTransformFunction XSLTCALL +XSLTPUBFUN xsltTransformFunction XSLTCALL xsltExtElementLookup (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN xsltTransformFunction XSLTCALL +XSLTPUBFUN xsltTransformFunction XSLTCALL xsltExtModuleElementLookup (const xmlChar *name, const xmlChar *URI); -XSLTPUBFUN xsltPreComputeFunction XSLTCALL - xsltExtModuleElementPreComputeLookup - (const xmlChar *name, - const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleElement +XSLTPUBFUN xsltPreComputeFunction XSLTCALL + xsltExtModuleElementPreComputeLookup + (const xmlChar *name, + const xmlChar *URI); +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleElement (const xmlChar *name, const xmlChar *URI); @@ -177,28 +183,28 @@ typedef void (*xsltTopLevelFunction) (xsltStylesheetPtr style, xmlNodePtr inst); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtModuleTopLevel (const xmlChar *name, const xmlChar *URI, xsltTopLevelFunction function); -XSLTPUBFUN xsltTopLevelFunction XSLTCALL - xsltExtModuleTopLevelLookup - (const xmlChar *name, - const xmlChar *URI); -XSLTPUBFUN int XSLTCALL - xsltUnregisterExtModuleTopLevel +XSLTPUBFUN xsltTopLevelFunction XSLTCALL + xsltExtModuleTopLevelLookup + (const xmlChar *name, + const xmlChar *URI); +XSLTPUBFUN int XSLTCALL + xsltUnregisterExtModuleTopLevel (const xmlChar *name, const xmlChar *URI); /* These 2 functions are deprecated for use within modules. */ -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtFunction (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, xmlXPathFunction function); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtElement (xsltTransformContextPtr ctxt, const xmlChar *name, const xmlChar *URI, @@ -209,24 +215,24 @@ * Those are used by the XSLT (pre)processor. */ -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltRegisterExtPrefix (xsltStylesheetPtr style, const xmlChar *prefix, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltCheckExtPrefix (xsltStylesheetPtr style, const xmlChar *URI); XSLTPUBFUN int XSLTCALL xsltCheckExtURI (xsltStylesheetPtr style, const xmlChar *URI); -XSLTPUBFUN int XSLTCALL +XSLTPUBFUN int XSLTCALL xsltInitCtxtExts (xsltTransformContextPtr ctxt); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltFreeCtxtExts (xsltTransformContextPtr ctxt); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltFreeExts (xsltStylesheetPtr style); -XSLTPUBFUN xsltElemPreCompPtr XSLTCALL +XSLTPUBFUN xsltElemPreCompPtr XSLTCALL xsltPreComputeExtModuleElement (xsltStylesheetPtr style, xmlNodePtr inst); @@ -235,16 +241,16 @@ * Used by exslt initialisation */ -XSLTPUBFUN xmlHashTablePtr XSLTCALL - xsltGetExtInfo (xsltStylesheetPtr style, +XSLTPUBFUN xmlHashTablePtr XSLTCALL + xsltGetExtInfo (xsltStylesheetPtr style, const xmlChar *URI); /** * Test module http://xmlsoft.org/XSLT/ */ -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltRegisterTestModule (void); -XSLTPUBFUN void XSLTCALL +XSLTPUBFUN void XSLTCALL xsltDebugDumpExtensions (FILE * output); Modified: trunk/reactos/include/reactos/libs/libxslt/libxslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/libxslt.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxslt/libxslt.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -16,7 +16,7 @@ #include "config.h" #endif -#include "xsltconfig.h" +#include <libxslt/xsltconfig.h> #include <libxml/xmlversion.h> #if !defined LIBXSLT_PUBLIC Modified: trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/libxslt/xsltconfig.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -20,28 +20,28 @@ * * the version string like "1.2.3" */ -#define LIBXSLT_DOTTED_VERSION "1.1.24" +#define LIBXSLT_DOTTED_VERSION "1.1.26" /** * LIBXSLT_VERSION: * * the version number: 1.2.3 value is 10203 */ -#define LIBXSLT_VERSION 10124 +#define LIBXSLT_VERSION 10126 /** * LIBXSLT_VERSION_STRING: * * the version number string, 1.2.3 value is "10203" */ -#define LIBXSLT_VERSION_STRING "10124" +#define LIBXSLT_VERSION_STRING "10126" /** * LIBXSLT_VERSION_EXTRA: * * extra version information, used to show a CVS compilation */ -#define LIBXSLT_VERSION_EXTRA "-CVS1070" +#define LIBXSLT_VERSION_EXTRA "-GITv1.1.26" /** * WITH_XSLT_DEBUG: @@ -124,6 +124,19 @@ #endif /** + * Locale support + */ +#if 1 +#ifndef XSLT_LOCALE_XLOCALE +#define XSLT_LOCALE_XLOCALE +#endif +#elif 0 +#ifndef XSLT_LOCALE_WINAPI +#define XSLT_LOCALE_WINAPI +#endif +#endif + +/** * ATTRIBUTE_UNUSED: * * This macro is used to flag unused function parameters to GCC Added: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/libxs… ============================================================================== --- trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h (added) +++ trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h [iso-8859-1] Mon Oct 19 21:28:32 2009 @@ -1,0 +1,57 @@ +/* + * Summary: Locale handling + * Description: Interfaces for locale handling. Needed for language dependent + * sorting. + * + * Copy: See Copyright for the status of this software. + * + * Author: Nick Wellnhofer + */ + +#ifndef __XML_XSLTLOCALE_H__ +#define __XML_XSLTLOCALE_H__ + +#include <libxml/xmlstring.h> + +#ifdef XSLT_LOCALE_XLOCALE + +#include <locale.h> +#include <xlocale.h> + +#ifdef __GLIBC__ +/*locale_t is defined only if _GNU_SOURCE is defined*/ +typedef __locale_t xsltLocale; +#else +typedef locale_t xsltLocale; +#endif +typedef xmlChar xsltLocaleChar; + +#elif defined(XSLT_LOCALE_WINAPI) + +#include <windows.h> +#include <winnls.h> + +typedef LCID xsltLocale; +typedef wchar_t xsltLocaleChar; + +#else + +/* + * XSLT_LOCALE_NONE: + * Macro indicating that locale are not supported + */ +#ifndef XSLT_LOCALE_NONE +#define XSLT_LOCALE_NONE +#endif + +typedef void *xsltLocale; +typedef xmlChar xsltLocaleChar; + +#endif + +xsltLocale xsltNewLocale(const xmlChar *langName); +void xsltFreeLocale(xsltLocale locale); +xsltLocaleChar *xsltStrxfrm(xsltLocale locale, const xmlChar *string); +int xsltLocaleStrcmp(xsltLocale locale, const xsltLocaleChar *str1, const xsltLocaleChar *str2); + +#endif /* __XML_XSLTLOCALE_H__ */ Propchange: trunk/reactos/include/reactos/libs/libxslt/xsltlocale.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[fireball] 43621: - Revert 43599: "Temporarily disable hanging gdi32:metafile test."
by fireball＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: fireball Date: Mon Oct 19 21:24:39 2009 New Revision: 43621 URL: http://svn.reactos.org/svn/reactos?rev=43621&view=rev Log: - Revert 43599: "Temporarily disable hanging gdi32:metafile test." Modified: trunk/rostests/winetests/gdi32/testlist.c Modified: trunk/rostests/winetests/gdi32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/testlist.… ============================================================================== --- trunk/rostests/winetests/gdi32/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/testlist.c [iso-8859-1] Mon Oct 19 21:24:39 2009 @@ -31,7 +31,7 @@ { "generated", func_generated }, { "icm", func_icm }, { "mapping", func_mapping }, - //{ "metafile", func_metafile }, + { "metafile", func_metafile }, { "palette", func_palette }, { "path", func_path }, { "pen", func_pen },

1 0

[cwittich] 43620: update libxslt to version 1.1.26
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 21:11:29 2009 New Revision: 43620 URL: http://svn.reactos.org/svn/reactos?rev=43620&view=rev Log: update libxslt to version 1.1.26 Added: trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c (with props) trunk/reactos/dll/3rdparty/libxslt/xsltlocale.h (with props) Modified: trunk/reactos/dll/3rdparty/libxslt/ChangeLog trunk/reactos/dll/3rdparty/libxslt/Makefile.am trunk/reactos/dll/3rdparty/libxslt/Makefile.in trunk/reactos/dll/3rdparty/libxslt/attributes.c trunk/reactos/dll/3rdparty/libxslt/attrvt.c trunk/reactos/dll/3rdparty/libxslt/extensions.c trunk/reactos/dll/3rdparty/libxslt/extensions.h trunk/reactos/dll/3rdparty/libxslt/extra.c trunk/reactos/dll/3rdparty/libxslt/functions.c trunk/reactos/dll/3rdparty/libxslt/imports.c trunk/reactos/dll/3rdparty/libxslt/keys.c trunk/reactos/dll/3rdparty/libxslt/libxslt.h trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild trunk/reactos/dll/3rdparty/libxslt/namespaces.c trunk/reactos/dll/3rdparty/libxslt/pattern.c trunk/reactos/dll/3rdparty/libxslt/preproc.c trunk/reactos/dll/3rdparty/libxslt/security.c trunk/reactos/dll/3rdparty/libxslt/templates.c trunk/reactos/dll/3rdparty/libxslt/transform.c trunk/reactos/dll/3rdparty/libxslt/transform.h trunk/reactos/dll/3rdparty/libxslt/trio.h trunk/reactos/dll/3rdparty/libxslt/triodef.h trunk/reactos/dll/3rdparty/libxslt/variables.c trunk/reactos/dll/3rdparty/libxslt/xslt.c trunk/reactos/dll/3rdparty/libxslt/xsltInternals.h trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in trunk/reactos/dll/3rdparty/libxslt/xsltutils.c trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/3rdparty/libxslt/ChangeLog URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Chang… Modified: trunk/reactos/dll/3rdparty/libxslt/Makefile.am URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makef… Modified: trunk/reactos/dll/3rdparty/libxslt/Makefile.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/Makef… Modified: trunk/reactos/dll/3rdparty/libxslt/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attri… Modified: trunk/reactos/dll/3rdparty/libxslt/attrvt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/attrv… Modified: trunk/reactos/dll/3rdparty/libxslt/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… Modified: trunk/reactos/dll/3rdparty/libxslt/extensions.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/exten… Modified: trunk/reactos/dll/3rdparty/libxslt/extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/extra… Modified: trunk/reactos/dll/3rdparty/libxslt/functions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/funct… Modified: trunk/reactos/dll/3rdparty/libxslt/imports.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/impor… Modified: trunk/reactos/dll/3rdparty/libxslt/keys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/keys.… Modified: trunk/reactos/dll/3rdparty/libxslt/libxslt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… Modified: trunk/reactos/dll/3rdparty/libxslt/libxslt.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/libxs… Modified: trunk/reactos/dll/3rdparty/libxslt/namespaces.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/names… Modified: trunk/reactos/dll/3rdparty/libxslt/pattern.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/patte… Modified: trunk/reactos/dll/3rdparty/libxslt/preproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/prepr… Modified: trunk/reactos/dll/3rdparty/libxslt/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/secur… Modified: trunk/reactos/dll/3rdparty/libxslt/templates.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/templ… Modified: trunk/reactos/dll/3rdparty/libxslt/transform.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… Modified: trunk/reactos/dll/3rdparty/libxslt/transform.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trans… Modified: trunk/reactos/dll/3rdparty/libxslt/trio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/trio.… Modified: trunk/reactos/dll/3rdparty/libxslt/triodef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/triod… Modified: trunk/reactos/dll/3rdparty/libxslt/variables.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/varia… Modified: trunk/reactos/dll/3rdparty/libxslt/xslt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xslt.… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltInternals.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltI… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltconfig.h.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltc… Added: trunk/reactos/dll/3rdparty/libxslt/xsltlocale.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltl… Added: trunk/reactos/dll/3rdparty/libxslt/xsltlocale.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltl… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltu… Modified: trunk/reactos/dll/3rdparty/libxslt/xsltwin32config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/libxslt/xsltw…

1 0

[cwittich] 43619: -sync msxml3 with wine 1.1.31
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 20:58:31 2009 New Revision: 43619 URL: http://svn.reactos.org/svn/reactos?rev=43619&view=rev Log: -sync msxml3 with wine 1.1.31 Modified: trunk/reactos/dll/win32/msxml3/attribute.c trunk/reactos/dll/win32/msxml3/cdata.c trunk/reactos/dll/win32/msxml3/comment.c trunk/reactos/dll/win32/msxml3/docfrag.c trunk/reactos/dll/win32/msxml3/domdoc.c trunk/reactos/dll/win32/msxml3/element.c trunk/reactos/dll/win32/msxml3/entityref.c trunk/reactos/dll/win32/msxml3/msxml_private.h trunk/reactos/dll/win32/msxml3/node.c trunk/reactos/dll/win32/msxml3/pi.c trunk/reactos/dll/win32/msxml3/text.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/msxml3/attribute.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/attribute… Modified: trunk/reactos/dll/win32/msxml3/cdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/cdata.c?r… Modified: trunk/reactos/dll/win32/msxml3/comment.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/comment.c… Modified: trunk/reactos/dll/win32/msxml3/docfrag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/docfrag.c… Modified: trunk/reactos/dll/win32/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/domdoc.c?… Modified: trunk/reactos/dll/win32/msxml3/element.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/element.c… Modified: trunk/reactos/dll/win32/msxml3/entityref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/entityref… Modified: trunk/reactos/dll/win32/msxml3/msxml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/msxml_pri… Modified: trunk/reactos/dll/win32/msxml3/node.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/node.c?re… Modified: trunk/reactos/dll/win32/msxml3/pi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/pi.c?rev=… Modified: trunk/reactos/dll/win32/msxml3/text.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/text.c?re…

1 0

[janderwald] 43618: [PORTCLS] - Silence most dprints of portcls - Remove dead code - Fix a bug in PcCreateSubdeviceDescriptor
by janderwald＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: janderwald Date: Mon Oct 19 20:54:01 2009 New Revision: 43618 URL: http://svn.reactos.org/svn/reactos?rev=43618&view=rev Log: [PORTCLS] - Silence most dprints of portcls - Remove dead code - Fix a bug in PcCreateSubdeviceDescriptor Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/adapter.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -28,11 +28,11 @@ IN PUNICODE_STRING RegistryPathName, IN PDRIVER_ADD_DEVICE AddDevice) { - DPRINT1("PcInitializeAdapterDriver\n"); + DPRINT("PcInitializeAdapterDriver\n"); PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); // Our IRP handlers - DPRINT1("Setting IRP handlers\n"); + DPRINT("Setting IRP handlers\n"); DriverObject->MajorFunction[IRP_MJ_CREATE] = PcDispatchIrp; DriverObject->MajorFunction[IRP_MJ_PNP] = PcDispatchIrp; DriverObject->MajorFunction[IRP_MJ_POWER] = PcDispatchIrp; @@ -79,7 +79,7 @@ PDEVICE_OBJECT PrevDeviceObject; PPCLASS_DEVICE_EXTENSION portcls_ext = NULL; - DPRINT1("PcAddAdapterDevice called\n"); + DPRINT("PcAddAdapterDevice called\n"); PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); if (!DriverObject || !PhysicalDeviceObject || !StartDevice) @@ -215,7 +215,7 @@ UNICODE_STRING RefName; PSYMBOLICLINK_ENTRY SymEntry; - DPRINT1("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); + DPRINT("PcRegisterSubdevice DeviceObject %p Name %S Unknown %p\n", DeviceObject, Name, Unknown); PC_ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); @@ -240,7 +240,7 @@ Status = Unknown->QueryInterface(IID_ISubdevice, (LPVOID*)&SubDevice); if (!NT_SUCCESS(Status)) { - DPRINT1("No ISubdevice interface\n"); + DPRINT("No ISubdevice interface\n"); // the provided port driver doesnt support ISubdevice return STATUS_INVALID_PARAMETER; } @@ -249,7 +249,7 @@ Status = SubDevice->GetDescriptor(&SubDeviceDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get subdevice descriptor %x\n", Status); + DPRINT("Failed to get subdevice descriptor %x\n", Status); SubDevice->Release(); return STATUS_UNSUCCESSFUL; } @@ -260,7 +260,7 @@ { // failed to attach SubDevice->Release(); - DPRINT1("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); + DPRINT("KsAddObjectCreateItemToDeviceHeader failed with %x\n", Status); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/api.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -92,7 +92,7 @@ TimerContext = (PTIMER_CONTEXT)AllocateItem(NonPagedPool, sizeof(TIMER_CONTEXT), TAG_PORTCLASS); if (!TimerContext) { - DPRINT1("Failed to allocate memory\n"); + DPRINT("Failed to allocate memory\n"); return STATUS_INSUFFICIENT_RESOURCES; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/dma_slave.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -82,7 +82,7 @@ PUNKNOWN(*Output)->AddRef(); return STATUS_SUCCESS; } - DPRINT1("No interface!!!\n"); + DPRINT("No interface!!!\n"); return STATUS_UNSUCCESSFUL; } @@ -101,20 +101,20 @@ // Did the caller already allocate a buffer ?*/ if (m_Buffer) { - DPRINT1("CDmaChannelInit_AllocateBuffer free common buffer first \n"); + DPRINT("CDmaChannelInit_AllocateBuffer free common buffer first \n"); return STATUS_UNSUCCESSFUL; } m_Buffer = m_pAdapter->DmaOperations->AllocateCommonBuffer(m_pAdapter, BufferSize, &m_Address, FALSE); if (!m_Buffer) { - DPRINT1("CDmaChannelInit_AllocateBuffer fAllocateCommonBuffer failed \n"); + DPRINT("CDmaChannelInit_AllocateBuffer fAllocateCommonBuffer failed \n"); return STATUS_UNSUCCESSFUL; } m_BufferSize = BufferSize; m_AllocatedBufferSize = BufferSize; - DPRINT1("CDmaChannelInit::AllocateBuffer Success Buffer %p BufferSize %u Address %x\n", m_Buffer, BufferSize, m_Address); + DPRINT("CDmaChannelInit::AllocateBuffer Success Buffer %p BufferSize %u Address %x\n", m_Buffer, BufferSize, m_Address); return STATUS_SUCCESS; } @@ -162,7 +162,7 @@ if (!m_Buffer) { - DPRINT1("CDmaChannelInit_FreeBuffer allocate common buffer first \n"); + DPRINT("CDmaChannelInit_FreeBuffer allocate common buffer first \n"); return; } @@ -222,6 +222,7 @@ NTAPI CDmaChannelInit::BufferSize() { + DPRINT("BufferSize %u\n", m_BufferSize); return m_BufferSize; } @@ -254,6 +255,8 @@ if (!m_DmaStarted || Counter >= m_LastTransferCount) Counter = 0; + + DPRINT("ReadCounter %u\n", Counter); return Counter; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/drm_port.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -57,7 +57,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("IDrmPort2_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("IDrmPort2_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_dmus.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -138,7 +138,7 @@ if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { - DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -95,7 +95,7 @@ if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { - DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -141,9 +141,9 @@ if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { - DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); - Irp->IoStatus.Status = STATUS_SUCCESS; + Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; @@ -336,7 +336,6 @@ if (m_Pins[Index] == Pin) { m_Descriptor->Factory.Instances[Index].CurrentPinInstanceCount--; - m_Pins[Index]->Release(); m_Pins[Index] = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavepci.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -143,7 +143,7 @@ if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { - DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/filter_wavert.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -147,7 +147,7 @@ if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { - DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); Irp->IoStatus.Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -797,6 +797,8 @@ STDMETHOD_(PMINIPORT, GetMiniport)(THIS) PURE; }; +typedef IPortPinWaveCyclic *PPORTPINWAVECYCLIC; + #define IMP_IPortPinWaveCyclic \ IMP_IIrpTarget; \ STDMETHODIMP_(NTSTATUS) Init(THIS_ \ Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interrupt.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -82,7 +82,7 @@ return STATUS_SUCCESS; } - DPRINT1("CInterruptSync::QueryInterface: this %p UNKNOWN interface requested\n", this); + DPRINT("CInterruptSync::QueryInterface: this %p UNKNOWN interface requested\n", this); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -126,7 +126,7 @@ return PcCompleteIrp(DeviceObject, Irp, Status); } - DPRINT1("unhandled function %u\n", IoStack->MinorFunction); + DPRINT("unhandled function %u\n", IoStack->MinorFunction); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -182,7 +182,7 @@ if (DeviceExtension->AdapterPowerManagement) { // release adapter power management - DPRINT1("Power %u\n", DeviceExtension->AdapterPowerManagement->Release()); + DPRINT("Power %u\n", DeviceExtension->AdapterPowerManagement->Release()); } Irp->IoStatus.Status = STATUS_SUCCESS; @@ -229,7 +229,7 @@ return PortClsShutdown(DeviceObject, Irp); default: - DPRINT1("Unhandled function %x\n", IoStack->MajorFunction); + DPRINT("Unhandled function %x\n", IoStack->MajorFunction); break; }; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -108,6 +108,8 @@ NTSTATUS Status = STATUS_SUCCESS; PIO_STACK_LOCATION IoStack; + PC_ASSERT(KeGetCurrentIrql() == PASSIVE_LEVEL); + // get current irp stack location IoStack = IoGetCurrentIrpStackLocation(Irp); @@ -126,7 +128,7 @@ // check for success if (!NT_SUCCESS(Status)) { - DPRINT1("KsProbeStreamIrp failed with %x\n", Status); + DPRINT("KsProbeStreamIrp failed with %x\n", Status); return Status; } } @@ -135,7 +137,7 @@ PC_ASSERT(Header); PC_ASSERT(Irp->MdlAddress); - DPRINT1("Size %u DataUsed %u FrameExtent %u SizeHeader %u NumDataAvailable %u OutputLength %u\n", Header->Size, Header->DataUsed, Header->FrameExtent, sizeof(KSSTREAM_HEADER), m_NumDataAvailable, IoStack->Parameters.DeviceIoControl.OutputBufferLength); + DPRINT("Size %u DataUsed %u FrameExtent %u SizeHeader %u NumDataAvailable %u OutputLength %u\n", Header->Size, Header->DataUsed, Header->FrameExtent, sizeof(KSSTREAM_HEADER), m_NumDataAvailable, IoStack->Parameters.DeviceIoControl.OutputBufferLength); Header->Data = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); PC_ASSERT(Header->Data); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -238,7 +238,7 @@ { // reset start stream This->m_IrpQueue->CancelBuffers(); //FIX function name - DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->m_PreCompleted, This->m_PostCompleted); + DPRINT("Stopping PreCompleted %u PostCompleted %u\n", This->m_PreCompleted, This->m_PostCompleted); } } } @@ -546,7 +546,7 @@ if (Stream) { - DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); + DPRINT("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->Release(); } } @@ -564,14 +564,14 @@ Ctx = (PCLOSESTREAM_CONTEXT)AllocateItem(NonPagedPool, sizeof(CLOSESTREAM_CONTEXT), TAG_PORTCLASS); if (!Ctx) { - DPRINT1("Failed to allocate stream context\n"); + DPRINT("Failed to allocate stream context\n"); goto cleanup; } Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); if (!Ctx->WorkItem) { - DPRINT1("Failed to allocate work item\n"); + DPRINT("Failed to allocate work item\n"); goto cleanup; } @@ -714,14 +714,14 @@ } else { - DPRINT1("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); + DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); KeBugCheck(0); } Status = NewIrpQueue(&m_IrpQueue); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to allocate IrpQueue with %x\n", Status); + DPRINT("Failed to allocate IrpQueue with %x\n", Status); return Status; } @@ -762,7 +762,7 @@ Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to add pin to service group\n"); + DPRINT("Failed to add pin to service group\n"); return Status; } m_ServiceGroup->SupportDelayedService(); @@ -771,7 +771,7 @@ Status = m_IrpQueue->Init(ConnectDetails, m_Format, DeviceObject, 0, 0, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("IrpQueue_Init failed with %x\n", Status); + DPRINT("IrpQueue_Init failed with %x\n", Status); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -41,13 +41,10 @@ VOID UpdateCommonBuffer(ULONG Position, ULONG MaxTransferCount); VOID UpdateCommonBufferOverlap(ULONG Position, ULONG MaxTransferCount); - VOID NTAPI SetStreamState(IN KSSTATE State); NTSTATUS NTAPI HandleKsStream(IN PIRP Irp); NTSTATUS NTAPI HandleKsProperty(IN PIRP Irp); - friend VOID NTAPI CloseStreamRoutineWaveCyclic(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); - friend VOID NTAPI SetStreamWorkerRoutineWaveCyclic(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context); friend NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); @@ -211,7 +208,7 @@ // copy audio position RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); - DPRINT1("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + DPRINT("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); return STATUS_SUCCESS; } @@ -355,7 +352,7 @@ PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, + DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); #endif @@ -492,111 +489,6 @@ VOID NTAPI -SetStreamWorkerRoutineWaveCyclic( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) -{ - CPortPinWaveCyclic * This; - PSETSTREAM_CONTEXT Ctx = (PSETSTREAM_CONTEXT)Context; - KSSTATE State; - ULONG MinimumDataThreshold; - ULONG MaximumDataThreshold; - - This = Ctx->Pin; - State = Ctx->State; - - IoFreeWorkItem(Ctx->WorkItem); - FreeItem(Ctx, TAG_PORTCLASS); - - // Has the audio stream resumed? - if (This->m_IrpQueue->NumMappings() && State == KSSTATE_STOP) - return; - - // Has the audio state already been set? - if (This->m_State == State) - return; - - // Set the state - if (NT_SUCCESS(This->m_Stream->SetState(State))) - { - // Set internal state - This->m_State = State; - - if (This->m_State == KSSTATE_STOP) - { - // reset start stream - This->m_IrpQueue->CancelBuffers(); //FIX function name - - // increase stop counter - This->m_StopCount++; - // get current data threshold - MinimumDataThreshold = This->m_IrpQueue->GetMinimumDataThreshold(); - // get maximum data threshold - MaximumDataThreshold = ((PKSDATAFORMAT_WAVEFORMATEX)This->m_Format)->WaveFormatEx.nAvgBytesPerSec; - // increase minimum data threshold by a third sec - MinimumDataThreshold += This->m_FrameSize * 10; - - // assure it has not exceeded - MinimumDataThreshold = min(MinimumDataThreshold, MaximumDataThreshold); - // store minimum data threshold - This->m_IrpQueue->SetMinimumDataThreshold(MinimumDataThreshold); - - DPRINT1("Stopping TotalPackets %u StopCount %u\n", This->m_TotalPackets, This->m_StopCount); - } - if (This->m_State == KSSTATE_RUN) - { - DPRINT1("State RUN %x MinAvailable %u CommonBufferSize %u Offset %u\n", State, This->m_IrpQueue->MinimumDataAvailable(), This->m_CommonBufferSize, This->m_CommonBufferOffset); - } - } -} - -VOID -NTAPI -CPortPinWaveCyclic::SetStreamState( - IN KSSTATE State) -{ - PDEVICE_OBJECT DeviceObject; - PIO_WORKITEM WorkItem; - PSETSTREAM_CONTEXT Context; - - PC_ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); - - // Has the audio stream resumed? - if (m_IrpQueue->NumMappings() && State == KSSTATE_STOP) - return; - - // Has the audio state already been set? - if (m_State == State) - return; - - // Get device object - DeviceObject = GetDeviceObject(m_Port); - - // allocate set state context - Context = (PSETSTREAM_CONTEXT)AllocateItem(NonPagedPool, sizeof(SETSTREAM_CONTEXT), TAG_PORTCLASS); - - if (!Context) - return; - - // allocate work item - WorkItem = IoAllocateWorkItem(DeviceObject); - - if (!WorkItem) - { - ExFreePool(Context); - return; - } - - Context->Pin = this; - Context->WorkItem = WorkItem; - Context->State = State; - - // queue the work item - IoQueueWorkItem(WorkItem, SetStreamWorkerRoutineWaveCyclic, DelayedWorkQueue, (PVOID)Context); -} - -VOID -NTAPI CPortPinWaveCyclic::RequestService() { ULONG Position; @@ -609,7 +501,6 @@ Status = m_IrpQueue->GetMapping(&Buffer, &BufferSize); if (!NT_SUCCESS(Status)) { - //SetStreamState(This, KSSTATE_STOP); return; } @@ -638,7 +529,6 @@ IN KSOBJECT_CREATE *CreateObject) { UNIMPLEMENTED - DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -660,7 +550,7 @@ if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { - DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -675,7 +565,7 @@ Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; RtlStringFromGUID(Property->Set, &GuidString); - DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + DPRINT("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); RtlFreeUnicodeString(&GuidString); } @@ -792,127 +682,82 @@ return KsDispatchInvalidDeviceRequest(DeviceObject, Irp); } -VOID -NTAPI -CloseStreamRoutineWaveCyclic( - IN PDEVICE_OBJECT DeviceObject, - IN PVOID Context) -{ - PMINIPORTWAVECYCLICSTREAM Stream; - CPortPinWaveCyclic * This; - NTSTATUS Status; - PCLOSESTREAM_CONTEXT Ctx = (PCLOSESTREAM_CONTEXT)Context; - - This = (CPortPinWaveCyclic*)Ctx->Pin; - - if (This->m_State != KSSTATE_STOP) - { - // stop stream in case it hasn't been - Status = This->m_Stream->SetState(KSSTATE_STOP); - if (!NT_SUCCESS(Status)) - DPRINT1("Warning: failed to stop stream with %x\n", Status); - - This->m_State = KSSTATE_STOP; - } - - if (This->m_Format) - { - // free format - ExFreePool(This->m_Format); - This->m_Format = NULL; - } - - if (This->m_IrpQueue) - { - This->m_IrpQueue->Release(); - } - - // complete the irp - Ctx->Irp->IoStatus.Information = 0; - Ctx->Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Ctx->Irp, IO_NO_INCREMENT); - - // free the work item - IoFreeWorkItem(Ctx->WorkItem); - - // free work item ctx - FreeItem(Ctx, TAG_PORTCLASS); - - // release reference to port driver - This->m_Port->Release(); - - // release reference to filter instance - This->m_Filter->Release(); - - if (This->m_Stream) - { - Stream = This->m_Stream; - This->m_Stream = NULL; - This->m_Filter->FreePin(This); - DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); - Stream->Release(); - } -} - NTSTATUS NTAPI CPortPinWaveCyclic::Close( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - PCLOSESTREAM_CONTEXT Ctx; - - DPRINT1("CPortPinWaveCyclic::Close entered\n"); - - if (m_Stream) - { - // allocate a close context - Ctx = (PCLOSESTREAM_CONTEXT)AllocateItem(NonPagedPool, sizeof(CLOSESTREAM_CONTEXT), TAG_PORTCLASS); - if (!Ctx) - { - DPRINT1("Failed to allocate stream context\n"); - goto cleanup; - } - // allocate work context - Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); - if (!Ctx->WorkItem) - { - DPRINT1("Failed to allocate work item\n"); - goto cleanup; - } - // setup the close context - Ctx->Irp = Irp; - Ctx->Pin = this; - - IoMarkIrpPending(Irp); - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_PENDING; - + DPRINT("CPortPinWaveCyclic::Close entered\n"); + + PC_ASSERT_IRQL(PASSIVE_LEVEL); + + if (m_Format) + { + // free format + ExFreePool(m_Format); + m_Format = NULL; + } + + if (m_IrpQueue) + { + // fixme cancel irps + m_IrpQueue->Release(); + } + + + if (m_Port) + { + // release reference to port driver + m_Port->Release(); + m_Port = NULL; + } + + if (m_ServiceGroup) + { // remove member from service group m_ServiceGroup->RemoveMember(PSERVICESINK(this)); - - // defer work item - IoQueueWorkItem(Ctx->WorkItem, CloseStreamRoutineWaveCyclic, DelayedWorkQueue, (PVOID)Ctx); - // Return result - return STATUS_PENDING; + m_ServiceGroup = NULL; + } + + if (m_Stream) + { + if (m_State != KSSTATE_STOP) + { + // stop stream + NTSTATUS Status = m_Stream->SetState(KSSTATE_STOP); + if (!NT_SUCCESS(Status)) + { + DPRINT("Warning: failed to stop stream with %x\n", Status); + PC_ASSERT(0); + } + } + // set state to stop + m_State = KSSTATE_STOP; + + + DPRINT("Closing stream at Irql %u\n", KeGetCurrentIrql()); + // release stream + m_Stream->Release(); + + } + + + if (m_Filter) + { + // release reference to filter instance + m_Filter->FreePin((PPORTPINWAVECYCLIC)this); + m_Filter->Release(); + m_Filter = NULL; } Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); + delete this; + return STATUS_SUCCESS; - -cleanup: - - if (Ctx) - FreeItem(Ctx, TAG_PORTCLASS); - - Irp->IoStatus.Information = 0; - Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return STATUS_UNSUCCESSFUL; - } NTSTATUS @@ -1022,7 +867,7 @@ } else { - DPRINT1("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); + DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); KeBugCheck(0); } @@ -1040,7 +885,7 @@ if (NT_SUCCESS(Status)) { DRMRIGHTS DrmRights; - DPRINT1("Got IID_IDrmAudioStream interface %p\n", DrmAudio); + DPRINT("Got IID_IDrmAudioStream interface %p\n", DrmAudio); DrmRights.CopyProtect = FALSE; DrmRights.Reserved = 0; @@ -1087,7 +932,7 @@ Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to add pin to service group\n"); + DPRINT("Failed to add pin to service group\n"); return Status; } @@ -1138,9 +983,10 @@ m_Port = Port; m_Filter = Filter; - DPRINT1("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); - DPRINT1("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); - m_State = KSSTATE_PAUSE; + DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); + DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); + DPRINT("Setting state to run %x\n", m_Stream->SetState(KSSTATE_RUN)); + m_State = KSSTATE_RUN; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -181,7 +181,7 @@ // copy audio position RtlMoveMemory(Data, &Pin->m_Position, sizeof(KSAUDIO_POSITION)); - DPRINT1("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); + DPRINT("Play %lu Record %lu\n", Pin->m_Position.PlayOffset, Pin->m_Position.WriteOffset); Irp->IoStatus.Information = sizeof(KSAUDIO_POSITION); return STATUS_SUCCESS; } @@ -325,7 +325,7 @@ PC_ASSERT(IsEqualGUIDAligned(((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->DataFormat.Specifier, KSDATAFORMAT_SPECIFIER_WAVEFORMATEX)); - DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, + DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); #endif @@ -470,7 +470,7 @@ // store minimum data threshold m_IrpQueue->SetMinimumDataThreshold(MinimumDataThreshold); - DPRINT1("Stopping TotalCompleted %u StopCount %u MinimumDataThreshold %u\n", m_TotalPackets, m_StopCount, MinimumDataThreshold); + DPRINT("Stopping TotalCompleted %u StopCount %u MinimumDataThreshold %u\n", m_TotalPackets, m_StopCount, MinimumDataThreshold); } if (m_State == KSSTATE_RUN) { @@ -608,7 +608,7 @@ if (IoStack->Parameters.DeviceIoControl.IoControlCode != IOCTL_KS_PROPERTY) { - DPRINT1("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); + DPRINT("Unhandled function %lx Length %x\n", IoStack->Parameters.DeviceIoControl.IoControlCode, IoStack->Parameters.DeviceIoControl.InputBufferLength); Irp->IoStatus.Status = STATUS_SUCCESS; @@ -623,7 +623,7 @@ Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; RtlStringFromGUID(Property->Set, &GuidString); - DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + DPRINT("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); RtlFreeUnicodeString(&GuidString); } @@ -787,7 +787,7 @@ { Stream = m_Stream; m_Stream = 0; - DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); + DPRINT("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->Release(); } } @@ -830,14 +830,14 @@ Ctx = (PCLOSESTREAM_CONTEXT)AllocateItem(NonPagedPool, sizeof(CLOSESTREAM_CONTEXT), TAG_PORTCLASS); if (!Ctx) { - DPRINT1("Failed to allocate stream context\n"); + DPRINT("Failed to allocate stream context\n"); goto cleanup; } Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); if (!Ctx->WorkItem) { - DPRINT1("Failed to allocate work item\n"); + DPRINT("Failed to allocate work item\n"); goto cleanup; } @@ -980,7 +980,7 @@ } else { - DPRINT1("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); + DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); KeBugCheck(0); } @@ -1004,7 +1004,7 @@ Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to add pin to service group\n"); + DPRINT("Failed to add pin to service group\n"); return Status; } m_ServiceGroup->SupportDelayedService(); @@ -1016,7 +1016,7 @@ Status = m_Stream->GetAllocatorFraming(&m_AllocatorFraming); if (!NT_SUCCESS(Status)) { - DPRINT1("GetAllocatorFraming failed with %x\n", Status); + DPRINT("GetAllocatorFraming failed with %x\n", Status); return Status; } @@ -1058,7 +1058,7 @@ Status = m_IrpQueue->Init(ConnectDetails, m_Format, DeviceObject, m_AllocatorFraming.FrameSize, m_AllocatorFraming.FileAlignment, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("IrpQueue_Init failed with %x\n", Status); + DPRINT("IrpQueue_Init failed with %x\n", Status); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -130,7 +130,7 @@ { // reset start stream This->m_IrpQueue->CancelBuffers(); //FIX function name - DPRINT1("Stopping PreCompleted %u PostCompleted %u\n", This->m_PreCompleted, This->m_PostCompleted); + DPRINT("Stopping PreCompleted %u PostCompleted %u\n", This->m_PreCompleted, This->m_PostCompleted); } if (This->m_State == KSSTATE_RUN) @@ -249,7 +249,7 @@ { Status = m_Stream->SetState(*State); - DPRINT1("Setting state %u %x\n", *State, Status); + DPRINT("Setting state %u %x\n", *State, Status); if (NT_SUCCESS(Status)) { m_State = *State; @@ -303,7 +303,7 @@ ASSERT(m_State == KSSTATE_STOP); #endif - DPRINT1("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, + DPRINT("NewDataFormat: Channels %u Bits %u Samples %u\n", ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nChannels, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.wBitsPerSample, ((PKSDATAFORMAT_WAVEFORMATEX)NewDataFormat)->WaveFormatEx.nSamplesPerSec); @@ -321,7 +321,7 @@ return STATUS_SUCCESS; } } - DPRINT1("Failed to set format\n"); + DPRINT("Failed to set format\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -331,7 +331,7 @@ { if (!m_Format) { - DPRINT1("No format\n"); + DPRINT("No format\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -355,7 +355,7 @@ } RtlStringFromGUID(Property->Set, &GuidString); - DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + DPRINT("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); RtlFreeUnicodeString(&GuidString); Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; @@ -414,7 +414,6 @@ } UNIMPLEMENTED - DbgBreakPoint(); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; @@ -511,7 +510,7 @@ { Stream = This->m_Stream; This->m_Stream = NULL; - DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); + DPRINT("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->Release(); } } @@ -529,14 +528,14 @@ Ctx = (PCLOSESTREAM_CONTEXT)AllocateItem(NonPagedPool, sizeof(CLOSESTREAM_CONTEXT), TAG_PORTCLASS); if (!Ctx) { - DPRINT1("Failed to allocate stream context\n"); + DPRINT("Failed to allocate stream context\n"); goto cleanup; } Ctx->WorkItem = IoAllocateWorkItem(DeviceObject); if (!Ctx->WorkItem) { - DPRINT1("Failed to allocate work item\n"); + DPRINT("Failed to allocate work item\n"); goto cleanup; } @@ -696,7 +695,7 @@ } else { - DPRINT1("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); + DPRINT("Unexpected Communication %u DataFlow %u\n", KsPinDescriptor->Communication, KsPinDescriptor->DataFlow); KeBugCheck(0); } @@ -713,21 +712,21 @@ Status = m_Stream->AllocateAudioBuffer(16384 * 11, &m_Mdl, &m_CommonBufferSize, &m_CommonBufferOffset, &m_CacheType); if (!NT_SUCCESS(Status)) { - DPRINT1("AllocateAudioBuffer failed with %x\n", Status); + DPRINT("AllocateAudioBuffer failed with %x\n", Status); goto cleanup; } m_CommonBuffer = MmGetSystemAddressForMdlSafe(m_Mdl, NormalPagePriority); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get system address %x\n", Status); + DPRINT("Failed to get system address %x\n", Status); IoFreeMdl(m_Mdl); m_Mdl = NULL; goto cleanup; } - DPRINT1("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); - DPRINT1("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); + DPRINT("Setting state to acquire %x\n", m_Stream->SetState(KSSTATE_ACQUIRE)); + DPRINT("Setting state to pause %x\n", m_Stream->SetState(KSSTATE_PAUSE)); m_State = KSSTATE_PAUSE; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -47,7 +47,7 @@ if (RtlStringFromGUID(ClassId, &GuidString) == STATUS_SUCCESS) { - DPRINT1("unknown interface %S\n", GuidString.Buffer); + DPRINT("unknown interface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_dmus.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -139,7 +139,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("IPortMidi_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("IPortMidi_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; @@ -225,7 +225,7 @@ Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("failed to get description\n"); + DPRINT("failed to get description\n"); Miniport->Release(); m_bInitialized = FALSE; return Status; @@ -250,7 +250,7 @@ Status = MidiMiniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("failed to get description\n"); + DPRINT("failed to get description\n"); MidiMiniport->Release(); m_bInitialized = FALSE; return Status; @@ -278,7 +278,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to create descriptior\n"); + DPRINT("Failed to create descriptior\n"); if (Miniport) Miniport->Release(); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_topology.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -171,7 +171,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("IPortTopology_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } return STATUS_UNSUCCESSFUL; @@ -219,14 +219,14 @@ if (m_bInitialized) { - DPRINT1("IPortTopology_Init called again\n"); + DPRINT("IPortTopology_Init called again\n"); return STATUS_SUCCESS; } Status = UnknownMiniport->QueryInterface(IID_IMiniportTopology, (PVOID*)&Miniport); if (!NT_SUCCESS(Status)) { - DPRINT1("IPortTopology_Init called with invalid IMiniport adapter\n"); + DPRINT("IPortTopology_Init called with invalid IMiniport adapter\n"); return STATUS_INVALID_PARAMETER; } @@ -239,7 +239,7 @@ Status = Miniport->Init(UnknownAdapter, ResourceList, this); if (!NT_SUCCESS(Status)) { - DPRINT1("IPortTopology_Init failed with %x\n", Status); + DPRINT("IPortTopology_Init failed with %x\n", Status); m_bInitialized = FALSE; Miniport->Release(); return Status; @@ -249,7 +249,7 @@ Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("failed to get description\n"); + DPRINT("failed to get description\n"); Miniport->Release(); m_bInitialized = FALSE; return Status; @@ -371,7 +371,7 @@ NTAPI CPortTopology::ReleaseChildren() { - DPRINT1("ISubDevice_fnReleaseChildren\n"); + DPRINT("ISubDevice_fnReleaseChildren\n"); // release the filter m_Filter->Release(); @@ -468,7 +468,7 @@ WorkerContext->Irp, NULL); - DPRINT1("CreatePinWorkerRoutine Status %x\n", Status); + DPRINT("CreatePinWorkerRoutine Status %x\n", Status); if (NT_SUCCESS(Status)) { @@ -505,7 +505,7 @@ // sanity check PC_ASSERT(CreateItem); - DPRINT1("PcCreatePinDispatch called DeviceObject %p %S Name\n", DeviceObject, CreateItem->ObjectClass.Buffer); + DPRINT("PcCreatePinDispatch called DeviceObject %p %S Name\n", DeviceObject, CreateItem->ObjectClass.Buffer); Filter = (IIrpTarget*)CreateItem->Context; @@ -517,7 +517,7 @@ Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) { - DPRINT1("PcCreatePinDispatch failed to reference device header\n"); + DPRINT("PcCreatePinDispatch failed to reference device header\n"); FreeItem(Entry, TAG_PORTCLASS); goto cleanup; @@ -577,7 +577,7 @@ // access the create item CreateItem = KSCREATE_ITEM_IRP_STORAGE(Irp); - DPRINT1("PcCreateItemDispatch called DeviceObject %p %S Name\n", DeviceObject, CreateItem->ObjectClass.Buffer); + DPRINT("PcCreateItemDispatch called DeviceObject %p %S Name\n", DeviceObject, CreateItem->ObjectClass.Buffer); // get the subdevice SubDevice = (ISubdevice*)CreateItem->Context; @@ -589,7 +589,7 @@ Status = KsReferenceSoftwareBusObject(DeviceExt->KsDeviceHeader); if (!NT_SUCCESS(Status) && Status != STATUS_NOT_IMPLEMENTED) { - DPRINT1("PcCreateItemDispatch failed to reference device header\n"); + DPRINT("PcCreateItemDispatch failed to reference device header\n"); FreeItem(Entry, TAG_PORTCLASS); goto cleanup; @@ -606,7 +606,7 @@ NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to get filter object\n"); + DPRINT("Failed to get filter object\n"); Irp->IoStatus.Status = Status; IoCompleteRequest(Irp, IO_NO_INCREMENT); return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -181,7 +181,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("IPortWaveCyclic_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } @@ -268,7 +268,7 @@ Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("failed to get description\n"); + DPRINT("failed to get description\n"); Miniport->Release(); m_bInitialized = FALSE; return Status; @@ -292,7 +292,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("PcCreateSubdeviceDescriptor failed with %x\n", Status); + DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status); Miniport->Release(); m_bInitialized = FALSE; return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -201,7 +201,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("IPortWavePci_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("IPortWavePci_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } @@ -269,7 +269,7 @@ Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("failed to get description\n"); + DPRINT("failed to get description\n"); Miniport->Release(); m_bInitialized = FALSE; return Status; @@ -294,7 +294,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("PcCreateSubdeviceDescriptor failed with %x\n", Status); + DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status); Miniport->Release(); m_bInitialized = FALSE; return Status; @@ -489,7 +489,7 @@ CPortWavePci::GetDescriptor( IN SUBDEVICE_DESCRIPTOR ** Descriptor) { - DPRINT1("ISubDevice_GetDescriptor this %p\n", this); + DPRINT("ISubDevice_GetDescriptor this %p\n", this); *Descriptor = m_SubDeviceDescriptor; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavert.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -174,7 +174,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("IPortWaveRT_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("IPortWaveRT_fnQueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } @@ -256,7 +256,7 @@ Status = Miniport->GetDescription(&m_pDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("failed to get description\n"); + DPRINT("failed to get description\n"); Miniport->Release(); m_bInitialized = FALSE; return Status; @@ -280,7 +280,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("PcCreateSubdeviceDescriptor failed with %x\n", Status); + DPRINT("PcCreateSubdeviceDescriptor failed with %x\n", Status); Miniport->Release(); m_bInitialized = FALSE; return Status; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavertstream.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -81,7 +81,7 @@ Buffer = MmAllocateContiguousMemorySpecifyCache(TotalBytes, LowAddress, HighAddress, RtlConvertUlongToLargeInteger(0), MmNonCached); if (!Buffer) { - DPRINT1("MmAllocateContiguousMemorySpecifyCache failed\n"); + DPRINT("MmAllocateContiguousMemorySpecifyCache failed\n"); return NULL; } @@ -92,13 +92,13 @@ Mdl = MmAllocatePagesForMdl(Address, HighAddress, RtlConvertUlongToLargeInteger(0), TotalBytes); if (!Mdl) { - DPRINT1("MmAllocatePagesForMdl failed\n"); + DPRINT("MmAllocatePagesForMdl failed\n"); return NULL; } if (MmGetMdlByteCount(Mdl) < TotalBytes) { - DPRINT1("ByteCount %u Required %u\n", MmGetMdlByteCount(Mdl), TotalBytes); + DPRINT("ByteCount %u Required %u\n", MmGetMdlByteCount(Mdl), TotalBytes); MmFreePagesFromMdl(Mdl); ExFreePool(Mdl); return NULL; @@ -157,7 +157,7 @@ Pages = ADDRESS_AND_SIZE_TO_SPAN_PAGES(0, MmGetMdlByteCount(MemoryDescriptorList)); if (Pages <= Index) { - DPRINT1("OutOfBounds: Pages %u Index %u\n", Pages, Index); + DPRINT("OutOfBounds: Pages %u Index %u\n", Pages, Index); return RtlConvertUlongToLargeInteger(0); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/power.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -32,7 +32,7 @@ Status = pUnknown->QueryInterface(IID_IAdapterPowerManagement, (PVOID*)&pPower); if (!NT_SUCCESS(Status)) { - DPRINT1("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); + DPRINT("PcRegisterAdapterPowerManagement no IAdapterPowerManagement interface %x\n", Status); DeviceExt->AdapterPowerManagement = NULL; return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -124,13 +124,13 @@ if (RequestLength < sizeof(KSP_PIN)) { // input buffer must be at least sizeof KSP_PIN - DPRINT1("input length too small\n"); + DPRINT("input length too small\n"); return STATUS_INVALID_PARAMETER; } if (IsListEmpty(&Descriptor->PhysicalConnectionList)) { - DPRINT1("no connection\n"); + DPRINT("no connection\n"); return STATUS_NOT_FOUND; } @@ -201,7 +201,7 @@ Status = IrpTarget->QueryInterface(IID_IPort, (PVOID*)&Port); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to obtain IPort interface from filter\n"); + DPRINT("Failed to obtain IPort interface from filter\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL; @@ -211,7 +211,7 @@ Status = Port->QueryInterface(IID_ISubdevice, (PVOID*)&SubDevice); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to obtain ISubdevice interface from port driver\n"); + DPRINT("Failed to obtain ISubdevice interface from port driver\n"); KeBugCheck(0); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/registry.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -64,7 +64,6 @@ } DPRINT("IRegistryKey_QueryInterface: This %p\n", this); - DbgBreakPoint(); return STATUS_UNSUCCESSFUL; } @@ -154,7 +153,7 @@ Status = ZwCreateKey(&hKey, KEY_READ | KEY_WRITE, &Attributes, 0, NULL, 0, Disposition); if (!NT_SUCCESS(Status)) { - DPRINT1("CRegistryKey::NewSubKey failed with %x\n", Status); + DPRINT("CRegistryKey::NewSubKey failed with %x\n", Status); return Status; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/resource.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -69,7 +69,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("IResourceList_QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } @@ -107,7 +107,7 @@ { PartialDescriptor = &m_TranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; UnPartialDescriptor = &m_UntranslatedResourceList->List[0].PartialResourceList.PartialDescriptors[Index]; - DPRINT1("Descriptor Type %u\n", PartialDescriptor->Type); + DPRINT("Descriptor Type %u\n", PartialDescriptor->Type); if (PartialDescriptor->Type == Type) { // Yay! Finally found one that matches! @@ -116,15 +116,15 @@ if (PartialDescriptor->Type == CmResourceTypeInterrupt) { - DPRINT1("Index %u TRANS Interrupt Number Affinity %x Level %u Vector %u\n", Index, PartialDescriptor->u.Interrupt.Affinity, PartialDescriptor->u.Interrupt.Level, PartialDescriptor->u.Interrupt.Vector, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); - DPRINT1("Index %u UNTRANS Interrupt Number Affinity %x Level %u Vector %u\n", Index, UnPartialDescriptor->u.Interrupt.Affinity, UnPartialDescriptor->u.Interrupt.Level, UnPartialDescriptor->u.Interrupt.Vector, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); - - } - else if (PartialDescriptor->Type == CmResourceTypePort) - { - DPRINT1("Index %u TRANS Port Length %u Start %u %u Flags %x\n", Index, PartialDescriptor->u.Port.Length, PartialDescriptor->u.Port.Start.HighPart, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags); - DPRINT1("Index %u UNTRANS Port Length %u Start %u %u Flags %x\n", Index, UnPartialDescriptor->u.Port.Length, UnPartialDescriptor->u.Port.Start.HighPart, UnPartialDescriptor->u.Port.Start.LowPart, UnPartialDescriptor->Flags); - } + DPRINT("Index %u TRANS Interrupt Number Affinity %x Level %u Vector %u Flags %x Share %x\n", Index, PartialDescriptor->u.Interrupt.Affinity, PartialDescriptor->u.Interrupt.Level, PartialDescriptor->u.Interrupt.Vector, PartialDescriptor->Flags, PartialDescriptor->ShareDisposition); + DPRINT("Index %u UNTRANS Interrupt Number Affinity %x Level %u Vector %u Flags %x Share %x\\n", Index, UnPartialDescriptor->u.Interrupt.Affinity, UnPartialDescriptor->u.Interrupt.Level, UnPartialDescriptor->u.Interrupt.Vector, UnPartialDescriptor->Flags, UnPartialDescriptor->ShareDisposition); + + } + else if (PartialDescriptor->Type == CmResourceTypePort) + { + DPRINT("Index %u TRANS Port Length %u Start %u %u Flags %x Share %x\n", Index, PartialDescriptor->u.Port.Length, PartialDescriptor->u.Port.Start.HighPart, PartialDescriptor->u.Port.Start.LowPart, PartialDescriptor->Flags, PartialDescriptor->ShareDisposition); + DPRINT("Index %u UNTRANS Port Length %u Start %u %u Flags %x Share %x\n", Index, UnPartialDescriptor->u.Port.Length, UnPartialDescriptor->u.Port.Start.HighPart, UnPartialDescriptor->u.Port.Start.LowPart, UnPartialDescriptor->Flags, UnPartialDescriptor->ShareDisposition); + } } DPRINT("Found %d type %d\n", Count, Type); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/service_group.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -93,7 +93,7 @@ if (RtlStringFromGUID(refiid, &GuidString) == STATUS_SUCCESS) { - DPRINT1("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); + DPRINT("CServiceGroup::QueryInterface no interface!!! iface %S\n", GuidString.Buffer); RtlFreeUnicodeString(&GuidString); } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -229,14 +229,14 @@ if (Status != STATUS_PENDING) { - //DPRINT1("Status %x ValueSize %u + //DPRINT("Status %x ValueSize %u Irp->IoStatus.Information = PropertyRequest->ValueSize; ExFreePool(PropertyRequest); } #if 0 RtlStringFromGUID(Property->Property.Set, &GuidString); - DPRINT1("Id %u Flags %x Set %S FlagsItem %x Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, PropertyItem->Flags, Status); + DPRINT("Id %u Flags %x Set %S FlagsItem %x Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, PropertyItem->Flags, Status); RtlFreeUnicodeString(&GuidString); #endif return Status; @@ -245,7 +245,7 @@ } #if 0 RtlStringFromGUID(Property->Property.Set, &GuidString); - DPRINT1("Id %u Flags %x Set %S Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, Status); + DPRINT("Id %u Flags %x Set %S Status %x\n", Property->Property.Id, Property->Property.Flags, GuidString.Buffer, Status); RtlFreeUnicodeString(&GuidString); #endif } @@ -310,12 +310,12 @@ PPCPROPERTY_ITEM PropertyItem; UNICODE_STRING GuidString; - DPRINT1("======================\n"); - DPRINT1("Descriptor Automation Table%p\n",FilterDescription->AutomationTable); + DPRINT("======================\n"); + DPRINT("Descriptor Automation Table%p\n",FilterDescription->AutomationTable); if (FilterDescription->AutomationTable) { - DPRINT1("FilterPropertiesCount %u FilterPropertySize %u Expected %u\n", FilterDescription->AutomationTable->PropertyCount, FilterDescription->AutomationTable->PropertyItemSize, sizeof(PCPROPERTY_ITEM)); + DPRINT("FilterPropertiesCount %u FilterPropertySize %u Expected %u\n", FilterDescription->AutomationTable->PropertyCount, FilterDescription->AutomationTable->PropertyItemSize, sizeof(PCPROPERTY_ITEM)); if (FilterDescription->AutomationTable->PropertyCount) { PropertyItem = (PPCPROPERTY_ITEM)FilterDescription->AutomationTable->Properties; @@ -323,7 +323,7 @@ for(Index = 0; Index < FilterDescription->AutomationTable->PropertyCount; Index++) { RtlStringFromGUID(*PropertyItem->Set, &GuidString); - DPRINT1("Index %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, PropertyItem->Id, PropertyItem->Flags); + DPRINT("Index %u GUID %S Id %u Flags %x\n", Index, GuidString.Buffer, PropertyItem->Id, PropertyItem->Flags); PropertyItem = (PPCPROPERTY_ITEM)((ULONG_PTR)PropertyItem + FilterDescription->AutomationTable->PropertyItemSize); } @@ -331,8 +331,7 @@ } - DPRINT1("======================\n"); - DbgBreakPoint(); + DPRINT("======================\n"); } NTSTATUS @@ -451,13 +450,16 @@ { RtlMoveMemory(&Descriptor->Factory.KsPinDescriptor[Index], &SrcDescriptor->KsPinDescriptor, sizeof(KSPIN_DESCRIPTOR)); + DPRINT("Index %u DataRangeCount %u\n", Index, SrcDescriptor->KsPinDescriptor.DataRangesCount); + Descriptor->Factory.Instances[Index].CurrentPinInstanceCount = 0; - Descriptor->Factory.Instances[Index].MaxFilterInstanceCount = FilterDescription->Pins[Index].MaxFilterInstanceCount; - Descriptor->Factory.Instances[Index].MaxGlobalInstanceCount = FilterDescription->Pins[Index].MaxGlobalInstanceCount; - Descriptor->Factory.Instances[Index].MinFilterInstanceCount = FilterDescription->Pins[Index].MinFilterInstanceCount; + Descriptor->Factory.Instances[Index].MaxFilterInstanceCount = SrcDescriptor->MaxFilterInstanceCount; + Descriptor->Factory.Instances[Index].MaxGlobalInstanceCount = SrcDescriptor->MaxGlobalInstanceCount; + Descriptor->Factory.Instances[Index].MinFilterInstanceCount = SrcDescriptor->MinFilterInstanceCount; SrcDescriptor = (PPCPIN_DESCRIPTOR)((ULONG_PTR)SrcDescriptor + FilterDescription->PinSize); } } + Descriptor->DeviceDescriptor = FilterDescription; *OutSubdeviceDescriptor = Descriptor; return STATUS_SUCCESS; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/unregister.cpp [iso-8859-1] Mon Oct 19 20:54:01 2009 @@ -81,7 +81,7 @@ Status = Unknown->QueryInterface(IID_ISubdevice, (LPVOID*)&SubDevice); if (!NT_SUCCESS(Status)) { - DPRINT1("No ISubdevice interface\n"); + DPRINT("No ISubdevice interface\n"); // the provided port driver doesnt support ISubdevice return STATUS_INVALID_PARAMETER; } @@ -89,7 +89,7 @@ Status = SubDevice->GetDescriptor(&SubDeviceDescriptor); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to retrieve subdevice descriptor %x\n", Status); + DPRINT("Failed to retrieve subdevice descriptor %x\n", Status); // the provided port driver doesnt support ISubdevice return STATUS_INVALID_PARAMETER; }

1 0

[cwittich] 43617: -sync msxml3_winetest with wine 1.1.31
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 20:53:22 2009 New Revision: 43617 URL: http://svn.reactos.org/svn/reactos?rev=43617&view=rev Log: -sync msxml3_winetest with wine 1.1.31 Modified: trunk/rostests/winetests/msxml3/domdoc.c Modified: trunk/rostests/winetests/msxml3/domdoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/msxml3/domdoc.c… ============================================================================== --- trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/msxml3/domdoc.c [iso-8859-1] Mon Oct 19 20:53:22 2009 @@ -323,6 +323,55 @@ } } +#define test_disp(u) _test_disp(__LINE__,u) +static void _test_disp(unsigned line, IUnknown *unk) +{ + DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; + IDispatchEx *dispex; + DWORD dwProps = 0; + BSTR sName; + UINT ticnt; + IUnknown *pUnk; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IDispatchEx, (void**)&dispex); + ok_(__FILE__,line) (hres == S_OK, "Could not get IDispatch: %08x\n", hres); + if(FAILED(hres)) + return; + + ticnt = 0xdeadbeef; + hres = IDispatchEx_GetTypeInfoCount(dispex, &ticnt); + ok_(__FILE__,line) (hres == S_OK, "GetTypeInfoCount failed: %08x\n", hres); + ok_(__FILE__,line) (ticnt == 1, "ticnt=%u\n", ticnt); + + sName = SysAllocString( szstar ); + hres = IDispatchEx_DeleteMemberByName(dispex, sName, fdexNameCaseSensitive); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + SysFreeString( sName ); + + hres = IDispatchEx_DeleteMemberByDispID(dispex, dispid); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + + hres = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &dwProps); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + ok(dwProps == 0, "expected 0 got %d\n", dwProps); + + hres = IDispatchEx_GetMemberName(dispex, dispid, &sName); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + if(SUCCEEDED(hres)) + SysFreeString(sName); + + hres = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + + hres = IDispatchEx_GetNameSpaceParent(dispex, &pUnk); + ok(hres == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", hres); + if(hres == S_OK && pUnk) + IUnknown_Release(pUnk); + + IDispatchEx_Release(dispex); +} + static int get_node_position(IXMLDOMNode *node) { HRESULT r; @@ -457,6 +506,8 @@ if( r != S_OK ) return; + test_disp((IUnknown*)doc); + /* try some stupid things */ r = IXMLDOMDocument_loadXML( doc, NULL, NULL ); ok( r == S_FALSE, "loadXML failed\n"); @@ -547,6 +598,8 @@ { IObjectIdentity *ident; BSTR tag = NULL; + + test_disp((IUnknown*)element); r = IXMLDOMElement_QueryInterface( element, &IID_IObjectIdentity, (LPVOID*)&ident ); ok( r == E_NOINTERFACE, "ret %08x\n", r); @@ -1660,7 +1713,6 @@ VARIANT_BOOL b; IXMLDOMDocument *doc; IXMLDOMNodeList *node_list; - IDispatchEx *dispex; LONG len; r = CoCreateInstance( &CLSID_DOMDocument, NULL, @@ -1681,43 +1733,7 @@ ok( r == S_OK, "ret %08x\n", r ); ok( len == 6, "len %d\n", len ); - r = IXMLDOMNodeList_QueryInterface( node_list, &IID_IDispatchEx, (void**)&dispex ); - ok( r == S_OK, "rets %08x\n", r); - if( r == S_OK ) - { - DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; - DWORD dwProps = 0; - BSTR sName; - IUnknown *pUnk; - - sName = SysAllocString( szstar ); - r = IDispatchEx_DeleteMemberByName(dispex, sName, fdexNameCaseSensitive); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - SysFreeString( sName ); - - r = IDispatchEx_DeleteMemberByDispID(dispex, dispid); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - - r = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &dwProps); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - ok(dwProps == 0, "expected 0 got %d\n", dwProps); - - r = IDispatchEx_GetMemberName(dispex, dispid, &sName); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - if( SUCCEEDED(r) ) - SysFreeString(sName); - - r = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - - r = IDispatchEx_GetNameSpaceParent(dispex, &pUnk); - ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); - if(r == S_OK) - IUnknown_Release(pUnk); - - IDispatchEx_Release( dispex ); - } - + test_disp((IUnknown*)node_list); IXMLDOMNodeList_Release( node_list ); SysFreeString( str );

1 0

[cwittich] 43616: -sync atl with wine 1.1.31
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 20:50:02 2009 New Revision: 43616 URL: http://svn.reactos.org/svn/reactos?rev=43616&view=rev Log: -sync atl with wine 1.1.31 Modified: trunk/reactos/dll/win32/atl/atlbase.h Modified: trunk/reactos/dll/win32/atl/atlbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/atl/atlbase.h?re… ============================================================================== --- trunk/reactos/dll/win32/atl/atlbase.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/atl/atlbase.h [iso-8859-1] Mon Oct 19 20:50:02 2009 @@ -28,9 +28,9 @@ typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); -typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(); -typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(); -typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(); +typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(void); +typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); +typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); typedef struct _ATL_OBJMAP_ENTRYA_TAG

1 0

[bfreisen] 43615: [PAINT] rearranging variable declarations for better MSVC compatiblity
by bfreisen＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: bfreisen Date: Mon Oct 19 19:46:29 2009 New Revision: 43615 URL: http://svn.reactos.org/svn/reactos?rev=43615&view=rev Log: [PAINT] rearranging variable declarations for better MSVC compatiblity Modified: trunk/reactos/base/applications/paint/dialogs.c trunk/reactos/base/applications/paint/main.c trunk/reactos/base/applications/paint/winproc.c Modified: trunk/reactos/base/applications/paint/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/di… ============================================================================== --- trunk/reactos/base/applications/paint/dialogs.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/dialogs.c [iso-8859-1] Mon Oct 19 19:46:29 2009 @@ -73,30 +73,34 @@ switch (message) { case WM_INITDIALOG: - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); - CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, imgXRes, FALSE); - SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, imgYRes, FALSE); - TCHAR strrc[100]; - if (isAFile) { - TCHAR date[100]; - TCHAR size[100]; - TCHAR temp[100]; - GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, sizeof(date)); - GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, sizeof(temp)); - _tcscat(date, _T(" ")); - _tcscat(date, temp); - LoadString(hProgInstance, IDS_FILESIZE, strrc, sizeof(strrc)); - _stprintf(size, strrc, fileSize); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT6, date); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT7, size); + TCHAR strrc[100]; + TCHAR res[100]; + + CheckDlgButton(hwnd, IDD_ATTRIBUTESRB3, BST_CHECKED); + CheckDlgButton(hwnd, IDD_ATTRIBUTESRB5, BST_CHECKED); + SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT1, imgXRes, FALSE); + SetDlgItemInt(hwnd, IDD_ATTRIBUTESEDIT2, imgYRes, FALSE); + + if (isAFile) + { + TCHAR date[100]; + TCHAR size[100]; + TCHAR temp[100]; + GetDateFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, date, sizeof(date)); + GetTimeFormat(LOCALE_USER_DEFAULT, 0, &fileTime, NULL, temp, sizeof(temp)); + _tcscat(date, _T(" ")); + _tcscat(date, temp); + LoadString(hProgInstance, IDS_FILESIZE, strrc, sizeof(strrc)); + _stprintf(size, strrc, fileSize); + SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT6, date); + SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT7, size); + } + LoadString(hProgInstance, IDS_PRINTRES, strrc, sizeof(strrc)); + _stprintf(res, strrc, fileHPPM, fileVPPM); + SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT8, res); + return TRUE; } - TCHAR res[100]; - LoadString(hProgInstance, IDS_PRINTRES, strrc, sizeof(strrc)); - _stprintf(res, strrc, fileHPPM, fileVPPM); - SetDlgItemText(hwnd, IDD_ATTRIBUTESTEXT8, res); - return TRUE; case WM_CLOSE: EndDialog(hwnd, 0); break; Modified: trunk/reactos/base/applications/paint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ma… ============================================================================== --- trunk/reactos/base/applications/paint/main.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/main.c [iso-8859-1] Mon Oct 19 19:46:29 2009 @@ -351,8 +351,8 @@ { TCHAR tempstr[1000]; TCHAR resstr[100]; + TCHAR *temp; insertReversible(bmNew); - TCHAR *temp; GetFullPathName(lpszArgument, sizeof(filepathname), filepathname, &temp); _tcscpy(filename, temp); LoadString(hProgInstance, IDS_WINDOWTITLE, resstr, SIZEOF(resstr)); Modified: trunk/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/wi… ============================================================================== --- trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/winproc.c [iso-8859-1] Mon Oct 19 19:46:29 2009 @@ -50,11 +50,14 @@ void zoomTo(int newZoom, int mouseX, int mouseY) { + int tbPos = 0; + int tempZoom = newZoom; + long clientRectScrollbox[4]; long clientRectImageArea[4]; + int x, y, w, h; GetClientRect(hScrollbox, (LPRECT)&clientRectScrollbox); GetClientRect(hImageArea, (LPRECT)&clientRectImageArea); - int x, y, w, h; w = clientRectImageArea[2] * clientRectScrollbox[2] / (clientRectImageArea[2] * newZoom / zoom); h = clientRectImageArea[3] * clientRectScrollbox[3] / (clientRectImageArea[3] * newZoom / zoom); x = max(0, min(clientRectImageArea[2] - w, mouseX - w / 2)) * newZoom / zoom; @@ -70,8 +73,6 @@ SendMessage(hScrollbox, WM_HSCROLL, SB_THUMBPOSITION | (x << 16), 0); SendMessage(hScrollbox, WM_VSCROLL, SB_THUMBPOSITION | (y << 16), 0); - int tbPos = 0; - int tempZoom = newZoom; while (tempZoom>125) { tbPos++; @@ -82,24 +83,26 @@ void drawZoomFrame(int mouseX, int mouseY) { + HDC hdc; + HPEN oldPen; + HBRUSH oldBrush; + LOGBRUSH logbrush; + int rop; + long clientRectScrollbox[4]; long clientRectImageArea[4]; + int x, y, w, h; GetClientRect(hScrollbox, (LPRECT)&clientRectScrollbox); GetClientRect(hImageArea, (LPRECT)&clientRectImageArea); - int x, y, w, h; w = clientRectImageArea[2] * clientRectScrollbox[2] / (clientRectImageArea[2] * 2); h = clientRectImageArea[3] * clientRectScrollbox[3] / (clientRectImageArea[3] * 2); x = max(0, min(clientRectImageArea[2] - w, mouseX - w / 2)); y = max(0, min(clientRectImageArea[3] - h, mouseY - h / 2)); - HDC hdc; + hdc = GetDC(hImageArea); - HPEN oldPen; oldPen = SelectObject(hdc, CreatePen(PS_SOLID, 0, 0)); - HBRUSH oldBrush; - LOGBRUSH logbrush; logbrush.lbStyle = BS_HOLLOW; oldBrush = SelectObject(hdc, CreateBrushIndirect(&logbrush)); - int rop; rop = SetROP2(hdc, R2_NOT); Rectangle(hdc, x, y, x + w, y + h); SetROP2(hdc, rop); @@ -525,6 +528,8 @@ { if ((!drawing)||(activeTool<=9)) { + TRACKMOUSEEVENT tme; + TCHAR coordStr[100]; _stprintf(coordStr, _T("%d, %d"), (short)LOWORD(lParam)*1000/zoom, (short)HIWORD(lParam)*1000/zoom); SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM)coordStr); @@ -535,7 +540,6 @@ drawZoomFrame((short)LOWORD(lParam), (short)HIWORD(lParam)); } - TRACKMOUSEEVENT tme; tme.cbSize = sizeof(TRACKMOUSEEVENT); tme.dwFlags = TME_LEAVE; tme.hwndTrack = hImageArea;

1 0

[cwittich] 43614: -sync wintrust_winetest with wine 1.1.31
by cwittich＠svn.reactos.org 19 Oct '09

19 Oct '09

Author: cwittich Date: Mon Oct 19 19:31:03 2009 New Revision: 43614 URL: http://svn.reactos.org/svn/reactos?rev=43614&view=rev Log: -sync wintrust_winetest with wine 1.1.31 Modified: trunk/rostests/winetests/wintrust/asn.c Modified: trunk/rostests/winetests/wintrust/asn.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/asn.c?… ============================================================================== --- trunk/rostests/winetests/wintrust/asn.c [iso-8859-1] (original) +++ trunk/rostests/winetests/wintrust/asn.c [iso-8859-1] Mon Oct 19 19:31:03 2009 @@ -725,6 +725,7 @@ DWORD size; CAT_NAMEVALUE *value; + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, emptyCatNameValue, sizeof(emptyCatNameValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -739,6 +740,7 @@ value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithTag, sizeof(catNameValueWithTag), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -754,6 +756,7 @@ value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithFlags, sizeof(catNameValueWithFlags), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -768,6 +771,7 @@ value->Value.cbData); LocalFree(buf); } + buf = NULL; ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, CAT_NAMEVALUE_STRUCT, catNameValueWithValue, sizeof(catNameValueWithValue), CRYPT_DECODE_ALLOC_FLAG, NULL, &buf, &size); @@ -838,7 +842,7 @@ ok(!ret && GetLastError() == E_INVALIDARG, "expected E_INVALIDARG, got %08x\n", GetLastError()); moreInfo.dwLinkChoice = SPC_URL_LINK_CHOICE; - moreInfo.pwszUrl = winehq; + U(moreInfo).pwszUrl = winehq; ret = pCryptEncodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, &info, CRYPT_ENCODE_ALLOC_FLAG, NULL, &buf, &size); ok(ret, "CryptEncodeObjectEx failed: %08x\n", GetLastError()); @@ -874,7 +878,6 @@ ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, emptySequence, sizeof(emptySequence), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -886,7 +889,6 @@ ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithProgramName, sizeof(spOpusInfoWithProgramName), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -899,7 +901,6 @@ ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithMoreInfo, sizeof(spOpusInfoWithMoreInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -909,7 +910,7 @@ { ok(info->pMoreInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, "unexpected link choice %d\n", info->pMoreInfo->dwLinkChoice); - ok(!lstrcmpW(info->pMoreInfo->pwszUrl, winehq), + ok(!lstrcmpW(U(*info->pMoreInfo).pwszUrl, winehq), "unexpected link value\n"); } ok(!info->pPublisherInfo, "expected NULL\n"); @@ -918,7 +919,6 @@ ret = pCryptDecodeObjectEx(X509_ASN_ENCODING, SPC_SP_OPUS_INFO_STRUCT, spOpusInfoWithPublisherInfo, sizeof(spOpusInfoWithPublisherInfo), CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); - todo_wine ok(ret, "CryptDecodeObjectEx failed: %08x\n", GetLastError()); if (ret) { @@ -931,7 +931,7 @@ ok(info->pPublisherInfo->dwLinkChoice == SPC_URL_LINK_CHOICE, "unexpected link choice %d\n", info->pPublisherInfo->dwLinkChoice); - ok(!lstrcmpW(info->pPublisherInfo->pwszUrl, winehq), + ok(!lstrcmpW(U(*info->pPublisherInfo).pwszUrl, winehq), "unexpected link value\n"); } LocalFree(info);

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