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

Juan Lang : wininet: Don' t adjust the use counts in RetrieveUrlCacheEntryFile until the function will succeed .
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 31abbd708286571f85371ecb2a63fa636df7e537 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31abbd708286571f85371ecb2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 7 21:04:20 2011 -0800 wininet: Don't adjust the use counts in RetrieveUrlCacheEntryFile until the function will succeed. --- dlls/wininet/urlcache.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index 0c88372..8ab2ee6 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -1996,11 +1996,6 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); - pUrlEntry->dwHitRate++; - pUrlEntry->dwUseCount++; - GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); - error = URLCache_CopyEntry(pContainer, pHeader, lpCacheEntryInfo, lpdwCacheEntryInfoBufferSize, pUrlEntry, FALSE); @@ -2012,6 +2007,11 @@ BOOL WINAPI RetrieveUrlCacheEntryFileA( } TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + pUrlEntry->dwHitRate++; + pUrlEntry->dwUseCount++; + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); + URLCacheContainer_UnlockIndex(pContainer, pHeader); return TRUE; @@ -2093,11 +2093,6 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( TRACE("Found URL: %s\n", (LPSTR)pUrlEntry + pUrlEntry->dwOffsetUrl); TRACE("Header info: %s\n", (LPBYTE)pUrlEntry + pUrlEntry->dwOffsetHeaderInfo); - pUrlEntry->dwHitRate++; - pUrlEntry->dwUseCount++; - GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); - URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); - error = URLCache_CopyEntry( pContainer, pHeader, @@ -2113,6 +2108,11 @@ BOOL WINAPI RetrieveUrlCacheEntryFileW( } TRACE("Local File Name: %s\n", debugstr_a((LPCSTR)pUrlEntry + pUrlEntry->dwOffsetLocalName)); + pUrlEntry->dwHitRate++; + pUrlEntry->dwUseCount++; + URLCache_HashEntrySetUse(pHashEntry, pUrlEntry->dwUseCount); + GetSystemTimeAsFileTime(&pUrlEntry->LastAccessTime); + URLCacheContainer_UnlockIndex(pContainer, pHeader); return TRUE;

1 0

Dmitry Timoshkov : gdi32: Remove a redundant check for Roman font presence.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: d9d52672374ff11d4866e07955ba1e2a32ae4cd1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9d52672374ff11d4866e0795… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Mar 14 13:05:09 2011 +0800 gdi32: Remove a redundant check for Roman font presence. Wine ships Tahoma and many other built-in fonts these days. --- dlls/gdi32/freetype.c | 11 ----------- 1 files changed, 0 insertions(+), 11 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 512e08b..4582216 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -471,8 +471,6 @@ struct font_mapping static struct list mappings_list = LIST_INIT( mappings_list ); -static BOOL have_installed_roman_font = FALSE; /* CreateFontInstance will fail if this is still FALSE */ - static CRITICAL_SECTION freetype_cs; static CRITICAL_SECTION_DEBUG critsect_debug = { @@ -1523,9 +1521,6 @@ static INT AddFontToList(const char *file, void *font_data_ptr, DWORD font_data_ } } - if (!(face->fs.fsCsb[0] & FS_SYMBOL)) - have_installed_roman_font = TRUE; - AddFaceToFamily(face, family); } while(!FT_IS_SCALABLE(ft_face) && ++bitmap_num < ft_face->num_fixed_sizes); @@ -3530,12 +3525,6 @@ GdiFont *WineEngCreateFontInstance(DC *dc, HFONT hfont) LeaveCriticalSection( &freetype_cs ); return NULL; } - if(!have_installed_roman_font) - { - TRACE("No roman font installed\n"); - LeaveCriticalSection( &freetype_cs ); - return NULL; - } ret = alloc_font();

1 0

Jörg Höhle : winmm: MCI does not support the 0xhexadecimal notation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: d1a034627c3fac9db5e51ffadd1a9005a5c0e1e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a034627c3fac9db5e51ffad… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Feb 23 10:07:42 2011 +0100 winmm: MCI does not support the 0xhexadecimal notation. --- dlls/winmm/mci.c | 2 +- dlls/winmm/tests/mci.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 0fcccec..822b1c0 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -978,7 +978,7 @@ static BOOL MCI_GetDWord(DWORD* data, LPWSTR* ptr) DWORD val; LPWSTR ret; - val = strtoulW(*ptr, &ret, 0); + val = strtoulW(*ptr, &ret, 10); switch (*ret) { case '\0': break; diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index cb6df72..91a3e47 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -249,6 +249,9 @@ static void test_mciParser(HWND hwnd) err = mciSendString("status x 2 track 3", buf, sizeof(buf), NULL); todo_wine ok(err==MCIERR_OUTOFRANGE,"status 2(position) track 3: %s\n", dbg_mcierr(err)); + err = mciSendString("status x 0x4", buf, sizeof(buf), NULL); + todo_wine ok(err==MCIERR_BAD_CONSTANT, "status 0x4: %s\n", dbg_mcierr(err)); + err = mciSendString("status x 4", buf, sizeof(buf), hwnd); ok(!err,"status 4(mode): %s\n", dbg_mcierr(err)); if(!err)ok(!strcmp(buf,"stopped"), "status 4(mode), got: %s\n", buf); @@ -874,6 +877,9 @@ static void test_playWAVE(HWND hwnd) ok(!err,"mci seek to 250 wait notify returned %s\n", dbg_mcierr(err)); test_notification(hwnd,"seek wait notify",MCI_NOTIFY_SUCCESSFUL); + err = mciSendString("seek mysound to 0xfa", NULL, 0, NULL); + ok(err==MCIERR_BAD_INTEGER,"mci seek to 0xfa returned %s\n", dbg_mcierr(err)); + err = mciSendString("status mysound position notify", buf, sizeof(buf), hwnd); ok(!err,"mci status position notify returned %s\n", dbg_mcierr(err)); if(!err) ok(!strcmp(buf,"250"), "mci status position: %s\n", buf);

1 0

Michael Stefaniuc : mscoree: COM cleanup in metahost.c.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c3afbcfd60014f139d88801fbcbabc26b04647d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3afbcfd60014f139d88801fb… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Mar 14 10:23:01 2011 +0100 mscoree: COM cleanup in metahost.c. --- dlls/mscoree/metahost.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index ca4795e..fb03fb1 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -752,15 +752,19 @@ end: struct InstalledRuntimeEnum { - const struct IEnumUnknownVtbl *Vtbl; + IEnumUnknown IEnumUnknown_iface; LONG ref; ULONG pos; }; const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl; -static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, - REFIID riid, +static inline struct InstalledRuntimeEnum *impl_from_IEnumUnknown(IEnumUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct InstalledRuntimeEnum, IEnumUnknown_iface); +} + +static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, REFIID riid, void **ppvObject) { TRACE("%p %s %p\n", iface, debugstr_guid(riid), ppvObject); @@ -783,7 +787,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_QueryInterface(IEnumUnknown* iface, static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -793,7 +797,7 @@ static ULONG WINAPI InstalledRuntimeEnum_AddRef(IEnumUnknown* iface) static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) refcount=%u\n", iface, ref); @@ -809,7 +813,7 @@ static ULONG WINAPI InstalledRuntimeEnum_Release(IEnumUnknown* iface) static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, IUnknown **rgelt, ULONG *pceltFetched) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); int num_fetched = 0; HRESULT hr=S_OK; IUnknown *item; @@ -841,7 +845,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Next(IEnumUnknown *iface, ULONG celt, static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); int num_fetched = 0; HRESULT hr=S_OK; @@ -866,7 +870,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Skip(IEnumUnknown *iface, ULONG celt) static HRESULT WINAPI InstalledRuntimeEnum_Reset(IEnumUnknown *iface) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); TRACE("(%p)\n", iface); @@ -877,7 +881,7 @@ static HRESULT WINAPI InstalledRuntimeEnum_Reset(IEnumUnknown *iface) static HRESULT WINAPI InstalledRuntimeEnum_Clone(IEnumUnknown *iface, IEnumUnknown **ppenum) { - struct InstalledRuntimeEnum *This = (struct InstalledRuntimeEnum*)iface; + struct InstalledRuntimeEnum *This = impl_from_IEnumUnknown(iface); struct InstalledRuntimeEnum *new_enum; TRACE("(%p)\n", iface); @@ -886,11 +890,11 @@ static HRESULT WINAPI InstalledRuntimeEnum_Clone(IEnumUnknown *iface, IEnumUnkno if (!new_enum) return E_OUTOFMEMORY; - new_enum->Vtbl = &InstalledRuntimeEnum_Vtbl; + new_enum->IEnumUnknown_iface.lpVtbl = &InstalledRuntimeEnum_Vtbl; new_enum->ref = 1; new_enum->pos = This->pos; - *ppenum = (IEnumUnknown*)new_enum; + *ppenum = &new_enum->IEnumUnknown_iface; return S_OK; } @@ -907,10 +911,10 @@ const struct IEnumUnknownVtbl InstalledRuntimeEnum_Vtbl = { struct CLRMetaHost { - const struct ICLRMetaHostVtbl *CLRMetaHost_vtbl; + ICLRMetaHost ICLRMetaHost_iface; }; -static const struct CLRMetaHost GlobalCLRMetaHost; +static struct CLRMetaHost GlobalCLRMetaHost; static HRESULT WINAPI CLRMetaHost_QueryInterface(ICLRMetaHost* iface, REFIID riid, @@ -1069,11 +1073,11 @@ static HRESULT WINAPI CLRMetaHost_EnumerateInstalledRuntimes(ICLRMetaHost* iface if (!new_enum) return E_OUTOFMEMORY; - new_enum->Vtbl = &InstalledRuntimeEnum_Vtbl; + new_enum->IEnumUnknown_iface.lpVtbl = &InstalledRuntimeEnum_Vtbl; new_enum->ref = 1; new_enum->pos = 0; - *ppEnumerator = (IEnumUnknown*)new_enum; + *ppEnumerator = &new_enum->IEnumUnknown_iface; return S_OK; } @@ -1123,13 +1127,13 @@ static const struct ICLRMetaHostVtbl CLRMetaHost_vtbl = CLRMetaHost_ExitProcess }; -static const struct CLRMetaHost GlobalCLRMetaHost = { - &CLRMetaHost_vtbl +static struct CLRMetaHost GlobalCLRMetaHost = { + { &CLRMetaHost_vtbl } }; extern HRESULT CLRMetaHost_CreateInstance(REFIID riid, void **ppobj) { - return ICLRMetaHost_QueryInterface((ICLRMetaHost*)&GlobalCLRMetaHost, riid, ppobj); + return ICLRMetaHost_QueryInterface(&GlobalCLRMetaHost.ICLRMetaHost_iface, riid, ppobj); } static MonoAssembly* mono_assembly_search_hook_fn(MonoAssemblyName *aname, char **assemblies_path, void *user_data)

1 0

Paul Vriens : cabinet: Check correctly for the magic value (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 80a0eb3b963fbb43a59fb4a8e3d4f5c598b9e7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=80a0eb3b963fbb43a59fb4a8e… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 12 19:09:50 2011 +0100 cabinet: Check correctly for the magic value (Coverity). --- dlls/cabinet/fci.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fci.c b/dlls/cabinet/fci.c index 9ec1bdd..82d94ab 100644 --- a/dlls/cabinet/fci.c +++ b/dlls/cabinet/fci.c @@ -205,7 +205,7 @@ static FCI_Int *get_fci_ptr( HFCI hfci ) { FCI_Int *fci= (FCI_Int *)hfci; - if (!fci || !fci->magic == FCI_INT_MAGIC) + if (!fci || fci->magic != FCI_INT_MAGIC) { SetLastError( ERROR_INVALID_HANDLE ); return NULL;

1 0

Paul Vriens : cabinet: Check correctly for the magic value (Coverity).
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 81f2a237f35bed6bc6009ca9cd6bdec1acc1f608 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f2a237f35bed6bc6009ca9c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Mar 12 19:09:55 2011 +0100 cabinet: Check correctly for the magic value (Coverity). --- dlls/cabinet/fdi.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/cabinet/fdi.c b/dlls/cabinet/fdi.c index 27a969b..5fc22cd 100644 --- a/dlls/cabinet/fdi.c +++ b/dlls/cabinet/fdi.c @@ -196,7 +196,7 @@ static FDI_Int *get_fdi_ptr( HFDI hfdi ) { FDI_Int *fdi= (FDI_Int *)hfdi; - if (!fdi || !fdi->magic == FDI_INT_MAGIC) + if (!fdi || fdi->magic != FDI_INT_MAGIC) { SetLastError( ERROR_INVALID_HANDLE ); return NULL;

1 0

Nikolay Sivov : msxml3: Unlink node first before adding it as a child.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c48b7566bd1296dba3b17e1d30c5e8b29275cd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c48b7566bd1296dba3b17e1d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 01:57:36 2011 +0300 msxml3: Unlink node first before adding it as a child. --- dlls/msxml3/node.c | 2 + dlls/msxml3/tests/domdoc.c | 156 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 146 insertions(+), 12 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index a492759..db3153d 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -354,6 +354,8 @@ HRESULT node_insert_before(xmlnode *This, IXMLDOMNode *new_child, const VARIANT } doc = node_obj->node->doc; xmldoc_add_ref(This->node->doc); + /* xmlAddChild doesn't unlink node from previous parent */ + xmlUnlinkNode(node_obj->node); xmlAddChild(This->node, node_obj->node); xmldoc_release(doc); node_obj->parent = This->iface; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 370c56e..f49b5c9 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4,6 +4,7 @@ * Copyright 2005 Mike McCormack for CodeWeavers * Copyright 2007-2008 Alistair Leslie-Hughes * Copyright 2010 Adam Martinson for CodeWeavers + * Copyright 2010-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 @@ -180,6 +181,21 @@ static void _expect_ref(IUnknown* obj, ULONG ref, int line) ok_(__FILE__,line)(rc-1 == ref, "expected refcount %d, got %d\n", ref, rc-1); } +#define EXPECT_LIST_LEN(list,len) _expect_list_len(list, len, __LINE__) +static void _expect_list_len(IXMLDOMNodeList *list, LONG len, int line) +{ + LONG length; + HRESULT hr; + + length = 0; + hr = IXMLDOMNodeList_get_length(list, &length); + ok_(__FILE__,line)(hr == S_OK, "got 0x%08x\n", hr); + ok_(__FILE__,line)(length == len, "got %d, expected %d\n", length, len); +} + +#define EXPECT_HR(hr,hr_exp) \ + ok(hr == hr_exp, "got 0x%08x, expected 0x%08x\n", hr, hr_exp) + static const WCHAR szEmpty[] = { 0 }; static const WCHAR szIncomplete[] = { '<','?','x','m','l',' ', @@ -3985,32 +4001,46 @@ static void test_XPath(void) VARIANT var; VARIANT_BOOL b; IXMLDOMDocument2 *doc; + IXMLDOMDocument *doc2; IXMLDOMNode *rootNode; IXMLDOMNode *elem1Node; IXMLDOMNode *node; IXMLDOMNodeList *list; + IXMLDOMElement *elem; + IXMLDOMAttribute *attr; + HRESULT hr; + BSTR str; doc = create_document(&IID_IXMLDOMDocument2); if (!doc) return; - ole_check(IXMLDOMDocument_loadXML(doc, _bstr_(szExampleXML), &b)); + ole_check(IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b)); ok(b == VARIANT_TRUE, "failed to load XML string\n"); /* switch to XPath */ ole_check(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionLanguage"), _variantbstr_("XPath"))); /* some simple queries*/ - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root"), &list)); - ole_check(IXMLDOMNodeList_get_item(list, 0, &rootNode)); - ole_check(IXMLDOMNodeList_reset(list)); + EXPECT_REF(doc, 1); + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_REF(doc, 1); + EXPECT_LIST_LEN(list, 1); + + EXPECT_REF(list, 1); + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(list, 1); + EXPECT_REF(rootNode, 1); + + hr = IXMLDOMNodeList_reset(list); + EXPECT_HR(hr, S_OK); expect_list_and_release(list, "E2.D1"); - if (rootNode == NULL) - return; - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//c"), &list)); + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//c"), &list)); expect_list_and_release(list, "E3.E1.E2.D1 E3.E2.E2.D1"); - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("//c[@type]"), &list)); + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("//c[@type]"), &list)); expect_list_and_release(list, "E3.E2.E2.D1"); ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_("elem"), &list)); @@ -4054,7 +4084,7 @@ static void test_XPath(void) expect_list_and_release(list, ""); /* foo undeclared in document node */ - ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); + ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); /* undeclared in <root> node */ ole_expect(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//foo:c"), &list), E_FAIL); /* undeclared in <elem> node */ @@ -4068,7 +4098,7 @@ static void test_XPath(void) _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29'"))); /* now the namespace can be used */ - ole_check(IXMLDOMDocument_selectNodes(doc, _bstr_("root//test:c"), &list)); + ole_check(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); ole_check(IXMLDOMNode_selectNodes(rootNode, _bstr_(".//test:c"), &list)); expect_list_and_release(list, "E3.E3.E2.D1 E3.E4.E2.D1"); @@ -4081,7 +4111,7 @@ static void test_XPath(void) ole_expect(IXMLDOMDocument2_setProperty(doc, _bstr_("SelectionNamespaces"), _variantbstr_("xmlns:test='urn:uuid:86B2F87F-ACB6-45cd-8B77-9BDB92A01A29' xmlns:foo=###")), E_FAIL); - ole_expect(IXMLDOMDocument_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); + ole_expect(IXMLDOMDocument2_selectNodes(doc, _bstr_("root//foo:c"), &list), E_FAIL); VariantInit(&var); ole_check(IXMLDOMDocument2_getProperty(doc, _bstr_("SelectionNamespaces"), &var)); @@ -4096,7 +4126,109 @@ static void test_XPath(void) IXMLDOMNode_Release(rootNode); IXMLDOMNode_Release(elem1Node); - IXMLDOMDocument_Release(doc); + + /* alter document with already built list */ + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMDocument2_get_lastChild(doc, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + EXPECT_REF(doc, 1); + + hr = IXMLDOMDocument2_removeChild(doc, rootNode, NULL); + EXPECT_HR(hr, S_OK); + IXMLDOMNode_Release(rootNode); + + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + + IXMLDOMNodeList_Release(list); + + hr = IXMLDOMNode_get_nodeName(rootNode, &str); + EXPECT_HR(hr, S_OK); + ok(!lstrcmpW(str, _bstr_("root")), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(rootNode); + + /* alter node from list and get it another time */ + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_QueryInterface(rootNode, &IID_IXMLDOMElement, (void**)&elem); + EXPECT_HR(hr, S_OK); + + V_VT(&var) = VT_I2; + V_I2(&var) = 1; + hr = IXMLDOMElement_setAttribute(elem, _bstr_("attrtest"), var); + EXPECT_HR(hr, S_OK); + IXMLDOMElement_Release(elem); + IXMLDOMNode_Release(rootNode); + + /* now check attribute to be present */ + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMNode_QueryInterface(rootNode, &IID_IXMLDOMElement, (void**)&elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attrtest"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + IXMLDOMElement_Release(elem); + IXMLDOMNode_Release(rootNode); + + /* and now check for attribute in original document */ + hr = IXMLDOMDocument_get_documentElement(doc, &elem); + EXPECT_HR(hr, S_OK); + + hr = IXMLDOMElement_getAttributeNode(elem, _bstr_("attrtest"), &attr); + EXPECT_HR(hr, S_OK); + IXMLDOMAttribute_Release(attr); + + IXMLDOMElement_Release(elem); + + /* attach node from list to another document */ + doc2 = create_document(&IID_IXMLDOMDocument); + + hr = IXMLDOMDocument2_loadXML(doc, _bstr_(szExampleXML), &b); + EXPECT_HR(hr, S_OK); + ok(b == VARIANT_TRUE, "failed to load XML string\n"); + + hr = IXMLDOMDocument2_selectNodes(doc, _bstr_("root"), &list); + EXPECT_HR(hr, S_OK); + EXPECT_LIST_LEN(list, 1); + + hr = IXMLDOMNodeList_get_item(list, 0, &rootNode); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + + hr = IXMLDOMDocument_appendChild(doc2, rootNode, NULL); + EXPECT_HR(hr, S_OK); + EXPECT_REF(rootNode, 1); + EXPECT_REF(doc2, 1); + EXPECT_REF(list, 1); + + EXPECT_LIST_LEN(list, 1); + + IXMLDOMNode_Release(rootNode); + IXMLDOMNodeList_Release(list); + IXMLDOMDocument_Release(doc2); + + IXMLDOMDocument2_Release(doc); free_bstrs(); }

1 0

Nikolay Sivov : msxml3: Add IXMLDOMSelection stub.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: c26c55995a2446601fee56931cc831e38205a78c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c26c55995a2446601fee56931… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 02:54:47 2011 +0300 msxml3: Add IXMLDOMSelection stub. --- dlls/msxml3/Makefile.in | 2 +- dlls/msxml3/domdoc.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/msxml_private.h | 25 +-- dlls/msxml3/node.c | 2 +- dlls/msxml3/{queryresult.c => selection.c} | 300 +++++++++++++++++++--------- dlls/msxml3/tests/domdoc.c | 36 ++++ 7 files changed, 258 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c26c55995a2446601fee5…

1 0

Nikolay Sivov : msxml3: No need to zero memory on allocation.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 072b2db2afa2b5c87bac496d325072c6a5c68cab URL: http://source.winehq.org/git/wine.git/?a=commit;h=072b2db2afa2b5c87bac496d3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 03:00:54 2011 +0300 msxml3: No need to zero memory on allocation. --- dlls/msxml3/selection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 2a46e1d..97165fa 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -605,7 +605,7 @@ static void query_serror(void* ctx, xmlErrorPtr err) HRESULT create_selection(xmlNodePtr node, xmlChar* query, IXMLDOMNodeList **out) { - domselection *This = heap_alloc_zero(sizeof(domselection)); + domselection *This = heap_alloc(sizeof(domselection)); xmlXPathContextPtr ctxt = xmlXPathNewContext(node->doc); HRESULT hr;

1 0

Nikolay Sivov : msxml3: Protect SAX character callback from null node.
by Alexandre Julliard 14 Mar '11

14 Mar '11

Module: wine Branch: master Commit: 610725289b18f07c3ec62438773ff52a01426565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=610725289b18f07c3ec624387… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 13:46:45 2011 +0300 msxml3: Protect SAX character callback from null node. --- dlls/msxml3/domdoc.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 81ffb49..1277ce1 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -421,19 +421,22 @@ static inline BOOL strn_isspace(xmlChar const* str, int len) static void sax_characters(void *ctx, const xmlChar *ch, int len) { - xmlParserCtxtPtr pctx; - domdoc const* This; + xmlParserCtxtPtr ctxt; + const domdoc *This; - pctx = (xmlParserCtxtPtr) ctx; - This = (domdoc const*) pctx->_private; + ctxt = (xmlParserCtxtPtr) ctx; + This = (const domdoc*) ctxt->_private; - /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ - if (!This->properties->preserving && - !is_preserving_whitespace(pctx->node) && - strn_isspace(ch, len)) - return; + if (ctxt->node) + { + /* during domdoc_loadXML() the xmlDocPtr->_private data is not available */ + if (!This->properties->preserving && + !is_preserving_whitespace(ctxt->node) && + strn_isspace(ch, len)) + return; + } - xmlSAX2Characters(ctx, ch, len); + xmlSAX2Characters(ctxt, ch, len); } static void LIBXML2_LOG_CALLBACK sax_error(void* ctx, char const* msg, ...)

1 0