August 2011 - Wine-commits - list.winehq.org

Nikolay Sivov : msxml3/mxnamespace: Add IMXNamespaceManager stub.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 92539672956dadd441a4d65f4103d0a7a4b57af8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92539672956dadd441a4d65f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:30:58 2011 +0400 msxml3/mxnamespace: Add IMXNamespaceManager stub. --- dlls/msxml3/Makefile.in | 1 + dlls/msxml3/factory.c | 7 ++ dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/mxnamespace.c | 211 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 220 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index e7223bb..889ef64 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -19,6 +19,7 @@ C_SRCS = \ factory.c \ httprequest.c \ main.c \ + mxnamespace.c \ mxwriter.c \ node.c \ nodelist.c \ diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index d3d2692..9ea1bb4 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -224,6 +224,7 @@ static ClassFactory saxreadcf = { { &ClassFactoryVtbl }, SAXXMLReader_create }; static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create }; static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; static ClassFactory mxwritercf = { { &ClassFactoryVtbl }, MXWriter_create }; +static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create }; /****************************************************************** * DllGetClassObject (MSXML3.@) @@ -295,6 +296,12 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) { cf = &mxwritercf.IClassFactory_iface; } + else if( IsEqualCLSID( rclsid, &CLSID_MXNamespaceManager ) || + IsEqualCLSID( rclsid, &CLSID_MXNamespaceManager40 ) || + IsEqualCLSID( rclsid, &CLSID_MXNamespaceManager60 ) ) + { + cf = &mxnsmanagercf.IClassFactory_iface; + } if ( !cf ) return CLASS_E_CLASSNOTAVAILABLE; diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index bf65a89..0027324 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -435,6 +435,7 @@ extern HRESULT SAXXMLReader_create(IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT XMLHTTPRequest_create(IUnknown*, void **) DECLSPEC_HIDDEN; extern HRESULT XSLTemplate_create(IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT MXWriter_create(IUnknown*,void**) DECLSPEC_HIDDEN; +extern HRESULT MXNamespaceManager_create(IUnknown*,void**) DECLSPEC_HIDDEN; static inline const CLSID* DOMDocument_version(MSXML_VERSION v) { diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c new file mode 100644 index 0000000..2119e4f --- /dev/null +++ b/dlls/msxml3/mxnamespace.c @@ -0,0 +1,211 @@ +/* + * IMXNamespaceManager implementation + * + * Copyright 2011 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define NONAMELESSUNION + +#include "config.h" + +#include <stdarg.h> +#ifdef HAVE_LIBXML2 +# include <libxml/parser.h> +# include <libxml/xmlerror.h> +# include <libxml/encoding.h> +#endif + +#include "windef.h" +#include "winbase.h" +#include "winuser.h" +#include "ole2.h" +#include "msxml6.h" + +#include "msxml_private.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msxml); + +typedef struct +{ + IMXNamespaceManager IMXNamespaceManager_iface; + LONG ref; +} namespacemanager; + +static inline namespacemanager *impl_from_IMXNamespaceManager( IMXNamespaceManager *iface ) +{ + return CONTAINING_RECORD(iface, namespacemanager, IMXNamespaceManager_iface); +} + +static HRESULT WINAPI namespacemanager_QueryInterface(IMXNamespaceManager *iface, REFIID riid, void **ppvObject) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppvObject); + + if ( IsEqualGUID( riid, &IID_IMXNamespaceManager) || + IsEqualGUID( riid, &IID_IUnknown) ) + { + *ppvObject = iface; + } + else + { + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); + *ppvObject = NULL; + return E_NOINTERFACE; + } + + IMXNamespaceManager_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI namespacemanager_AddRef(IMXNamespaceManager *iface) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + ULONG ref = InterlockedIncrement( &This->ref ); + TRACE("(%p)->(%u)\n", This, ref ); + return ref; +} + +static ULONG WINAPI namespacemanager_Release(IMXNamespaceManager *iface) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + ULONG ref = InterlockedDecrement( &This->ref ); + + TRACE("(%p)->(%u)\n", This, ref ); + + if ( ref == 0 ) + heap_free( This ); + + return ref; +} + +static HRESULT WINAPI namespacemanager_putAllowOverride(IMXNamespaceManager *iface, + VARIANT_BOOL override) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p)->(%d): stub\n", This, override ); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_getAllowOverride(IMXNamespaceManager *iface, + VARIANT_BOOL *override) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p)->(%p): stub\n", This, override ); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_reset(IMXNamespaceManager *iface) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p): stub\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_pushContext(IMXNamespaceManager *iface) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p): stub\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_pushNodeContext(IMXNamespaceManager *iface, + IXMLDOMNode *node, VARIANT_BOOL deep) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p)->(%p %d): stub\n", This, node, deep ); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_popContext(IMXNamespaceManager *iface) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p): stub\n", This ); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_declarePrefix(IMXNamespaceManager *iface, + const WCHAR *prefix, const WCHAR *namespaceURI) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p)->(%s %s): stub\n", This, debugstr_w(prefix), debugstr_w(namespaceURI)); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *iface, + LONG index, WCHAR *prefix, int *prefix_len) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p)->(%d %p %p): stub\n", This, index, prefix, prefix_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_getPrefix(IMXNamespaceManager *iface, + const WCHAR *uri, LONG index, WCHAR *prefix, int *prefix_len) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p)->(%s %d %p %p): stub\n", This, debugstr_w(uri), index, prefix, prefix_len); + return E_NOTIMPL; +} + +static HRESULT WINAPI namespacemanager_getURI(IMXNamespaceManager *iface, + const WCHAR *prefix, IXMLDOMNode *node, WCHAR *uri, int *uri_len) +{ + namespacemanager *This = impl_from_IMXNamespaceManager( iface ); + FIXME("(%p)->(%s %p %p %p): stub\n", This, debugstr_w(prefix), node, uri, uri_len); + return E_NOTIMPL; +} + +static const struct IMXNamespaceManagerVtbl MXNamespaceManagerVtbl = +{ + namespacemanager_QueryInterface, + namespacemanager_AddRef, + namespacemanager_Release, + namespacemanager_putAllowOverride, + namespacemanager_getAllowOverride, + namespacemanager_reset, + namespacemanager_pushContext, + namespacemanager_pushNodeContext, + namespacemanager_popContext, + namespacemanager_declarePrefix, + namespacemanager_getDeclaredPrefix, + namespacemanager_getPrefix, + namespacemanager_getURI +}; + +HRESULT MXNamespaceManager_create(IUnknown *outer, void **obj) +{ + namespacemanager *ns; + + TRACE("(%p, %p)\n", outer, obj); + + ns = heap_alloc( sizeof (*ns) ); + if( !ns ) + return E_OUTOFMEMORY; + + ns->IMXNamespaceManager_iface.lpVtbl = &MXNamespaceManagerVtbl; + ns->ref = 1; + + *obj = &ns->IMXNamespaceManager_iface; + + TRACE("returning iface %p\n", *obj); + + return S_OK; +}

1 0

Nikolay Sivov : msxml3/mxnamespace: Stub IVBMXNamespaceManager and added some tests.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 7f47d97e125afaf8cbf5ba0af546abdbf5cfad5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f47d97e125afaf8cbf5ba0af… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:44:28 2011 +0400 msxml3/mxnamespace: Stub IVBMXNamespaceManager and added some tests. --- dlls/msxml3/dispex.c | 1 + dlls/msxml3/msxml_private.h | 1 + dlls/msxml3/mxnamespace.c | 278 ++++++++++++++++++++++++++++++++++++------- dlls/msxml3/tests/domdoc.c | 78 ++++++++++++ 4 files changed, 317 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7f47d97e125afaf8cbf5b…

1 0

Frédéric Delanoy : cmd: Use CSTR_* instead of hardcoded values as result of CompareStringW.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: d1731eb98a2d1143fe7b7b7d58abb2c3c57a1754 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1731eb98a2d1143fe7b7b7d5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:53 2011 +0200 cmd: Use CSTR_* instead of hardcoded values as result of CompareStringW. --- programs/cmd/builtins.c | 12 ++++++------ programs/cmd/wcmdmain.c | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 09c166f..254b2c7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1003,7 +1003,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { WINE_TRACE("Looking for 'do' in %p\n", *cmdList); if ((*cmdList == NULL) || (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 3, doW, -1) != 2)) { + (*cmdList)->command, 3, doW, -1) != CSTR_EQUAL)) { WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } @@ -1277,7 +1277,7 @@ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, } else { if (isIF && CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - (*cmdList)->command, 5, ifElse, -1) == 2) { + (*cmdList)->command, 5, ifElse, -1) == CSTR_EQUAL) { /* Swap between if and else processing */ processThese = !processThese; @@ -1320,7 +1320,7 @@ void WCMD_give_help (WCHAR *command) { else { for (i=0; i<=WCMD_EXIT; i++) { if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - command, -1, inbuilt[i], -1) == 2) { + command, -1, inbuilt[i], -1) == CSTR_EQUAL) { WCMD_output_asis (WCMD_LoadMessage(i)); return; } @@ -2090,7 +2090,7 @@ void WCMD_setshow_default (WCHAR *command) { /* Skip /D and trailing whitespace if on the front of the command line */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - command, 2, parmD, -1) == 2) { + command, 2, parmD, -1) == CSTR_EQUAL) { command += 2; while (*command && *command==' ') command++; } @@ -2262,7 +2262,7 @@ static int WCMD_setshow_sortenv(const WCHAR *s, const WCHAR *stub) for( i=0; i<count; i++ ) { if (!stub || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - str[i], stublen, stub, -1) == 2) { + str[i], stublen, stub, -1) == CSTR_EQUAL) { /* Don't display special internal variables */ if (str[i][0] != '=') { WCMD_output_asis(str[i]); @@ -2298,7 +2298,7 @@ void WCMD_setshow_env (WCHAR *s) { /* See if /P supplied, and if so echo the prompt, and read in a reply */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - s, 2, parmP, -1) == 2) { + s, 2, parmP, -1) == CSTR_EQUAL) { WCHAR string[MAXSTRING]; DWORD count; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0111c15..0bab2d0 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -597,7 +597,7 @@ static WCHAR *WCMD_expand_envvar(WCHAR *start, WCHAR *forVar, WCHAR *forVal) { SORT_STRINGSORT, thisVar, (colonpos - thisVar) - 1, - forVar, -1) == 2)) { + forVar, -1) == CSTR_EQUAL)) { strcpyW(thisVarContents, forVal); len = strlenW(thisVarContents); @@ -817,7 +817,7 @@ static void handleExpansion(WCHAR *cmd, BOOL justFors, WCHAR *forVariable, WCHAR SORT_STRINGSORT, p, strlenW(forVariable), - forVariable, -1) == 2)) { + forVariable, -1) == CSTR_EQUAL)) { WCMD_strsubstW(p, p + strlenW(forVariable), forValue, -1); } else if (!justFors) { @@ -1828,12 +1828,12 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF /* If command starts with 'rem', ignore any &&, ( etc */ if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, remCmd, -1) == 2) { + curPos, 4, remCmd, -1) == CSTR_EQUAL) { inRem = TRUE; /* If command starts with 'for', handle ('s mid line after IN or DO */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 4, forCmd, -1) == 2) { + curPos, 4, forCmd, -1) == CSTR_EQUAL) { inFor = TRUE; /* If command starts with 'if' or 'else', handle ('s mid line. We should ensure this @@ -1843,11 +1843,11 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF echo they equal )" will be parsed wrong */ } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, ifCmd, -1) == 2) { + curPos, 3, ifCmd, -1) == CSTR_EQUAL) { inIf = TRUE; } else if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 5, ifElse, -1) == 2) { + curPos, 5, ifElse, -1) == CSTR_EQUAL) { inElse = TRUE; lastWasElse = TRUE; onlyWhiteSpace = TRUE; @@ -1861,7 +1861,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF is then 0, and all whitespace is skipped */ } else if (inFor && (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forDO, -1) == 2)) { + curPos, 3, forDO, -1) == CSTR_EQUAL)) { WINE_TRACE("Found DO\n"); lastWasDo = TRUE; onlyWhiteSpace = TRUE; @@ -1879,7 +1879,7 @@ WCHAR *WCMD_ReadAndParseLine(WCHAR *optionalcmd, CMD_LIST **output, HANDLE readF WINE_TRACE("Found 'FOR', comparing next parm: '%s'\n", wine_dbgstr_w(curPos)); if (CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, - curPos, 3, forIN, -1) == 2) { + curPos, 3, forIN, -1) == CSTR_EQUAL) { WINE_TRACE("Found IN\n"); lastWasIn = TRUE; onlyWhiteSpace = TRUE;

1 0

Frédéric Delanoy : cmd: Remove reference to no longer existing WCMD_read_console from header file.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 822759a3675c801dae21efea383a7600606acdab URL: http://source.winehq.org/git/wine.git/?a=commit;h=822759a3675c801dae21efea3… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:54 2011 +0200 cmd: Remove reference to no longer existing WCMD_read_console from header file. --- programs/cmd/wcmd.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8ed7a01..0c7f622 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -76,7 +76,6 @@ void WCMD_pause (void); void WCMD_popd (void); void WCMD_print_error (void); void WCMD_pushd (WCHAR *); -int WCMD_read_console (WCHAR *string, int str_len); void WCMD_remove_dir (WCHAR *command); void WCMD_rename (void); void WCMD_run_program (WCHAR *command, int called);

1 0

Frédéric Delanoy : cmd: Clarify some trace messages.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 07583906078af0bef58540b684adc2f873db0e51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07583906078af0bef58540b68… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:55 2011 +0200 cmd: Clarify some trace messages. --- programs/cmd/builtins.c | 2 +- programs/cmd/wcmdmain.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 254b2c7..8bb84f6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1219,7 +1219,7 @@ void WCMD_part_execute(CMD_LIST **cmdList, WCHAR *firstcmd, WCHAR *variable, CMD_LIST *curPosition = *cmdList; int myDepth = (*cmdList)->bracketDepth; - WINE_TRACE("cmdList(%p), firstCmd(%p), with '%s'='%s', doIt(%d)\n", + WINE_TRACE("cmdList(%p), firstCmd(%p), with variable '%s'='%s', doIt(%d)\n", cmdList, wine_dbgstr_w(firstcmd), wine_dbgstr_w(variable), wine_dbgstr_w(value), conditionTRUE); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 0bab2d0..2018a12 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -1211,7 +1211,7 @@ void WCMD_execute (WCHAR *command, WCHAR *redirects, STD_ERROR_HANDLE}; BOOL piped = FALSE; - WINE_TRACE("command on entry:%s (%p), with '%s'='%s'\n", + WINE_TRACE("command on entry:%s (%p), with forVariable '%s'='%s'\n", wine_dbgstr_w(command), cmdList, wine_dbgstr_w(forVariable), wine_dbgstr_w(forValue));

1 0

Frédéric Delanoy : cmd/tests: Fix bug where an output line was marked as matching when the expected line only differs by a terminal @space@.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: bc8fde1c0003b7e753dd60bf4909ddc7d6efa4be URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc8fde1c0003b7e753dd60bf4… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:56 2011 +0200 cmd/tests: Fix bug where an output line was marked as matching when the expected line only differs by a terminal @space(a). --- programs/cmd/tests/batch.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 3f8826f..17649d4 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -168,9 +168,13 @@ static const char *compare_line(const char *out_line, const char *out_end, const }else if(exp_ptr+sizeof(space_cmd) <= exp_end && !memcmp(exp_ptr, space_cmd, sizeof(space_cmd))) { exp_ptr += sizeof(space_cmd); - if(out_ptr < out_end && *out_ptr == ' ') + if(out_ptr < out_end && *out_ptr == ' ') { out_ptr++; - continue; + continue; + } else { + err = out_end; + } + }else if(exp_ptr+sizeof(or_broken_cmd) <= exp_end && !memcmp(exp_ptr, or_broken_cmd, sizeof(or_broken_cmd))) { if(out_ptr == out_end)

1 0

Frédéric Delanoy : cmd: Fix a FOR parsing bug when multiple spaces follow an IN.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 303af43ff5ded3c148c7e10ab7d9b0cd18de4bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=303af43ff5ded3c148c7e10ab… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:57 2011 +0200 cmd: Fix a FOR parsing bug when multiple spaces follow an IN. --- programs/cmd/builtins.c | 4 +++- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8bb84f6..e738626 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -976,7 +976,9 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { while (*curPos && *curPos==' ') curPos++; /* Ensure line continues with IN */ - if (!*curPos || lstrcmpiW (curPos, inW)) { + if (!*curPos + || CompareStringW(LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, + curPos, 3, inW, -1) != CSTR_EQUAL) { WCMD_output (WCMD_LoadMessage(WCMD_SYNTAXERR)); return; } diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a83e568..ffbc814 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -318,6 +318,7 @@ for %%i in (A B C) do echo %%j for %%i in (A B C) do call :forTestFun1 %%i for %%i in (1,4,1) do echo %%i for %%i in (A, B,C) do echo %%i +for %%i in (X) do echo %%i goto :endForTestFun1 :forTestFun1 echo %1 diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 7ebe57a..2954e16 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -223,6 +223,7 @@ C A B C +X ...imbricated FORs @todo_wine(a)X Y @todo_wine(a)X Y

1 0

Thomas Mullaly : msxml3/tests: Added IStream tests for IMXWriter.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: ae36cd5f35a7cb4cb77d7661b990c3f301d18e78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae36cd5f35a7cb4cb77d7661b… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 12 19:11:30 2011 -0400 msxml3/tests: Added IStream tests for IMXWriter. --- dlls/msxml3/tests/saxreader.c | 244 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 244 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 4e021c6..ad350db 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -2,6 +2,7 @@ * XML test * * Copyright 2008 Piotr Caban + * Copyright 2011 Thomas Mullaly * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -96,6 +97,17 @@ static const WCHAR szCarriageRetTest[] = { '<','/','B','a','n','k','A','c','c','o','u','n','t','>','\0' }; +static const WCHAR szUtf16XML[] = { +'<','?','x','m','l',' ','v','e','r','s','i','o','n','=','"','1','.','0','"',' ', +'e','n','c','o','d','i','n','g','=','"','U','T','F','-','1','6','"',' ', +'s','t','a','n','d','a','l','o','n','e','=','"','n','o','"','?','>','\r','\n' +}; + +static const CHAR szUtf16BOM[] = {0xff, 0xfe}; + +static const CHAR szUtf8XML[] = +"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\r\n"; + static const CHAR szTestXML[] = "<?xml version=\"1.0\" ?>\n" "<BankAccount>\n" @@ -696,6 +708,152 @@ static const ISAXAttributesVtbl SAXAttributesVtbl = static ISAXAttributes saxattributes = { &SAXAttributesVtbl }; +typedef struct mxwriter_write_test_t { + BOOL last; + const BYTE *data; + DWORD cb; + BOOL null_written; +} mxwriter_write_test; + +typedef struct mxwriter_stream_test_t { + VARIANT_BOOL bom; + const char *encoding; + mxwriter_write_test expected_writes[4]; +} mxwriter_stream_test; + +static const mxwriter_write_test *current_write_test; +static DWORD current_stream_test_index; + +static HRESULT WINAPI istream_QueryInterface(IStream *iface, REFIID riid, void **ppvObject) +{ + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IStream) || IsEqualGUID(riid, &IID_IUnknown)) + *ppvObject = iface; + else + return E_NOINTERFACE; + + return S_OK; +} + +static ULONG WINAPI istream_AddRef(IStream *iface) +{ + return 2; +} + +static ULONG WINAPI istream_Release(IStream *iface) +{ + return 1; +} + +static HRESULT WINAPI istream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pcbRead) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) +{ + ok(pv != NULL, "pv == NULL\n"); + + if(current_write_test->last) { + ok(0, "Too many Write calls made on test %d\n", current_stream_test_index); + return E_FAIL; + } + + ok(current_write_test->cb == cb, "Expected %d, but got %d on test %d\n", + current_write_test->cb, cb, current_stream_test_index); + + if(!pcbWritten) + ok(current_write_test->null_written, "pcbWritten was NULL on test %d\n", current_stream_test_index); + else + ok(!memcmp(current_write_test->data, pv, cb), "Unexpected data on test %d\n", current_stream_test_index); + + ++current_write_test; + + if(pcbWritten) + *pcbWritten = cb; + + return S_OK; +} + +static HRESULT WINAPI istream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, + ULARGE_INTEGER *plibNewPosition) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_SetSize(IStream *iface, ULARGE_INTEGER libNewSize) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_CopyTo(IStream *iface, IStream *pstm, ULARGE_INTEGER cb, + ULARGE_INTEGER *pcbRead, ULARGE_INTEGER *plibWritten) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Commit(IStream *iface, DWORD grfCommitFlags) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Revert(IStream *iface) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_LockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_UnlockRegion(IStream *iface, ULARGE_INTEGER libOffset, + ULARGE_INTEGER cb, DWORD dwLockType) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Stat(IStream *iface, STATSTG *pstatstg, DWORD grfStatFlag) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI istream_Clone(IStream *iface, IStream **ppstm) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static const IStreamVtbl StreamVtbl = { + istream_QueryInterface, + istream_AddRef, + istream_Release, + istream_Read, + istream_Write, + istream_Seek, + istream_SetSize, + istream_CopyTo, + istream_Commit, + istream_Revert, + istream_LockRegion, + istream_UnlockRegion, + istream_Stat, + istream_Clone +}; + +static IStream mxstream = { &StreamVtbl }; + static void test_saxreader(void) { HRESULT hr; @@ -1349,6 +1507,91 @@ static void test_mxwriter_characters(void) free_bstrs(); } +static const mxwriter_stream_test mxwriter_stream_tests[] = { + { + VARIANT_TRUE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } + }, + { + VARIANT_FALSE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } + }, + { + VARIANT_TRUE,"UTF-8", + { + {FALSE,(const BYTE*)szUtf8XML,sizeof(szUtf8XML)-1}, + /* For some reason Windows makes an empty write call when UTF-8 encoding is used + * and the writer is released. + */ + {FALSE,NULL,0}, + {TRUE} + } + }, + { + VARIANT_TRUE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } + } +}; + +static void test_mxwriter_stream(void) +{ + DWORD test_count = sizeof(mxwriter_stream_tests)/sizeof(mxwriter_stream_tests[0]); + + for(current_stream_test_index = 0; current_stream_test_index < test_count; ++current_stream_test_index) { + const mxwriter_stream_test *test = mxwriter_stream_tests+current_stream_test_index; + IMXWriter *writer; + ISAXContentHandler *content; + HRESULT hr; + VARIANT dest; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "QueryInterface(ISAXContentHandler) failed: %08x\n", hr); + + hr = IMXWriter_put_encoding(writer, _bstr_(test->encoding)); + ok(hr == S_OK, "put_encoding failed with %08x on test %d\n", hr, current_stream_test_index); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)&mxstream; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "put_output failed with %08x on test %d\n", hr, current_stream_test_index); + VariantClear(&dest); + + hr = IMXWriter_put_byteOrderMark(writer, test->bom); + ok(hr == S_OK, "put_byteOrderMark failed with %08x on test %d\n", hr, current_stream_test_index); + + current_write_test = test->expected_writes; + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed with %08x on test %d\n", hr, current_stream_test_index); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "endDocument failed with %08x on test %d\n", hr, current_stream_test_index); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + todo_wine ok(current_write_test->last, "The last %d write calls on test %d were missed\n", + current_write_test-test->expected_writes, current_stream_test_index); + } + + free_bstrs(); +} + START_TEST(saxreader) { ISAXXMLReader *reader; @@ -1384,6 +1627,7 @@ START_TEST(saxreader) test_mxwriter_characters(); test_mxwriter_properties(); test_mxwriter_flush(); + test_mxwriter_stream(); } else win_skip("MXXMLWriter not supported\n");

1 0

Thomas Mullaly : msxml3/tests: Added more IMXWriter tests.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: e4b7e9626747dd443deea222ca9fffae73b2d072 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4b7e9626747dd443deea222c… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 12 19:11:54 2011 -0400 msxml3/tests: Added more IMXWriter tests. --- dlls/msxml3/tests/saxreader.c | 117 +++++++++++++++++++++++++++++++++++++++-- 1 files changed, 112 insertions(+), 5 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ad350db..2713581 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -713,6 +713,7 @@ typedef struct mxwriter_write_test_t { const BYTE *data; DWORD cb; BOOL null_written; + BOOL fail_write; } mxwriter_write_test; typedef struct mxwriter_stream_test_t { @@ -754,6 +755,8 @@ static HRESULT WINAPI istream_Read(IStream *iface, void *pv, ULONG cb, ULONG *pc static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, ULONG *pcbWritten) { + BOOL fail = FALSE; + ok(pv != NULL, "pv == NULL\n"); if(current_write_test->last) { @@ -761,6 +764,8 @@ static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, UL return E_FAIL; } + fail = current_write_test->fail_write; + ok(current_write_test->cb == cb, "Expected %d, but got %d on test %d\n", current_write_test->cb, cb, current_stream_test_index); @@ -774,7 +779,7 @@ static HRESULT WINAPI istream_Write(IStream *iface, const void *pv, ULONG cb, UL if(pcbWritten) *pcbWritten = cb; - return S_OK; + return fail ? E_FAIL : S_OK; } static HRESULT WINAPI istream_Seek(IStream *iface, LARGE_INTEGER dlibMove, DWORD dwOrigin, @@ -1541,19 +1546,30 @@ static const mxwriter_stream_test mxwriter_stream_tests[] = { {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, {TRUE} } + }, + { + VARIANT_TRUE,"UTF-16", + { + {FALSE,(const BYTE*)szUtf16BOM,sizeof(szUtf16BOM),TRUE,TRUE}, + {FALSE,(const BYTE*)szUtf16XML,sizeof(szUtf16XML)}, + {TRUE} + } } }; static void test_mxwriter_stream(void) { + IMXWriter *writer; + ISAXContentHandler *content; + HRESULT hr; + VARIANT dest; + IStream *stream; + LARGE_INTEGER pos; + ULARGE_INTEGER pos2; DWORD test_count = sizeof(mxwriter_stream_tests)/sizeof(mxwriter_stream_tests[0]); for(current_stream_test_index = 0; current_stream_test_index < test_count; ++current_stream_test_index) { const mxwriter_stream_test *test = mxwriter_stream_tests+current_stream_test_index; - IMXWriter *writer; - ISAXContentHandler *content; - HRESULT hr; - VARIANT dest; hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, &IID_IMXWriter, (void**)&writer); @@ -1589,6 +1605,96 @@ static void test_mxwriter_stream(void) current_write_test-test->expected_writes, current_stream_test_index); } + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); + ok(hr == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "QueryInterface(ISAXContentHandler) failed: %08x\n", hr); + + hr = IMXWriter_put_encoding(writer, _bstr_("UTF-8")); + ok(hr == S_OK, "put_encoding failed: %08x\n", hr); + + V_VT(&dest) = VT_UNKNOWN; + V_UNKNOWN(&dest) = (IUnknown*)stream; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "put_output failed: %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed: %08x\n", hr); + + /* Setting output of the mxwriter causes the current output to be flushed, + * and the writer to start over. + */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_put_output(writer, dest); + ok(hr == S_OK, "put_output failed: %08x\n", hr); + + pos.QuadPart = 0; + hr = IStream_Seek(stream, pos, STREAM_SEEK_CUR, &pos2); + ok(hr == S_OK, "Seek failed: %08x\n", hr); + todo_wine ok(pos2.QuadPart != 0, "expected stream position moved\n"); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed: %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "endDocument failed: %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "get_output failed: %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + "Got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + free_bstrs(); +} + +static void test_mxwriter_encoding(void) +{ + IMXWriter *writer; + ISAXContentHandler *content; + HRESULT hr; + VARIANT dest; + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "QueryInterface(ISAXContentHandler) failed: %08x\n", hr); + + hr = IMXWriter_put_encoding(writer, _bstr_("UTF-8")); + ok(hr == S_OK, "put_encoding failed: %08x\n", hr); + + hr = ISAXContentHandler_startDocument(content); + ok(hr == S_OK, "startDocument failed: %08x\n", hr); + + hr = ISAXContentHandler_endDocument(content); + todo_wine ok(hr == S_OK, "endDocument failed: %08x\n", hr); + + /* The content is always re-encoded to UTF-16 when the output is + * retrieved as a BSTR. + */ + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "get_output failed: %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "Expected VT_BSTR, got %d\n", V_VT(&dest)); + todo_wine ok(!lstrcmpW(_bstr_("<?xml version=\"1.0\" encoding=\"UTF-16\" standalone=\"no\"?>\r\n"), V_BSTR(&dest)), + "got wrong content: %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + free_bstrs(); } @@ -1628,6 +1734,7 @@ START_TEST(saxreader) test_mxwriter_properties(); test_mxwriter_flush(); test_mxwriter_stream(); + test_mxwriter_encoding(); } else win_skip("MXXMLWriter not supported\n");

1 0

Thomas Mullaly : msxml3: Added IStream support to IMXWriter.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: f1f57f236896670bb35fb9afb14cd70c759a3698 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f57f236896670bb35fb9afb… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Fri Aug 12 19:11:08 2011 -0400 msxml3: Added IStream support to IMXWriter. --- dlls/msxml3/msxml_private.h | 16 ++++ dlls/msxml3/mxwriter.c | 193 ++++++++++++++++++++++++++++++++++++---- dlls/msxml3/tests/saxreader.c | 36 ++++---- 3 files changed, 206 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f1f57f236896670bb35fb…

1 0