wine-commits August 2011

wine-commits@winehq.org

2 participants
770 discussions

Aric Stewart : usp10: Implement Multiple Substitution Subtable.
by Alexandre Julliard 23 Aug '11

23 Aug '11

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

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

23 Aug '11

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

Nikolay Sivov : msxml3/mxnamespace: Support prefix override mode.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 9c2288fceef98cf25cdb4f11803ac780e5611fc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c2288fceef98cf25cdb4f118… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:49:21 2011 +0400 msxml3/mxnamespace: Support prefix override mode. --- dlls/msxml3/mxnamespace.c | 65 ++++++++++++++++++++++++++++++++++--------- dlls/msxml3/tests/domdoc.c | 42 +++++++++++++++++++++++++--- 2 files changed, 88 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index 2719bb5..17fbab8 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -71,6 +71,8 @@ typedef struct LONG ref; struct list ctxts; + + VARIANT_BOOL override; } namespacemanager; static inline namespacemanager *impl_from_IMXNamespaceManager( IMXNamespaceManager *iface ) @@ -83,17 +85,46 @@ static inline namespacemanager *impl_from_IVBMXNamespaceManager( IVBMXNamespaceM return CONTAINING_RECORD(iface, namespacemanager, IVBMXNamespaceManager_iface); } -static HRESULT declare_prefix(struct nscontext *ctxt, const WCHAR *prefix, const WCHAR *uri) +static HRESULT declare_prefix(namespacemanager *This, const WCHAR *prefix, const WCHAR *uri) { + struct nscontext *ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); + static const WCHAR emptyW[] = {0}; + struct ns *ns; + int i; + if (ctxt->count == ctxt->max_alloc) { ctxt->max_alloc *= 2; ctxt->ns = heap_realloc(ctxt->ns, ctxt->max_alloc*sizeof(*ctxt->ns)); } - ctxt->ns[ctxt->count].prefix = SysAllocString(prefix); - ctxt->ns[ctxt->count].uri = SysAllocString(uri); - ctxt->count++; + if (!prefix) prefix = emptyW; + + ns = NULL; + for (i = 0; i < ctxt->count; i++) + if (!strcmpW(ctxt->ns[i].prefix, prefix)) + { + ns = &ctxt->ns[i]; + break; + } + + if (ns) + { + if (This->override == VARIANT_TRUE) + { + SysFreeString(ns->uri); + ns->uri = SysAllocString(uri); + return S_FALSE; + } + else + return E_FAIL; + } + else + { + ctxt->ns[ctxt->count].prefix = SysAllocString(prefix); + ctxt->ns[ctxt->count].uri = SysAllocString(uri); + ctxt->count++; + } return S_OK; } @@ -222,17 +253,13 @@ static HRESULT WINAPI namespacemanager_declarePrefix(IMXNamespaceManager *iface, static const WCHAR xmlnsW[] = {'x','m','l','n','s',0}; namespacemanager *This = impl_from_IMXNamespaceManager( iface ); - struct nscontext *ctxt; TRACE("(%p)->(%s %s)\n", This, debugstr_w(prefix), debugstr_w(namespaceURI)); - if (!prefix) return E_FAIL; - - if (!strcmpW(prefix, xmlW) || !strcmpW(prefix, xmlnsW) || (prefix && !namespaceURI)) + if (prefix && (!strcmpW(prefix, xmlW) || !strcmpW(prefix, xmlnsW) || !namespaceURI)) return E_INVALIDARG; - ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); - return declare_prefix(ctxt, prefix, namespaceURI); + return declare_prefix(This, prefix, namespaceURI); } static HRESULT WINAPI namespacemanager_getDeclaredPrefix(IMXNamespaceManager *iface, @@ -451,16 +478,24 @@ static HRESULT WINAPI vbnamespacemanager_put_allowOverride(IVBMXNamespaceManager VARIANT_BOOL override) { namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); - FIXME("(%p)->(%d): stub\n", This, override); - return E_NOTIMPL; + + TRACE("(%p)->(%d)\n", This, override); + This->override = override; + + return S_OK; } static HRESULT WINAPI vbnamespacemanager_get_allowOverride(IVBMXNamespaceManager *iface, VARIANT_BOOL *override) { namespacemanager *This = impl_from_IVBMXNamespaceManager( iface ); - FIXME("(%p)->(%p): stub\n", This, override); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, override); + + if (!override) return E_POINTER; + *override = This->override; + + return S_OK; } static HRESULT WINAPI vbnamespacemanager_reset(IVBMXNamespaceManager *iface) @@ -572,6 +607,8 @@ HRESULT MXNamespaceManager_create(IUnknown *outer, void **obj) ctxt = alloc_ns_context(); list_add_head(&ns->ctxts, &ctxt->entry); + ns->override = VARIANT_TRUE; + *obj = &ns->IMXNamespaceManager_iface; TRACE("returning iface %p\n", *obj); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3db8e48..2c3de42 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10142,14 +10142,13 @@ static void test_nsnamespacemanager(void) EXPECT_HR(hr, S_OK); IVBMXNamespaceManager_Release(mgr2); -todo_wine { hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, NULL); EXPECT_HR(hr, S_OK); /* prefix already added */ hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri")); EXPECT_HR(hr, S_FALSE); -} + hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), NULL); EXPECT_HR(hr, E_INVALIDARG); @@ -10238,6 +10237,7 @@ static void test_nsnamespacemanager_override(void) { IMXNamespaceManager *nsmgr; WCHAR buffW[250]; + VARIANT_BOOL b; HRESULT hr; INT len; @@ -10260,11 +10260,25 @@ static void test_nsnamespacemanager_override(void) hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 1, buffW, &len); EXPECT_HR(hr, E_FAIL); + hr = IMXNamespaceManager_getAllowOverride(nsmgr, NULL); + EXPECT_HR(hr, E_POINTER); + + b = VARIANT_FALSE; + hr = IMXNamespaceManager_getAllowOverride(nsmgr, &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "got %d\n", b); + hr = IMXNamespaceManager_putAllowOverride(nsmgr, VARIANT_FALSE); - todo_wine EXPECT_HR(hr, S_OK); + EXPECT_HR(hr, S_OK); hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri")); - todo_wine EXPECT_HR(hr, S_OK); + EXPECT_HR(hr, S_OK); + + len = sizeof(buffW)/sizeof(WCHAR); + buffW[0] = 0; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns0 uri")), "got uri %s\n", wine_dbgstr_w(buffW)); hr = IMXNamespaceManager_declarePrefix(nsmgr, _bstr_("ns0"), _bstr_("ns0 uri")); EXPECT_HR(hr, S_OK); @@ -10284,7 +10298,7 @@ static void test_nsnamespacemanager_override(void) len = sizeof(buffW)/sizeof(WCHAR); buffW[0] = 0; hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 2, buffW, &len); - todo_wine EXPECT_HR(hr, S_OK); + EXPECT_HR(hr, S_OK); ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW)); /* new prefix placed at index 1 always */ @@ -10306,6 +10320,24 @@ static void test_nsnamespacemanager_override(void) hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri")); EXPECT_HR(hr, E_FAIL); + hr = IMXNamespaceManager_putAllowOverride(nsmgr, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = IMXNamespaceManager_declarePrefix(nsmgr, NULL, _bstr_("ns0 uri override")); + EXPECT_HR(hr, S_FALSE); + + len = sizeof(buffW)/sizeof(WCHAR); + buffW[0] = 0; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_(""), NULL, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("ns0 uri override")), "got uri %s\n", wine_dbgstr_w(buffW)); + + len = sizeof(buffW)/sizeof(WCHAR); + buffW[0] = 0; + hr = IMXNamespaceManager_getDeclaredPrefix(nsmgr, 3, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(buffW, _bstr_("")), "got prefix %s\n", wine_dbgstr_w(buffW)); + IMXNamespaceManager_Release(nsmgr); free_bstrs();

1 0

Nikolay Sivov : msxml3/mxnamespace: Implemented getURI().
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: a15fe5a75544724701eab0b5a403fa597aaf48b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15fe5a75544724701eab0b5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:48:15 2011 +0400 msxml3/mxnamespace: Implemented getURI(). --- dlls/msxml3/mxnamespace.c | 50 ++++++++++++++++++++++++++++++++++++++++++- dlls/msxml3/tests/domdoc.c | 45 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/mxnamespace.c b/dlls/msxml3/mxnamespace.c index 1a8133f..2719bb5 100644 --- a/dlls/msxml3/mxnamespace.c +++ b/dlls/msxml3/mxnamespace.c @@ -101,6 +101,8 @@ static HRESULT declare_prefix(struct nscontext *ctxt, const WCHAR *prefix, const /* returned stored pointer, caller needs to copy it */ static HRESULT get_declared_prefix_idx(const struct nscontext *ctxt, LONG index, BSTR *prefix) { + *prefix = NULL; + if (index >= ctxt->count || index < 0) return E_FAIL; if (index > 0) index = ctxt->count - index; @@ -109,6 +111,21 @@ static HRESULT get_declared_prefix_idx(const struct nscontext *ctxt, LONG index, return S_OK; } +static HRESULT get_uri_from_prefix(const struct nscontext *ctxt, const WCHAR *prefix, BSTR *uri) +{ + int i; + + for (i = 0; i < ctxt->count; i++) + if (!strcmpW(ctxt->ns[i].prefix, prefix)) + { + *uri = ctxt->ns[i].uri; + return S_OK; + } + + *uri = NULL; + return S_FALSE; +} + static struct nscontext* alloc_ns_context(void) { struct nscontext *ctxt; @@ -257,8 +274,37 @@ 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; + struct nscontext *ctxt; + HRESULT hr; + BSTR urib; + + TRACE("(%p)->(%s %p %p %p)\n", This, debugstr_w(prefix), node, uri, uri_len); + + if (!prefix) return E_INVALIDARG; + if (!uri_len) return E_POINTER; + + if (node) + { + FIXME("namespaces from DOM node not supported\n"); + return E_NOTIMPL; + } + + ctxt = LIST_ENTRY(list_head(&This->ctxts), struct nscontext, entry); + hr = get_uri_from_prefix(ctxt, prefix, &urib); + if (hr == S_OK) + { + if (uri) + { + if (*uri_len < (INT)SysStringLen(urib)) return E_XML_BUFFERTOOSMALL; + strcpyW(uri, urib); + } + } + else + if (uri) *uri = 0; + + *uri_len = SysStringLen(urib); + + return hr; } static const struct IMXNamespaceManagerVtbl MXNamespaceManagerVtbl = diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index ef8c014..3db8e48 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10117,6 +10117,7 @@ static void test_load(void) static void test_nsnamespacemanager(void) { + static const char xmluriA[] = "http://www.w3.org/XML/1998/namespace"; IMXNamespaceManager *nsmgr; IVBMXNamespaceManager *mgr2; IDispatch *disp; @@ -10184,6 +10185,50 @@ todo_wine { ok(len == 3, "got %d\n", len); ok(!lstrcmpW(buffW, _bstr_("xml")), "got prefix %s\n", wine_dbgstr_w(buffW)); + /* getURI */ + hr = IMXNamespaceManager_getURI(nsmgr, NULL, NULL, NULL, NULL); + EXPECT_HR(hr, E_INVALIDARG); + + len = -1; + hr = IMXNamespaceManager_getURI(nsmgr, NULL, NULL, NULL, &len); + EXPECT_HR(hr, E_INVALIDARG); + ok(len == -1, "got %d\n", len); + + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, NULL, NULL); + EXPECT_HR(hr, E_POINTER); + + len = -1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, NULL, &len); + EXPECT_HR(hr, S_OK); + /* length of "xml" uri is constant */ + ok(len == strlen(xmluriA), "got %d\n", len); + + len = 100; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, buffW, &len); + EXPECT_HR(hr, S_OK); + ok(len == strlen(xmluriA), "got %d\n", len); + ok(!lstrcmpW(buffW, _bstr_(xmluriA)), "got prefix %s\n", wine_dbgstr_w(buffW)); + + len = strlen(xmluriA)-1; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml"), NULL, buffW, &len); + EXPECT_HR(hr, E_XML_BUFFERTOOSMALL); + ok(len == strlen(xmluriA)-1, "got %d\n", len); + ok(buffW[0] == 0x1, "got %x\n", buffW[0]); + + /* prefix xml1 not defined */ + len = -1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml1"), NULL, NULL, &len); + EXPECT_HR(hr, S_FALSE); + ok(len == 0, "got %d\n", len); + + len = 100; + buffW[0] = 0x1; + hr = IMXNamespaceManager_getURI(nsmgr, _bstr_("xml1"), NULL, buffW, &len); + EXPECT_HR(hr, S_FALSE); + ok(buffW[0] == 0, "got %x\n", buffW[0]); + ok(len == 0, "got %d\n", len); + IMXNamespaceManager_Release(nsmgr); free_bstrs();

1 0

Nikolay Sivov : msxml3/mxnamespace: Implement declarePrefix() and getDeclaredPrefix().
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 42f65e1358eae2c8478ed5a5d6d5f7a83867f972 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42f65e1358eae2c8478ed5a5d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 21 21:47:09 2011 +0400 msxml3/mxnamespace: Implement declarePrefix() and getDeclaredPrefix(). --- dlls/msxml3/mxnamespace.c | 139 ++++++++++++++++++++++++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 88 ++++++++++++++++++++++++++-- 2 files changed, 215 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42f65e1358eae2c8478ed…

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

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

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

23 Aug '11

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@space@ echo word@space@@space@ + echo word +echo@tab@word +echo@tab@word @tab@ +echo@tab@word@tab@@space@ +@tab@echo word +echo @tab@word +echo @tab@word +echo@tab@@tab@word @echo off echo ------------ Testing 'echo' [OFF] -------------- @@ -35,6 +43,14 @@ echo:word echo :word echo word@space@ echo word@space@@space@ + echo word +echo@tab@word +echo@tab@word @tab@ +echo@tab@word@tab@@space@ +@tab@echo word +echo @tab@word +echo @tab@word +echo@tab@@tab@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@tab@FOO=foo +echo %FOO% +set@tab@FOO= +echo '%FOO%' +set FOO=foo@space@ +echo '%FOO%' +set FOO=foo@tab@ +echo '%FOO%' set FOO= echo ------------ Testing variable expansion -------------- @@ -266,12 +290,18 @@ cd..@space@ cd if not exist foobar (cd ..) cd foobar +cd@tab@..@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@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@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 +@tab@dir /b@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@tab@%%i in (X2) do echo %%i +for %%i in@tab@(X3) do echo %%i +for %%i in (@tab@ foo@tab@) do echo %%i +for@tab@ %%i in@tab@(@tab@M) do echo %%i +for %%i@tab@in (X)@tab@do@tab@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@space@ @pwd@>echo word@space@@space@@space@ word@space@@space@ + +@todo_wine@@pwd@>echo word@space@ +word + +@pwd@>echo@tab@word@space@ +@todo_wine@word + +@pwd@>echo@tab@word@space@@tab@@space@ +@todo_wine@word@space@@tab@ + +@pwd@>echo@tab@word@tab@@space@@space@ +@todo_wine@word@tab@@space@ + +@todo_wine@@pwd@>echo word@space@ +word + +@pwd@>echo@space@@tab@word@space@ +@tab@word + +@pwd@>echo@space@@space@@tab@word@space@ +@space@@tab@word + +@pwd@>echo@tab@@tab@word@space@ +@todo_wine@@tab@word ------------ Testing 'echo' [OFF] -------------- word 'singlequotedword' @@ -63,6 +87,14 @@ word :word word@space@ word@space@@space@ +word +@todo_wine@word +@todo_wine@word@space@@tab@ +@todo_wine@word@tab@@space@ +word +@tab@word +@space@@tab@word +@todo_wine@@tab@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 +@todo_wine@foo +@todo_wine@'' +'foo@space@' +'foo@tab@' ------------ Testing variable expansion -------------- ~dp0 should be directory containing batch file @pwd@\ @@ -189,6 +225,8 @@ Current dir: @pwd@\foobar@or_broken@Current dir:@space@ @pwd@\foobar @pwd@ @todo_wine@@pwd@ +@todo_wine@@pwd@ +@pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@\foobar\bar bak @pwd@ @@ -237,6 +275,11 @@ A B C X +@todo_wine@X2 +@todo_wine@X3 +foo +@todo_wine@M +@todo_wine@X ...imbricated FORs @todo_wine@X Y @todo_wine@X Y

1 0

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

23 Aug '11

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

Frédéric Delanoy : cmd/tests: Add basic cd tests.
by Alexandre Julliard 23 Aug '11

23 Aug '11

Module: wine Branch: master Commit: 6bd0671f074cb643a1072625bae572d4a6bb9331 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bd0671f074cb643a1072625b… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Sat Aug 20 01:59:00 2011 +0200 cmd/tests: Add basic cd tests. --- programs/cmd/tests/test_builtins.cmd | 32 ++++++++++++++++++++++++++++++ programs/cmd/tests/test_builtins.cmd.exp | 13 ++++++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index ffbc814..c640ec4 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -244,6 +244,38 @@ if exist bar6 ( del bar6 ) +echo ------------ Testing cd ------------ +mkdir foobar +cd foobar +echo blabla > singleFile +dir /b +echo Current dir: %CD% +cd +cd .. +cd +cd foobar@space@ +cd +cd .. +cd +cd @space@foobar +cd +cd.. +cd +cd foobar +cd..@space@ +cd +if not exist foobar (cd ..) +cd foobar +mkdir "bar bak" +cd "bar bak" +cd +cd .. +cd bar bak +cd +cd ..\.. +cd +rd /Q/s foobar + echo ------------ Testing type ------------ echo bar> foobaz @echo on diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index 2954e16..1580637 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -179,6 +179,19 @@ foo4 @todo_wine@...on failure conditional || @todo_wine@foo5 @todo_wine@foo6@space@ +------------ Testing cd ------------ +singleFile +Current dir: @pwd@\foobar@or_broken@Current dir:@space@ +@pwd@\foobar +@pwd@ +@pwd@\foobar +@pwd@ +@pwd@\foobar +@pwd@ +@todo_wine@@pwd@ +@pwd@\foobar\bar bak +@pwd@\foobar\bar bak +@pwd@ ------------ Testing type ------------ @pwd@>type foobaz@space@

1 0

← Newer
1
...
38
39
40
41
42
43
44
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2011