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

Aric Stewart : usp10: Implement Multiple Substitution Subtable.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: fda05436d11c687273b731e8f8d35424ef0e3125 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fda05436d11c687273b731e8f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Mon Aug 22 07:18:09 2011 -0500 usp10: Implement Multiple Substitution Subtable. --- dlls/usp10/shape.c | 118 +++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 99 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/shape.c b/dlls/usp10/shape.c index aacb998..0068b41 100644 --- a/dlls/usp10/shape.c +++ b/dlls/usp10/shape.c @@ -203,6 +203,18 @@ typedef struct { typedef struct { WORD SubstFormat; /* = 1 */ WORD Coverage; + WORD SequenceCount; + WORD Sequence[1]; +}GSUB_MultipleSubstFormat1; + +typedef struct { + WORD GlyphCount; + WORD Substitute[1]; +}GSUB_Sequence; + +typedef struct { + WORD SubstFormat; /* = 1 */ + WORD Coverage; WORD LigSetCount; WORD LigatureSet[1]; }GSUB_LigatureSubstFormat1; @@ -733,6 +745,54 @@ static INT GSUB_apply_SingleSubst(const GSUB_LookupTable *look, WORD *glyphs, IN return GSUB_E_NOGLYPH; } +static INT GSUB_apply_MultipleSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) +{ + int j; + TRACE("Multiple Substitution Subtable\n"); + + for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++) + { + int offset, index; + const GSUB_MultipleSubstFormat1 *msf1; + offset = GET_BE_WORD(look->SubTable[j]); + msf1 = (const GSUB_MultipleSubstFormat1*)((const BYTE*)look+offset); + + offset = GET_BE_WORD(msf1->Coverage); + index = GSUB_is_glyph_covered((const BYTE*)msf1+offset, glyphs[glyph_index]); + if (index != -1) + { + const GSUB_Sequence *seq; + int sub_count; + int j; + offset = GET_BE_WORD(msf1->Sequence[index]); + seq = (const GSUB_Sequence*)((const BYTE*)msf1+offset); + sub_count = GET_BE_WORD(seq->GlyphCount); + TRACE(" Glyph 0x%x (+%i)->",glyphs[glyph_index],(sub_count-1)); + + for (j = (*glyph_count)+(sub_count-1); j > glyph_index; j--) + glyphs[j] =glyphs[j-(sub_count-1)]; + + for (j = 0; j < sub_count; j++) + if (write_dir < 0) + glyphs[glyph_index + (sub_count-1) - j] = GET_BE_WORD(seq->Substitute[j]); + else + glyphs[glyph_index + j] = GET_BE_WORD(seq->Substitute[j]); + + *glyph_count = *glyph_count + (sub_count - 1); + + if (TRACE_ON(uniscribe)) + { + for (j = 0; j < sub_count; j++) + TRACE(" 0x%x",glyphs[glyph_index+j]); + TRACE("\n"); + } + + return glyph_index + sub_count; + } + } + return GSUB_E_NOGLYPH; +} + static INT GSUB_apply_AlternateSubst(const GSUB_LookupTable *look, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int j; @@ -943,6 +1003,8 @@ static INT GSUB_apply_lookup(const GSUB_LookupList* lookup, INT lookup_index, WO { case 1: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); + case 2: + return GSUB_apply_MultipleSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 3: return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); case 4: @@ -1261,28 +1323,41 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch { int i; int target_glyph = nextIndex - 1; + int seeking_glyph; int target_index = -1; int replacing_glyph = -1; int changed = 0; - if (write_dir > 0) - for (i = 0; i < chars; i++) - { - if (pwLogClust[i] == target_glyph) + + if (changeCount > 0) + target_glyph = nextIndex - (changeCount+1); + + seeking_glyph = target_glyph; + + do { + if (write_dir > 0) + for (i = 0; i < chars; i++) { - target_index = i; - break; + if (pwLogClust[i] == seeking_glyph) + { + target_index = i; + break; + } } - } - else - for (i = chars - 1; i >= 0; i--) - { - if (pwLogClust[i] == target_glyph) + else + for (i = chars - 1; i >= 0; i--) { - target_index = i; - break; + if (pwLogClust[i] == seeking_glyph) + { + target_index = i; + break; + } } - } + if (target_index == -1) + seeking_glyph ++; + } + while (target_index == -1 && seeking_glyph < chars); + if (target_index == -1) { ERR("Unable to find target glyph\n"); @@ -1310,13 +1385,18 @@ static void UpdateClusters(int nextIndex, int changeCount, int write_dir, int ch break; } } - } - /* renumber trailing indexes*/ - for(i = target_index; i < chars && i >= 0; i+=write_dir) + /* renumber trailing indexes*/ + for(i = target_index; i < chars && i >= 0; i+=write_dir) + { + if (pwLogClust[i] != target_glyph) + pwLogClust[i] += changeCount; + } + } + else { - if (pwLogClust[i] != target_glyph) - pwLogClust[i] += changeCount; + for(i = target_index; i < chars && i >= 0; i+=write_dir) + pwLogClust[i] += changeCount; } } }

1 0

Henri Verbeet : wined3d: Reject color blits on sysmem surfaces in arbfp_blit_supported().
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: c592d553f087a3713216a32880405a1a0143504d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c592d553f087a3713216a3288… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:41 2011 +0200 wined3d: Reject color blits on sysmem surfaces in arbfp_blit_supported(). --- dlls/wined3d/arb_program_shader.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d4a850b..24c0ff2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7166,6 +7166,9 @@ static BOOL arbfp_blit_supported(const struct wined3d_gl_info *gl_info, enum win return FALSE; } + if (src_pool == WINED3DPOOL_SYSTEMMEM || dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + src_fixup = get_complex_fixup(src_format->color_fixup); if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) {

1 0

Bernhard Loos : winegcc: Support a trailing / in paths to winebuild.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: de68bc3bf49ad32000691b33d6fa09de36e5a8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=de68bc3bf49ad32000691b33d… Author: Bernhard Loos <bernhardloos(a)googlemail.com> Date: Mon Aug 22 10:40:10 2011 +0200 winegcc: Support a trailing / in paths to winebuild. --- tools/winegcc/winegcc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 284223e..3a7e93a 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -1326,6 +1326,7 @@ int main(int argc, char **argv) { case 'B': str = strdup(option_arg); + if (strendswith(str, "/")) str[strlen(str) - 1] = 0; if (strendswith(str, "/tools/winebuild")) { char *objdir = strdup(str); @@ -1334,7 +1335,6 @@ int main(int argc, char **argv) /* don't pass it to the compiler, this generates warnings */ raw_compiler_arg = raw_linker_arg = 0; } - if (strendswith(str, "/")) str[strlen(str) - 1] = 0; if (!opts.prefix) opts.prefix = strarray_alloc(); strarray_add(opts.prefix, str); break;

1 0

Henri Verbeet : wined3d: Move arbfp based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt().
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: f58e55ec6c19d65689b273938f168287797362da URL: http://source.winehq.org/git/wine.git/?a=commit;h=f58e55ec6c19d65689b273938… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:42 2011 +0200 wined3d: Move arbfp based color blits from IWineD3DSurfaceImpl_BltOverride() to wined3d_surface_blt(). --- dlls/wined3d/surface.c | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 2fc08d8..04a6dec 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1682,6 +1682,16 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC surface_modify_location(dst_surface, SFLAG_INDRAWABLE, TRUE); return WINED3D_OK; } + + if (arbfp_blit.blit_supported(&device->adapter->gl_info, WINED3D_BLIT_OP_COLOR_BLIT, + &src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, + &dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) + { + TRACE("Using arbfp blit.\n"); + + if (SUCCEEDED(arbfp_blit_surface(device, filter, src_surface, &src_rect, dst_surface, &dst_rect))) + return WINED3D_OK; + } } } @@ -5504,14 +5514,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(struct wined3d_surface *dst_surfa TRACE("Blt from surface %p to rendertarget %p\n", src_surface, dst_surface); - if (!(flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) - && arbfp_blit.blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, - src_rect, src_surface->resource.usage, src_surface->resource.pool, - src_surface->resource.format, - dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, - dst_surface->resource.format)) - return arbfp_blit_surface(device, Filter, src_surface, src_rect, dst_surface, dst_rect); - if (!device->blitter->blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, src_rect, src_surface->resource.usage, src_surface->resource.pool, src_surface->resource.format, dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format))

1 0

Henri Verbeet : wined3d: Reject color blits on sysmem surfaces in ffp_blit_supported().
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 48911d7a1c64ff735a791ac1f59429a5aebcd7ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=48911d7a1c64ff735a791ac1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 22 21:02:43 2011 +0200 wined3d: Reject color blits on sysmem surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 04a6dec..1cafe03 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6325,6 +6325,9 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined switch (blit_op) { case WINED3D_BLIT_OP_COLOR_BLIT: + if (src_pool == WINED3DPOOL_SYSTEMMEM || dst_pool == WINED3DPOOL_SYSTEMMEM) + return FALSE; + src_fixup = get_complex_fixup(src_format->color_fixup); if (TRACE_ON(d3d_surface) && TRACE_ON(d3d)) {

1 0

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

Aug. 23, 2011

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: Constify some function parameters.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: ff501904a7a19082f68e36831e620233a74884c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff501904a7a19082f68e36831… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:58:59 2011 +0200 cmd: Constify some function parameters. --- programs/cmd/batch.c | 3 ++- programs/cmd/builtins.c | 39 +++++++++++++++++++++------------------ programs/cmd/tests/batch.c | 2 +- programs/cmd/wcmd.h | 34 ++++++++++++++++++---------------- programs/cmd/wcmdmain.c | 22 ++++++++++++---------- 5 files changed, 54 insertions(+), 46 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff501904a7a19082f68e3…

1 0

Frédéric Delanoy : cmd/tests: Add @tab@ keyword recognition.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: 453996fe85582b67659a03a9a5ff4ac36c618786 URL: http://source.winehq.org/git/wine.git/?a=commit;h=453996fe85582b67659a03a9a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:59:01 2011 +0200 cmd/tests: Add @tab@ keyword recognition. --- programs/cmd/tests/batch.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 0e7ca65..cb3d972 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -25,10 +25,11 @@ static char workdir[MAX_PATH]; static DWORD workdir_len; -/* Convert to DOS line endings, and substitute escaped spaces with real ones */ +/* Convert to DOS line endings, and substitute escaped whitespace chars with real ones */ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_size) { static const char escaped_space[] = {'@','s','p','a','c','e','@'}; + static const char escaped_tab[] = {'@','t','a','b','@'}; DWORD i, eol_count = 0; char *ptr, *new_data; @@ -48,6 +49,10 @@ static const char* convert_input_data(const char *data, DWORD size, DWORD *new_s && !memcmp(data + i, escaped_space, sizeof(escaped_space))) { *ptr++ = ' '; i += sizeof(escaped_space) - 1; + } else if (data + i + sizeof(escaped_tab) - 1 < data + size + && !memcmp(data + i, escaped_tab, sizeof(escaped_tab))) { + *ptr++ = '\t'; + i += sizeof(escaped_tab) - 1; } else { *ptr++ = data[i]; } @@ -150,6 +155,7 @@ static const char *compare_line(const char *out_line, const char *out_end, const static const char pwd_cmd[] = {'@','p','w','d','@'}; static const char space_cmd[] = {'@','s','p','a','c','e','@'}; + static const char tab_cmd[] = {'@','t','a','b','@'}; static const char or_broken_cmd[] = {'@','o','r','_','b','r','o','k','e','n','@'}; while(exp_ptr < exp_end) { @@ -174,7 +180,15 @@ static const char *compare_line(const char *out_line, const char *out_end, const } else { err = out_end; } - + }else if(exp_ptr+sizeof(tab_cmd) <= exp_end + && !memcmp(exp_ptr, tab_cmd, sizeof(tab_cmd))) { + exp_ptr += sizeof(tab_cmd); + if(out_ptr < out_end && *out_ptr == '\t') { + out_ptr++; + 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

Nikolay Sivov : msxml3/mxnamespace: Add IMXNamespaceManager stub.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

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

Frédéric Delanoy : cmd/tests: Add tests for tab handling.
by Alexandre Julliard Aug. 23, 2011

Aug. 23, 2011

Module: wine Branch: master Commit: a91eceaec0966afe820ed746aa1e129f055668e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91eceaec0966afe820ed746a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:26:55 2011 +0200 cmd/tests: Add tests for tab handling. --- programs/cmd/tests/test_builtins.cmd | 39 +++++++++++++++++++++++++- programs/cmd/tests/test_builtins.cmd.exp | 43 ++++++++++++++++++++++++++++++ 2 files changed, 80 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index c640ec4..b815e77 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -17,6 +17,14 @@ echo:word echo :word echo word(a)space@ echo word(a)space@@space@ + echo word +echo(a)tab@word +echo(a)tab@word @tab@ +echo(a)tab@word(a)tab@@space@ +(a)tab@echo word +echo @tab(a)word +echo @tab(a)word +echo(a)tab@@tab(a)word @echo off echo ------------ Testing 'echo' [OFF] -------------- @@ -35,6 +43,14 @@ echo:word echo :word echo word(a)space@ echo word(a)space@@space@ + echo word +echo(a)tab@word +echo(a)tab@word @tab@ +echo(a)tab@word(a)tab@@space@ +(a)tab@echo word +echo @tab(a)word +echo @tab(a)word +echo(a)tab@@tab(a)word echo ------------ Testing redirection operators -------------- mkdir foobar & cd foobar @@ -140,6 +156,14 @@ set BAZ%= echo set "FOO=bar" should not include the quotes in the variable value set "FOO=bar" echo %FOO% +set(a)tab@FOO=foo +echo %FOO% +set(a)tab@FOO= +echo '%FOO%' +set FOO=foo(a)space@ +echo '%FOO%' +set FOO=foo(a)tab@ +echo '%FOO%' set FOO= echo ------------ Testing variable expansion -------------- @@ -266,12 +290,18 @@ cd..(a)space@ cd if not exist foobar (cd ..) cd foobar +cd(a)tab@..(a)tab@@space@@tab@ +cd +if not exist foobar (cd ..) +cd foobar mkdir "bar bak" cd "bar bak" cd cd .. cd bar bak cd +cd "bar bak(a)space@"@tab@@space@ +cd cd ..\.. cd rd /Q/s foobar @@ -282,7 +312,7 @@ echo bar> foobaz type foobaz echo *** @echo off -type foobaz +type foobaz(a)tab@ echo *** del foobaz @@ -296,7 +326,7 @@ dir /b /a-d echo foo > nul dir /b /a-d echo foo > NuL -dir /b /a-d +(a)tab@dir /b(a)tab@/a-d del bar rem NUL not special everywhere call :setError 123 @@ -351,6 +381,11 @@ 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 +for(a)tab@%%i in (X2) do echo %%i +for %%i in(a)tab@(X3) do echo %%i +for %%i in (@tab@ foo(a)tab@) do echo %%i +for(a)tab@ %%i in(a)tab@(@tab(a)M) do echo %%i +for %%i(a)tab@in (X)@tab(a)do@tab(a)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 1580637..18ba102 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -47,6 +47,30 @@ word(a)space@ @pwd@>echo word(a)space@@space@@space@ word(a)space@@space@ + +(a)todo_wine@@pwd@>echo word(a)space@ +word + +(a)pwd@>echo(a)tab@word(a)space@ +(a)todo_wine@word + +(a)pwd@>echo(a)tab@word(a)space@@tab@@space@ +(a)todo_wine@word(a)space@@tab@ + +(a)pwd@>echo(a)tab@word(a)tab@@space@@space@ +(a)todo_wine@word(a)tab@@space@ + +(a)todo_wine@@pwd@>echo word(a)space@ +word + +(a)pwd@>echo(a)space@@tab(a)word@space@ +(a)tab@word + +(a)pwd@>echo(a)space@@space@@tab(a)word@space@ +(a)space@@tab(a)word + +(a)pwd@>echo(a)tab@@tab(a)word@space@ +(a)todo_wine@@tab(a)word ------------ Testing 'echo' [OFF] -------------- word 'singlequotedword' @@ -63,6 +87,14 @@ word :word word(a)space@ word(a)space@@space@ +word +(a)todo_wine@word +(a)todo_wine@word(a)space@@tab@ +(a)todo_wine@word(a)tab@@space@ +word +(a)tab@word +(a)space@@tab(a)word +(a)todo_wine@@tab(a)word ------------ Testing redirection operators -------------- ...stdout redirection foo @@ -126,6 +158,10 @@ BAZ=bazbaz bazbaz set "FOO=bar" should not include the quotes in the variable value bar +(a)todo_wine@foo +(a)todo_wine@'' +'foo(a)space@' +'foo(a)tab@' ------------ Testing variable expansion -------------- ~dp0 should be directory containing batch file @pwd@\ @@ -189,6 +225,8 @@ Current dir: @pwd@\foobar(a)or_broken@Current dir:@space@ @pwd@\foobar @pwd@ @todo_wine@@pwd@ +(a)todo_wine@@pwd@ +(a)pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@ @@ -237,6 +275,11 @@ A B C X +(a)todo_wine@X2 +(a)todo_wine@X3 +foo +(a)todo_wine@M +(a)todo_wine@X ...imbricated FORs @todo_wine(a)X Y @todo_wine(a)X Y

1 0