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

Anders Jonsson : inetcpl.cpl: Update Swedish translation.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 51057e6033b443fb0a2edd2df8e0fb79ff900d5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=51057e6033b443fb0a2edd2df… Author: Anders Jonsson <anders.jonsson(a)norsjonet.se> Date: Sat Mar 12 14:46:25 2011 +0100 inetcpl.cpl: Update Swedish translation. --- dlls/inetcpl.cpl/cpl_Sv.rc | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/inetcpl.cpl/cpl_Sv.rc b/dlls/inetcpl.cpl/cpl_Sv.rc index cc75ce6..997fd31 100644 --- a/dlls/inetcpl.cpl/cpl_Sv.rc +++ b/dlls/inetcpl.cpl/cpl_Sv.rc @@ -37,13 +37,13 @@ BEGIN IDC_STATIC, 58, 10, 252, 10 EDITTEXT IDC_HOME_EDIT, 58, 22, 252, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Aktuell sida", IDC_HOME_CURRENT, 58, 36, 80, 14 - PUSHBUTTON "&Förvald sida", IDC_HOME_DEFAULT, 144, 36, 80, 14 + PUSHBUTTON "För&vald sida", IDC_HOME_DEFAULT, 144, 36, 80, 14 PUSHBUTTON "&Blank sida", IDC_HOME_BLANK, 230, 36, 80, 14 - GROUPBOX " Browsing history ", IDC_STATIC, 4, 60, 312, 46 - LTEXT "You can delete cached pages, cookies and other data.", + GROUPBOX " Bläddringshistorik ", IDC_STATIC, 4, 60, 312, 46 + LTEXT "Du kan ta bort cachade sidor, kakor och annan data.", IDC_STATIC, 58, 72, 252, 10 - PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 86, 80, 14 - PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 + PUSHBUTTON "Ta bort &filer...", IDC_HISTORY_DELETE, 144, 86, 80, 14 + PUSHBUTTON "&Inställningar...", IDC_HISTORY_SETTINGS, 230, 86, 80, 14 END

1 0

Dmitry Timoshkov : gdi32: Remove a redundant check for Roman font presence.
by Alexandre Julliard March 14, 2011

March 14, 2011

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

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

March 14, 2011

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

Jörg Höhle : winmm: MCI does not support the 0xhexadecimal notation.
by Alexandre Julliard March 14, 2011

March 14, 2011

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

Nikolay Sivov : msxml3: Silence compile time warnings for dynamically loaded libxslt.
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 49d69e440fcaa8715a2ef56cd480de2e610c8215 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d69e440fcaa8715a2ef56cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 14:10:24 2011 +0300 msxml3: Silence compile time warnings for dynamically loaded libxslt. --- dlls/msxml3/main.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/main.c b/dlls/msxml3/main.c index 741858b..6cbdd99 100644 --- a/dlls/msxml3/main.c +++ b/dlls/msxml3/main.c @@ -193,7 +193,9 @@ static void init_libxslt(void) if (!libxslt_handle) return; -#define LOAD_FUNCPTR(f, needed) if ((p##f = wine_dlsym(libxslt_handle, #f, NULL, 0)) == NULL && needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } +#define LOAD_FUNCPTR(f, needed) \ + if ((p##f = wine_dlsym(libxslt_handle, #f, NULL, 0)) == NULL) \ + if (needed) { WARN("Can't find symbol %s\n", #f); goto sym_not_found; } LOAD_FUNCPTR(xsltInit, 0); LOAD_FUNCPTR(xsltApplyStylesheet, 1); LOAD_FUNCPTR(xsltCleanupGlobals, 1);

1 0

Paul Vriens : cabinet: Check correctly for the magic value (Coverity).
by Alexandre Julliard March 14, 2011

March 14, 2011

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 March 14, 2011

March 14, 2011

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: No need to zero memory on allocation.
by Alexandre Julliard March 14, 2011

March 14, 2011

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: Downgrade FIXME to TRACE for unsupported interfaces .
by Alexandre Julliard March 14, 2011

March 14, 2011

Module: wine Branch: master Commit: 9176c9e886f1f28163e433495f61b61a4a74a9ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=9176c9e886f1f28163e433495… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Mar 13 16:40:26 2011 +0300 msxml3: Downgrade FIXME to TRACE for unsupported interfaces. --- dlls/msxml3/attribute.c | 2 +- dlls/msxml3/cdata.c | 2 +- dlls/msxml3/comment.c | 2 +- dlls/msxml3/docfrag.c | 2 +- dlls/msxml3/doctype.c | 2 +- dlls/msxml3/domdoc.c | 7 +------ dlls/msxml3/domimpl.c | 2 +- dlls/msxml3/element.c | 2 +- dlls/msxml3/entityref.c | 2 +- dlls/msxml3/nodelist.c | 2 +- dlls/msxml3/nodemap.c | 2 +- dlls/msxml3/pi.c | 2 +- dlls/msxml3/selection.c | 2 +- dlls/msxml3/text.c | 2 +- 14 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/attribute.c b/dlls/msxml3/attribute.c index f61428a..603477c 100644 --- a/dlls/msxml3/attribute.c +++ b/dlls/msxml3/attribute.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domattr_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/cdata.c b/dlls/msxml3/cdata.c index e9de472..2622e1b 100644 --- a/dlls/msxml3/cdata.c +++ b/dlls/msxml3/cdata.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domcdata_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/comment.c b/dlls/msxml3/comment.c index a75d178..cb5cada 100644 --- a/dlls/msxml3/comment.c +++ b/dlls/msxml3/comment.c @@ -76,7 +76,7 @@ static HRESULT WINAPI domcomment_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/docfrag.c b/dlls/msxml3/docfrag.c index bc2b77f..0342bae 100644 --- a/dlls/msxml3/docfrag.c +++ b/dlls/msxml3/docfrag.c @@ -75,7 +75,7 @@ static HRESULT WINAPI domfrag_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/doctype.c b/dlls/msxml3/doctype.c index 6c757b3..6a1952f 100644 --- a/dlls/msxml3/doctype.c +++ b/dlls/msxml3/doctype.c @@ -77,7 +77,7 @@ static HRESULT WINAPI domdoctype_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 1277ce1..7d1b352 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -916,14 +916,9 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument3 *iface, REFIID rii { *ppvObject = &This->lpVtblConnectionPointContainer; } - else if(IsEqualGUID(&IID_IRunnableObject, riid)) - { - TRACE("IID_IRunnableObject not supported returning NULL\n"); - return E_NOINTERFACE; - } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); return E_NOINTERFACE; } diff --git a/dlls/msxml3/domimpl.c b/dlls/msxml3/domimpl.c index 9743cc6..2ecf073 100644 --- a/dlls/msxml3/domimpl.c +++ b/dlls/msxml3/domimpl.c @@ -69,7 +69,7 @@ static HRESULT WINAPI dimimpl_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/element.c b/dlls/msxml3/element.c index 55f463a..18a2577 100644 --- a/dlls/msxml3/element.c +++ b/dlls/msxml3/element.c @@ -85,7 +85,7 @@ static HRESULT WINAPI domelem_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/entityref.c b/dlls/msxml3/entityref.c index 7ce85ed..b317606 100644 --- a/dlls/msxml3/entityref.c +++ b/dlls/msxml3/entityref.c @@ -75,7 +75,7 @@ static HRESULT WINAPI entityref_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 67bcd2a..6a25463 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -79,7 +79,7 @@ static HRESULT WINAPI xmlnodelist_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/nodemap.c b/dlls/msxml3/nodemap.c index a504934..1970840 100644 --- a/dlls/msxml3/nodemap.c +++ b/dlls/msxml3/nodemap.c @@ -82,7 +82,7 @@ static HRESULT WINAPI xmlnodemap_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/pi.c b/dlls/msxml3/pi.c index 1766781..89b2b5a 100644 --- a/dlls/msxml3/pi.c +++ b/dlls/msxml3/pi.c @@ -75,7 +75,7 @@ static HRESULT WINAPI dom_pi_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/selection.c b/dlls/msxml3/selection.c index 97165fa..abd9347 100644 --- a/dlls/msxml3/selection.c +++ b/dlls/msxml3/selection.c @@ -97,7 +97,7 @@ static HRESULT WINAPI domselection_QueryInterface( } else { - FIXME("interface %s not implemented\n", debugstr_guid(riid)); + TRACE("interface %s not implemented\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; } diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3e3d3b2..0f40cf5 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -77,7 +77,7 @@ static HRESULT WINAPI domtext_QueryInterface( } else { - FIXME("Unsupported interface %s\n", debugstr_guid(riid)); + TRACE("Unsupported interface %s\n", debugstr_guid(riid)); *ppvObject = NULL; return E_NOINTERFACE; }

1 0

Paul Vriens : cabinet: Check correctly for the magic value (Coverity).
by Alexandre Julliard March 14, 2011

March 14, 2011

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