October 2008 - Wine-Commits

Michael Karcher : msxml3: Fail a bit earlier on removeChild(..., NULL, ...).
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 30351482e84d4bdd54439027f96613c50c61f616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=30351482e84d4bdd54439027f… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Oct 5 12:12:56 2008 +0200 msxml3: Fail a bit earlier on removeChild(...,NULL,...). --- dlls/msxml3/node.c | 4 ++-- dlls/msxml3/tests/domdoc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index b4403cb..d9a2a0c 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -625,11 +625,11 @@ static HRESULT WINAPI xmlnode_removeChild( TRACE("%p->(%p, %p)\n", This, childNode, oldChild); + if(!childNode) return E_INVALIDARG; + if(oldChild) *oldChild = NULL; - if(!childNode) return E_INVALIDARG; - hr = IXMLDOMNode_QueryInterface(childNode, &IID_IXMLDOMNode, (LPVOID)&child); if(FAILED(hr)) return hr; diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index b5b543e..c673d98 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1792,7 +1792,7 @@ static void test_removeChild(void) removed_node = (void*)0xdeadbeef; r = IXMLDOMElement_removeChild( element, NULL, &removed_node ); ok( r == E_INVALIDARG, "ret %08x\n", r ); - todo_wine ok( removed_node == (void*)0xdeadbeef, "%p\n", removed_node ); + ok( removed_node == (void*)0xdeadbeef, "%p\n", removed_node ); /* ba_node is a descendant of element, but not a direct child. */ removed_node = (void*)0xdeadbeef;

1 0

Dmitry Timoshkov : gdi32: Make test_font_metrics require the font being selected into the DC.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 0467d4e4c65c4c18a090a8cde9b8551068f00a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0467d4e4c65c4c18a090a8cde… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 6 22:26:48 2008 +0900 gdi32: Make test_font_metrics require the font being selected into the DC. --- dlls/gdi32/tests/font.c | 36 +++++++++++++++++++++--------------- 1 files changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index b92aa74..c5c9ab5 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -189,7 +189,6 @@ static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, const SIZE *size_orig, INT width_of_A_orig, INT scale_x, INT scale_y) { - HFONT old_hfont; LOGFONTA lf; OUTLINETEXTMETRIC otm; TEXTMETRICA tm; @@ -200,9 +199,9 @@ static void test_font_metrics(HDC hdc, HFONT hfont, LONG lfHeight, if (!hfont) return; - GetObjectA(hfont, sizeof(lf), &lf); + ok(GetCurrentObject(hdc, OBJ_FONT) == hfont, "hfont should be selected\n"); - old_hfont = SelectObject(hdc, hfont); + GetObjectA(hfont, sizeof(lf), &lf); if (GetOutlineTextMetricsA(hdc, 0, NULL)) { @@ -273,8 +272,6 @@ if (0) /* these metrics are scaled too, but with rounding errors */ GetCharWidthA(hdc, 'A', 'A', &width_of_A); ok(near_match(width_of_A, width_of_A_orig * scale_x), "width A %d != %d\n", width_of_A, width_of_A_orig * scale_x); - - SelectObject(hdc, old_hfont); } /* Test how GDI scales bitmap font metrics */ @@ -315,7 +312,9 @@ static void test_bitmap_font(void) bitmap_lf.lfHeight = 0; bitmap_lf.lfWidth = 4; hfont = create_font("bitmap", &bitmap_lf); + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, 0, 4, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, 1); + SelectObject(hdc, old_hfont); DeleteObject(hfont); bitmap_lf.lfHeight = height_orig; @@ -332,22 +331,28 @@ static void test_bitmap_font(void) nearest_height = scale * height_orig; /* XP allows not more than 10% deviation */ if (scale > 1 && nearest_height - i > nearest_height / 10) scale--; + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 1, scale); - DeleteObject(hfont); + SelectObject(hdc, old_hfont); + DeleteObject(hfont); } /* test integer scaling 3x2 */ bitmap_lf.lfHeight = height_orig * 2; bitmap_lf.lfWidth *= 3; hfont = create_font("3x2", &bitmap_lf); + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 2); + SelectObject(hdc, old_hfont); DeleteObject(hfont); /* test integer scaling 3x3 */ bitmap_lf.lfHeight = height_orig * 3; bitmap_lf.lfWidth = 0; hfont = create_font("3x3", &bitmap_lf); + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, bitmap_lf.lfHeight, 0, test_str, sizeof(test_str), &tm_orig, &size_orig, width_orig, 3, 3); + SelectObject(hdc, old_hfont); DeleteObject(hfont); ReleaseDC(0, hdc); @@ -387,9 +392,9 @@ static void test_outline_font(void) ok(GetOutlineTextMetricsA(hdc, sizeof(otm), &otm), "GetTextMetricsA failed\n"); ok(GetTextExtentPoint32A(hdc, test_str, sizeof(test_str), &size_orig), "GetTextExtentPoint32A failed\n"); ok(GetCharWidthA(hdc, 'A', 'A', &width_orig), "GetCharWidthA failed\n"); - SelectObject(hdc, old_hfont); test_font_metrics(hdc, hfont, lf.lfHeight, otm.otmTextMetrics.tmAveCharWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + SelectObject(hdc, old_hfont); DeleteObject(hfont); /* font of otmEMSquare height helps to avoid a lot of rounding errors */ @@ -411,30 +416,36 @@ static void test_outline_font(void) lf.lfHeight = height_orig * 2; lf.lfWidth = lfWidth * 3; hfont = create_font("3x2", &lf); + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 3, 2); + SelectObject(hdc, old_hfont); DeleteObject(hfont); /* test integer scaling 3x3 */ lf.lfHeight = height_orig * 3; lf.lfWidth = lfWidth * 3; hfont = create_font("3x3", &lf); + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 3, 3); + SelectObject(hdc, old_hfont); DeleteObject(hfont); /* test integer scaling 1x1 */ lf.lfHeight = height_orig * 1; lf.lfWidth = lfWidth * 1; hfont = create_font("1x1", &lf); + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + SelectObject(hdc, old_hfont); DeleteObject(hfont); /* test integer scaling 1x1 */ lf.lfHeight = height_orig; lf.lfWidth = 0; hfont = create_font("1x1", &lf); + old_hfont = SelectObject(hdc, hfont); test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); - old_hfont = SelectObject(hdc, hfont); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); @@ -451,7 +462,6 @@ static void test_outline_font(void) trace("gm.gmCellIncX %d, width_orig %d\n", gm.gmCellIncX, width_orig); ok(gm.gmCellIncX == width_orig/2, "incX %d != %d\n", gm.gmCellIncX, width_orig/2); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); - SelectObject(hdc, old_hfont); SetMapMode(hdc, MM_ANISOTROPIC); /* test restrictions of compatibility mode GM_COMPATIBLE */ @@ -474,6 +484,7 @@ static void test_outline_font(void) if (!SetGraphicsMode(hdc, GM_ADVANCED)) { + SelectObject(hdc, old_hfont); DeleteObject(hfont); DeleteDC(hdc); skip("GM_ADVANCED is not supported on this platform\n"); @@ -493,7 +504,6 @@ static void test_outline_font(void) test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); - old_hfont = SelectObject(hdc, hfont); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); @@ -516,7 +526,6 @@ static void test_outline_font(void) ok(gm.gmCellIncX == pt.x/2, "incX %d != %d\n", gm.gmCellIncX, pt.x/2); ok(near_match(gm.gmCellIncX, 10 * width_orig), "incX %d != %d\n", gm.gmCellIncX, 10 * width_orig); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); - SelectObject(hdc, old_hfont); SetLastError(0xdeadbeef); ret = SetMapMode(hdc, MM_LOMETRIC); @@ -524,7 +533,6 @@ static void test_outline_font(void) test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); - old_hfont = SelectObject(hdc, hfont); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); @@ -545,7 +553,6 @@ static void test_outline_font(void) LPtoDP(hdc, &pt, 1); ok(near_match(gm.gmCellIncX, (pt.x + 1)/2), "incX %d != %d\n", gm.gmCellIncX, (pt.x + 1)/2); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); - SelectObject(hdc, old_hfont); SetLastError(0xdeadbeef); ret = SetMapMode(hdc, MM_TEXT); @@ -553,7 +560,6 @@ static void test_outline_font(void) test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); - old_hfont = SelectObject(hdc, hfont); /* with an identity matrix */ memset(&gm, 0, sizeof(gm)); SetLastError(0xdeadbeef); @@ -576,8 +582,8 @@ static void test_outline_font(void) ok(gm.gmCellIncX == pt.x/2, "incX %d != %d\n", gm.gmCellIncX, pt.x/2); ok(gm.gmCellIncX == 10 * width_orig, "incX %d != %d\n", gm.gmCellIncX, 10 * width_orig); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); - SelectObject(hdc, old_hfont); + SelectObject(hdc, old_hfont); DeleteObject(hfont); DeleteDC(hdc); }

1 0

Dmitry Timoshkov : gdi32: Allow a rounding error in the text justification test.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 0d1470575d4c576b8c48c0cd0ef4bde146fbbeb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d1470575d4c576b8c48c0cd0… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 6 22:27:30 2008 +0900 gdi32: Allow a rounding error in the text justification test. --- dlls/gdi32/tests/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 25e0747..bbcdf0b 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -1344,7 +1344,7 @@ static void testJustification(HDC hdc, PSTR str, RECT *clientArea) for (e = 0; e < nErrors; e++) { - ok(error[e].TabbedTextOutWidth == areaWidth, + ok(near_match(error[e].TabbedTextOutWidth, areaWidth), "The output text (\"%s\") width should be %d, not %d.\n", error[e].extent, areaWidth, error[e].TabbedTextOutWidth); /* The width returned by GetTextExtentPoint32() is exactly the same

1 0

Michael Karcher : msxml3: Simplify IXMLDOMNode::removeChild.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 3bdf45534be6eff970aab301aecab345652c218f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bdf45534be6eff970aab301a… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Oct 5 12:13:24 2008 +0200 msxml3: Simplify IXMLDOMNode::removeChild. --- dlls/msxml3/node.c | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index d9a2a0c..25ffe45 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -620,8 +620,6 @@ static HRESULT WINAPI xmlnode_removeChild( { xmlnode *This = impl_from_IXMLDOMNode( iface ); xmlNode *child_node_ptr; - HRESULT hr; - IXMLDOMNode *child; TRACE("%p->(%p, %p)\n", This, childNode, oldChild); @@ -630,22 +628,15 @@ static HRESULT WINAPI xmlnode_removeChild( if(oldChild) *oldChild = NULL; - hr = IXMLDOMNode_QueryInterface(childNode, &IID_IXMLDOMNode, (LPVOID)&child); - if(FAILED(hr)) - return hr; - - child_node_ptr = impl_from_IXMLDOMNode(child)->node; + child_node_ptr = impl_from_IXMLDOMNode(childNode)->node; if(child_node_ptr->parent != This->node) { WARN("childNode %p is not a child of %p\n", childNode, iface); - IXMLDOMNode_Release(child); return E_INVALIDARG; } xmlUnlinkNode(child_node_ptr); - IXMLDOMNode_Release(child); - if(oldChild) { IXMLDOMNode_AddRef(childNode);

1 0

Dmitry Timoshkov : gdi32: Add a test for a font being selected into 2 DCs with different transformations .
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: c8d573061064efdc8ce8d5d0234d7af82dae1883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8d573061064efdc8ce8d5d02… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Oct 6 22:27:13 2008 +0900 gdi32: Add a test for a font being selected into 2 DCs with different transformations. --- dlls/gdi32/tests/font.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index c5c9ab5..25e0747 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -362,9 +362,9 @@ static void test_bitmap_font(void) static void test_outline_font(void) { static const char test_str[11] = "Test String"; - HDC hdc; + HDC hdc, hdc_2; LOGFONTA lf; - HFONT hfont, old_hfont; + HFONT hfont, old_hfont, old_hfont_2; OUTLINETEXTMETRICA otm; SIZE size_orig; INT width_orig, height_orig, lfWidth; @@ -463,7 +463,19 @@ static void test_outline_font(void) ok(gm.gmCellIncX == width_orig/2, "incX %d != %d\n", gm.gmCellIncX, width_orig/2); ok(gm.gmCellIncY == 0, "incY %d != 0\n", gm.gmCellIncY); + /* Test that changing the DC transformation affects only the font + * selected on this DC and doesn't affect the same font selected on + * another DC. + */ + hdc_2 = CreateCompatibleDC(0); + old_hfont_2 = SelectObject(hdc_2, hfont); + test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + SetMapMode(hdc, MM_ANISOTROPIC); + + /* font metrics on another DC should be unchanged */ + test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + /* test restrictions of compatibility mode GM_COMPATIBLE */ /* part 1: rescaling only X should not change font scaling on screen. So compressing the X axis by 2 is not done, and this @@ -471,6 +483,8 @@ static void test_outline_font(void) SetWindowExtEx(hdc, 100, 100, NULL); SetViewportExtEx(hdc, 50, 100, NULL); test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); + /* font metrics on another DC should be unchanged */ + test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* part 2: rescaling only Y should change font scaling. As also X is scaled by a factor of 2, but this is not @@ -478,10 +492,18 @@ static void test_outline_font(void) of 2 in the X coordinate. */ SetViewportExtEx(hdc, 100, 200, NULL); test_font_metrics(hdc, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 2, 1); + /* font metrics on another DC should be unchanged */ + test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); /* restore scaling */ SetMapMode(hdc, MM_TEXT); + /* font metrics on another DC should be unchanged */ + test_font_metrics(hdc_2, hfont, lf.lfHeight, lf.lfWidth, test_str, sizeof(test_str), &otm.otmTextMetrics, &size_orig, width_orig, 1, 1); + + SelectObject(hdc_2, old_hfont_2); + DeleteDC(hdc_2); + if (!SetGraphicsMode(hdc, GM_ADVANCED)) { SelectObject(hdc, old_hfont);

1 0

Michael Karcher : msxml3: Parameter validation for IXMLDOMNode:: replaceChild and tests.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 9d65ec270222ec5c3b41950b286ae1d5738ecbfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d65ec270222ec5c3b41950b2… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Oct 5 12:13:37 2008 +0200 msxml3: Parameter validation for IXMLDOMNode::replaceChild and tests. --- dlls/msxml3/node.c | 11 ++++- dlls/msxml3/tests/domdoc.c | 100 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 25ffe45..b82ef55 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -609,7 +609,16 @@ static HRESULT WINAPI xmlnode_replaceChild( IXMLDOMNode* oldChild, IXMLDOMNode** outOldChild) { - FIXME("\n"); + xmlnode *This = impl_from_IXMLDOMNode( iface ); + + TRACE("%p->(%p,%p,%p)\n",This,newChild,oldChild,outOldChild); + + /* Do not believe any documentation telling that newChild == NULL + means removal. It does certainly *not* apply to msxml3! */ + if(!newChild || !oldChild) + return E_INVALIDARG; + + FIXME("not implemented\n"); return E_NOTIMPL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index c673d98..1ad168b 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1835,6 +1835,105 @@ static void test_removeChild(void) IXMLDOMDocument_Release( doc ); } +static void test_replaceChild(void) +{ + HRESULT r; + BSTR str; + VARIANT_BOOL b; + IXMLDOMDocument *doc; + IXMLDOMElement *element; + IXMLDOMNode *fo_node, *ba_node, *removed_node, *temp_node; + IXMLDOMNodeList *root_list, *fo_list; + IUnknown * unk1, *unk2; + long len; + + r = CoCreateInstance( &CLSID_DOMDocument, NULL, + CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); + if( r != S_OK ) + return; + + str = SysAllocString( szComplete4 ); + r = IXMLDOMDocument_loadXML( doc, str, &b ); + ok( r == S_OK, "loadXML failed\n"); + ok( b == VARIANT_TRUE, "failed to load XML string\n"); + SysFreeString( str ); + + r = IXMLDOMDocument_get_documentElement( doc, &element ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMElement_get_childNodes( element, &root_list ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNodeList_get_item( root_list, 3, &fo_node ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNode_get_childNodes( fo_node, &fo_list ); + ok( r == S_OK, "ret %08x\n", r); + + r = IXMLDOMNodeList_get_item( fo_list, 0, &ba_node ); + ok( r == S_OK, "ret %08x\n", r); + + IXMLDOMNodeList_Release( fo_list ); + + /* invalid parameter: NULL ptr for element to remove */ + removed_node = (void*)0xdeadbeef; + r = IXMLDOMElement_replaceChild( element, ba_node, NULL, &removed_node ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + ok( removed_node == (void*)0xdeadbeef, "%p\n", removed_node ); + + /* invalid parameter: NULL for replacement element. (Sic!) */ + removed_node = (void*)0xdeadbeef; + r = IXMLDOMElement_replaceChild( element, NULL, fo_node, &removed_node ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + ok( removed_node == (void*)0xdeadbeef, "%p\n", removed_node ); + + /* invalid parameter: OldNode is not a child */ + removed_node = (void*)0xdeadbeef; + r = IXMLDOMElement_replaceChild( element, ba_node, ba_node, &removed_node ); + todo_wine ok( r == E_INVALIDARG, "ret %08x\n", r ); + if( r == E_NOTIMPL) + { + skip("replaceChild not implemented\n"); + return; + } + ok( removed_node == NULL, "%p\n", removed_node ); + + r = IXMLDOMElement_replaceChild( element, ba_node, fo_node, NULL ); + ok( r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMNodeList_get_item( root_list, 3, &temp_node ); + ok( r == S_OK, "ret %08x\n", r ); + + /* ba_node and temp_node refer to the same node, yet they + are different interface pointers */ + ok( ba_node != temp_node, "ba_node %p temp_node %p\n", ba_node, temp_node); + r = IXMLDOMNode_QueryInterface( temp_node, &IID_IUnknown, (void**)&unk1); + ok( r == S_OK, "ret %08x\n", r ); + r = IXMLDOMNode_QueryInterface( ba_node, &IID_IUnknown, (void**)&unk2); + ok( r == S_OK, "ret %08x\n", r ); + ok( unk1 == unk2, "unk1 %p unk2 %p\n", unk1, unk2); + + IUnknown_Release( unk1 ); + IUnknown_Release( unk2 ); + + /* ba_node should have been removed from below fo_node */ + r = IXMLDOMNode_get_childNodes( fo_node, &fo_list ); + ok( r == S_OK, "ret %08x\n", r ); + + r = IXMLDOMNodeList_get_length( fo_list, &len); + ok( r == S_OK, "ret %08x\n", r ); + ok( len == 0, "len %ld\n", len); + + IXMLDOMNodeList_Release( fo_list ); + + IXMLDOMNode_Release(ba_node); + IXMLDOMNode_Release(fo_node); + IXMLDOMNode_Release(temp_node); + IXMLDOMNodeList_Release( root_list ); + IXMLDOMElement_Release( element ); + IXMLDOMDocument_Release( doc ); +} + static void test_XMLHTTP(void) { static const WCHAR wszBody[] = {'m','o','d','e','=','T','e','s','t',0}; @@ -3534,6 +3633,7 @@ START_TEST(domdoc) test_get_text(); test_get_childNodes(); test_removeChild(); + test_replaceChild(); test_XMLHTTP(); test_IXMLDOMDocument2(); test_XPath();

1 0

Michael Karcher : msxml3: removeChild can only delete direct children.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 75606f358382695a05aa6ceff92e7b84ca9449c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75606f358382695a05aa6ceff… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Oct 5 12:12:38 2008 +0200 msxml3: removeChild can only delete direct children. --- dlls/msxml3/node.c | 12 +++--------- dlls/msxml3/tests/domdoc.c | 4 ++-- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 39413c9..b4403cb 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -619,7 +619,7 @@ static HRESULT WINAPI xmlnode_removeChild( IXMLDOMNode** oldChild) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - xmlNode *ancestor, *child_node_ptr; + xmlNode *child_node_ptr; HRESULT hr; IXMLDOMNode *child; @@ -634,14 +634,8 @@ static HRESULT WINAPI xmlnode_removeChild( if(FAILED(hr)) return hr; - child_node_ptr = ancestor = impl_from_IXMLDOMNode(child)->node; - while(ancestor->parent) - { - if(ancestor->parent == This->node) - break; - ancestor = ancestor->parent; - } - if(!ancestor->parent) + child_node_ptr = impl_from_IXMLDOMNode(child)->node; + if(child_node_ptr->parent != This->node) { WARN("childNode %p is not a child of %p\n", childNode, iface); IXMLDOMNode_Release(child); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8922a3e..b5b543e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1797,8 +1797,8 @@ static void test_removeChild(void) /* ba_node is a descendant of element, but not a direct child. */ removed_node = (void*)0xdeadbeef; r = IXMLDOMElement_removeChild( element, ba_node, &removed_node ); - todo_wine ok( r == E_INVALIDARG, "ret %08x\n", r ); - todo_wine ok( removed_node == NULL, "%p\n", removed_node ); + ok( r == E_INVALIDARG, "ret %08x\n", r ); + ok( removed_node == NULL, "%p\n", removed_node ); r = IXMLDOMElement_removeChild( element, fo_node, &removed_node ); ok( r == S_OK, "ret %08x\n", r);

1 0

Kirill K. Smirnov : oleaut32: Add tests for metafiles, make them pass under Wine.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: a03cc957e13d6899dd98d6def44304f93090c9b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a03cc957e13d6899dd98d6def… Author: Kirill K. Smirnov <lich(a)math.spbu.ru> Date: Sat Oct 4 03:24:37 2008 +0400 oleaut32: Add tests for metafiles, make them pass under Wine. --- dlls/oleaut32/olepicture.c | 57 ++++++++++---------- dlls/oleaut32/tests/olepicture.c | 110 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 139 insertions(+), 28 deletions(-) diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index 8dc10ed..09d2c32 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -5,6 +5,7 @@ * * Copyright 2000 Huw D M Davies for CodeWeavers. * Copyright 2001 Marcus Meissner + * Copyright 2008 Kirill K. Smirnov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1686,39 +1687,24 @@ static HRESULT OLEPictureImpl_LoadIcon(OLEPictureImpl *This, BYTE *xbuf, ULONG x } } -static HRESULT OLEPictureImpl_LoadMetafile(OLEPictureImpl *This, - const BYTE *data, ULONG size) +static HRESULT OLEPictureImpl_LoadEnhMetafile(OLEPictureImpl *This, + const BYTE *data, ULONG size) { - HMETAFILE hmf; HENHMETAFILE hemf; - - /* SetMetaFileBitsEx performs data check on its own */ - hmf = SetMetaFileBitsEx(size, data); - if (hmf) - { - This->desc.picType = PICTYPE_METAFILE; - This->desc.u.wmf.hmeta = hmf; - This->desc.u.wmf.xExt = 0; - This->desc.u.wmf.yExt = 0; - - This->origWidth = 0; - This->origHeight = 0; - This->himetricWidth = 0; - This->himetricHeight = 0; - - return S_OK; - } + ENHMETAHEADER hdr; hemf = SetEnhMetaFileBits(size, data); if (!hemf) return E_FAIL; + GetEnhMetaFileHeader(hemf, sizeof(hdr), &hdr); + This->desc.picType = PICTYPE_ENHMETAFILE; This->desc.u.emf.hemf = hemf; This->origWidth = 0; This->origHeight = 0; - This->himetricWidth = 0; - This->himetricHeight = 0; + This->himetricWidth = hdr.rclFrame.right - hdr.rclFrame.left; + This->himetricHeight = hdr.rclFrame.bottom - hdr.rclFrame.top; return S_OK; } @@ -1727,16 +1713,24 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This, const BYTE *data, ULONG size) { APM_HEADER *header = (APM_HEADER *)data; - HRESULT hr; + HMETAFILE hmf; if (size < sizeof(APM_HEADER)) return E_FAIL; if (header->key != 0x9ac6cdd7) return E_FAIL; - if ((hr = OLEPictureImpl_LoadMetafile(This, data + sizeof(APM_HEADER), size - sizeof(*header))) != S_OK) - return hr; + /* SetMetaFileBitsEx performs data check on its own */ + hmf = SetMetaFileBitsEx(size - sizeof(*header), data + sizeof(*header)); + if (!hmf) return E_FAIL; + This->desc.picType = PICTYPE_METAFILE; + This->desc.u.wmf.hmeta = hmf; + This->desc.u.wmf.xExt = 0; + This->desc.u.wmf.yExt = 0; + + This->origWidth = 0; + This->origHeight = 0; This->himetricWidth = MulDiv((INT)header->right - header->left, 2540, header->inch); This->himetricHeight = MulDiv((INT)header->bottom - header->top, 2540, header->inch); return S_OK; @@ -1924,8 +1918,8 @@ static HRESULT WINAPI OLEPictureImpl_Load(IPersistStream* iface,IStream*pStm) { { unsigned int i; - /* let's see if it's a metafile */ - hr = OLEPictureImpl_LoadMetafile(This, xbuf, xread); + /* let's see if it's a EMF */ + hr = OLEPictureImpl_LoadEnhMetafile(This, xbuf, xread); if (hr == S_OK) break; FIXME("Unknown magic %04x, %d read bytes:\n",magic,xread); @@ -2687,8 +2681,15 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, *ppvObj = NULL; return hr; } - IPersistStream_Load(ps,lpstream); + hr = IPersistStream_Load(ps,lpstream); IPersistStream_Release(ps); + if (FAILED(hr)) + { + ERR("IPersistStream_Load failed\n"); + IPicture_Release(newpic); + *ppvObj = NULL; + return hr; + } hr = IPicture_QueryInterface(newpic,riid,ppvObj); if (hr) FIXME("Failed to get interface %s from IPicture.\n",debugstr_guid(riid)); diff --git a/dlls/oleaut32/tests/olepicture.c b/dlls/oleaut32/tests/olepicture.c index c0d0de9..3f44696 100644 --- a/dlls/oleaut32/tests/olepicture.c +++ b/dlls/oleaut32/tests/olepicture.c @@ -121,6 +121,53 @@ static const unsigned char apmdata[] = { 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00, 0x00,0x00,0x00,0x00 }; +/* MF_TEXTOUT_ON_PATH_BITS from gdi32/tests/metafile.c */ +static const unsigned char metafile[] = { + 0x01, 0x00, 0x09, 0x00, 0x00, 0x03, 0x19, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x32, 0x0a, + 0x16, 0x00, 0x0b, 0x00, 0x04, 0x00, 0x00, 0x00, + 0x54, 0x65, 0x73, 0x74, 0x03, 0x00, 0x05, 0x00, + 0x08, 0x00, 0x0c, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x00, 0x00 +}; + +/* EMF_TEXTOUT_ON_PATH_BITS from gdi32/tests/metafile.c */ +static const unsigned char enhmetafile[] = { + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xe7, 0xff, 0xff, 0xff, 0xe9, 0xff, 0xff, 0xff, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0xf4, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x05, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, + 0x40, 0x01, 0x00, 0x00, 0xf0, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x04, 0x00, + 0x80, 0xa9, 0x03, 0x00, 0x3b, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x54, 0x00, 0x00, 0x00, + 0x64, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xc8, 0x41, 0x00, 0x80, 0xbb, 0x41, + 0x0b, 0x00, 0x00, 0x00, 0x16, 0x00, 0x00, 0x00, + 0x04, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0x54, 0x00, 0x00, 0x00, + 0x54, 0x00, 0x65, 0x00, 0x73, 0x00, 0x74, 0x00, + 0x03, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x08, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, + 0x3c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + + struct NoStatStreamImpl { const IStreamVtbl *lpVtbl; @@ -478,6 +525,67 @@ static void test_apm() ole_expect(IPicture_get_hPal(pict, &handle), E_FAIL); IPicture_Release(pict); IStream_Release(stream); + GlobalUnlock(hglob); + GlobalFree(hglob); +} + +static void test_metafile(void) +{ + LPSTREAM stream; + IPicture *pict; + HGLOBAL hglob; + LPBYTE *data; + + hglob = GlobalAlloc (0, sizeof(metafile)); + data = GlobalLock(hglob); + memcpy(data, metafile, sizeof(metafile)); + + ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); + /* Windows does not load simple metafiles */ + ole_expect(OleLoadPictureEx(stream, sizeof(metafile), TRUE, &IID_IPicture, 100, 100, 0, (LPVOID *)&pict), E_FAIL); + + IStream_Release(stream); + GlobalUnlock(hglob); + GlobalFree(hglob); +} + +static void test_enhmetafile(void) +{ + OLE_HANDLE handle; + LPSTREAM stream; + IPicture *pict; + HGLOBAL hglob; + LPBYTE *data; + LONG cxy; + BOOL keep; + short type; + + hglob = GlobalAlloc (0, sizeof(enhmetafile)); + data = GlobalLock(hglob); + memcpy(data, enhmetafile, sizeof(enhmetafile)); + + ole_check(CreateStreamOnHGlobal(hglob, TRUE, &stream)); + ole_check(OleLoadPictureEx(stream, sizeof(enhmetafile), TRUE, &IID_IPicture, 10, 10, 0, (LPVOID *)&pict)); + + ole_check(IPicture_get_Handle(pict, &handle)); + ok(handle != 0, "handle is null\n"); + + ole_check(IPicture_get_Type(pict, &type)); + expect_eq(type, PICTYPE_ENHMETAFILE, short, "%d"); + + ole_check(IPicture_get_Height(pict, &cxy)); + expect_eq(cxy, -23, LONG, "%d"); + + ole_check(IPicture_get_Width(pict, &cxy)); + expect_eq(cxy, -25, LONG, "%d"); + + ole_check(IPicture_get_KeepOriginalFormat(pict, &keep)); + todo_wine expect_eq(keep, FALSE, LONG, "%d"); + + IPicture_Release(pict); + IStream_Release(stream); + GlobalUnlock(hglob); + GlobalFree(hglob); } START_TEST(olepicture) @@ -501,6 +609,8 @@ START_TEST(olepicture) test_empty_image(); test_empty_image_2(); test_apm(); + test_metafile(); + test_enhmetafile(); test_Invoke(); test_OleCreatePictureIndirect();

1 0

Eric Pouech : msvcrt: Implemented wcsncpy_s.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: 096991428f304681d26e971cd7af6c13b67f48ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=096991428f304681d26e971cd… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Thu Oct 2 22:00:34 2008 +0200 msvcrt: Implemented wcsncpy_s. --- dlls/msvcrt/msvcrt.spec | 1 + dlls/msvcrt/wcs.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ecdce4f..c54d33e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -772,6 +772,7 @@ @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp @ cdecl wcsncpy(ptr wstr long) ntdll.wcsncpy +@ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk @ cdecl wcsrchr(wstr long) ntdll.wcsrchr @ cdecl wcsspn(wstr wstr) ntdll.wcsspn diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 8eccb39..5c80092 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1046,3 +1046,34 @@ INT CDECL MSVCRT_wcscpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, con return 0; } + +/****************************************************************** + * wcsncpy_s (MSVCRT.@) + */ +INT CDECL MSVCRT_wcsncpy_s( MSVCRT_wchar_t* wcDest, MSVCRT_size_t numElement, const MSVCRT_wchar_t *wcSrc, + MSVCRT_size_t count ) +{ + INT size = 0; + + if (!wcDest || !numElement) + return MSVCRT_EINVAL; + + wcDest[0] = 0; + + if (!wcSrc) + { + return MSVCRT_EINVAL; + } + + size = min(strlenW(wcSrc), count); + + if (size >= numElement) + { + return MSVCRT_ERANGE; + } + + memcpy( wcDest, wcSrc, size*sizeof(WCHAR) ); + wcDest[size] = '\0'; + + return 0; +}

1 0

Michael Karcher : msxml3/tests: Clean up test_removeChild.
by Alexandre Julliard Oct. 6, 2008

Oct. 6, 2008

Module: wine Branch: master Commit: d1c8083b93ab9dd32fc1449d6ba23c58836c1a41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1c8083b93ab9dd32fc1449d6… Author: Michael Karcher <wine(a)mkarcher.dialup.fu-berlin.de> Date: Sun Oct 5 12:12:21 2008 +0200 msxml3/tests: Clean up test_removeChild. Rename variables to help the reader following the xml traversal. While doing that, I encountered a possible typo, as node_list2 was never used after being acquired. This version now really tries to delete a grandchild and expects a failure. --- dlls/msxml3/tests/domdoc.c | 57 +++++++++++++++++++++++++++---------------- 1 files changed, 36 insertions(+), 21 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 29bebb9..8922a3e 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1759,8 +1759,8 @@ static void test_removeChild(void) VARIANT_BOOL b; IXMLDOMDocument *doc; IXMLDOMElement *element; - IXMLDOMNode *node, *node2, *node3, *node4; - IXMLDOMNodeList *node_list, *node_list2; + IXMLDOMNode *fo_node, *ba_node, *removed_node, *temp_node, *lc_node; + IXMLDOMNodeList *root_list, *fo_list; r = CoCreateInstance( &CLSID_DOMDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (LPVOID*)&doc ); @@ -1776,46 +1776,61 @@ static void test_removeChild(void) r = IXMLDOMDocument_get_documentElement( doc, &element ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMElement_get_childNodes( element, &node_list ); + r = IXMLDOMElement_get_childNodes( element, &root_list ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNodeList_get_item( node_list, 3, &node ); + r = IXMLDOMNodeList_get_item( root_list, 3, &fo_node ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNode_get_childNodes( node, &node_list2 ); + r = IXMLDOMNode_get_childNodes( fo_node, &fo_list ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNodeList_get_item( node_list, 0, &node4 ); + r = IXMLDOMNodeList_get_item( fo_list, 0, &ba_node ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMElement_removeChild( element, NULL, &node2 ); + /* invalid parameter: NULL ptr */ + removed_node = (void*)0xdeadbeef; + r = IXMLDOMElement_removeChild( element, NULL, &removed_node ); ok( r == E_INVALIDARG, "ret %08x\n", r ); + todo_wine ok( removed_node == (void*)0xdeadbeef, "%p\n", removed_node ); - r = IXMLDOMElement_removeChild( element, node4, &node2 ); + /* ba_node is a descendant of element, but not a direct child. */ + removed_node = (void*)0xdeadbeef; + r = IXMLDOMElement_removeChild( element, ba_node, &removed_node ); + todo_wine ok( r == E_INVALIDARG, "ret %08x\n", r ); + todo_wine ok( removed_node == NULL, "%p\n", removed_node ); + + r = IXMLDOMElement_removeChild( element, fo_node, &removed_node ); ok( r == S_OK, "ret %08x\n", r); - ok( node4 == node2, "node %p node2 %p\n", node4, node2 ); + ok( fo_node == removed_node, "node %p node2 %p\n", fo_node, removed_node ); + + /* try removing already removed child */ + temp_node = (void*)0xdeadbeef; + r = IXMLDOMElement_removeChild( element, fo_node, &temp_node ); + ok( r == E_INVALIDARG, "ret %08x\n", r); + ok( temp_node == NULL, "%p\n", temp_node ); - r = IXMLDOMNode_get_parentNode( node4, &node3 ); + /* the removed node has no parent anymore */ + r = IXMLDOMNode_get_parentNode( removed_node, &temp_node ); ok( r == S_FALSE, "ret %08x\n", r); - ok( node3 == NULL, "%p\n", node3 ); + ok( temp_node == NULL, "%p\n", temp_node ); - IXMLDOMNode_Release( node2 ); - IXMLDOMNode_Release( node4 ); + IXMLDOMNode_Release( removed_node ); + IXMLDOMNode_Release( ba_node ); + IXMLDOMNodeList_Release( fo_list ); - r = IXMLDOMNodeList_get_item( node_list, 0, &node4 ); + r = IXMLDOMNodeList_get_item( root_list, 0, &lc_node ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMElement_removeChild( element, node4, NULL ); + r = IXMLDOMElement_removeChild( element, lc_node, NULL ); ok( r == S_OK, "ret %08x\n", r); - r = IXMLDOMNode_get_parentNode( node4, &node3 ); + r = IXMLDOMNode_get_parentNode( lc_node, &temp_node ); ok( r == S_FALSE, "ret %08x\n", r); - ok( node3 == NULL, "%p\n", node3 ); + ok( temp_node == NULL, "%p\n", temp_node ); - IXMLDOMNode_Release( node4 ); - IXMLDOMNodeList_Release( node_list2 ); - IXMLDOMNode_Release( node ); - IXMLDOMNodeList_Release( node_list ); + IXMLDOMNode_Release( lc_node ); + IXMLDOMNodeList_Release( root_list ); IXMLDOMElement_Release( element ); IXMLDOMDocument_Release( doc ); }

1 0