January 2008 - Wine-commits

Divan Burger : comdlg32: Modernize the look of the selected colour box in the colour dialog.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 3a508e605b6f6d4cda750fcd6c2ffbe203474237 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a508e605b6f6d4cda750fcd6… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 19:16:42 2008 +0200 comdlg32: Modernize the look of the selected colour box in the colour dialog. --- dlls/comdlg32/colordlg.c | 12 ++---------- 1 files changed, 2 insertions(+), 10 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index b4f3951..74d3357 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -441,16 +441,8 @@ void CC_PaintSelectedColor( HWND hDlg, COLORREF cr ) hBrush = CreateSolidBrush(cr); if (hBrush) { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.left, rect.top, rect.right/2, rect.bottom); - DeleteObject ( SelectObject(hdc, hBrush) ) ; - hBrush = CreateSolidBrush( GetNearestColor(hdc, cr) ); - if (hBrush) - { - hBrush = SelectObject(hdc, hBrush) ; - Rectangle(hdc, rect.right/2-1, rect.top, rect.right, rect.bottom); - DeleteObject(SelectObject(hdc, hBrush)) ; - } + FillRect(hdc, &rect, hBrush); + DrawEdge(hdc, &rect, BDR_SUNKENOUTER, BF_RECT); } ReleaseDC(hwnd, hdc); }

1 0

Divan Burger : comdlg32: Modernize the look of the colour graph' s cross in the colour dialog.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 285c9fc6406762bd2f83fbaa893b2479f7b017ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=285c9fc6406762bd2f83fbaa8… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 19:10:44 2008 +0200 comdlg32: Modernize the look of the colour graph's cross in the colour dialog. --- dlls/comdlg32/colordlg.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index 4abcd75..b4f3951 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -513,7 +513,8 @@ void CC_PaintTriangle( HWND hDlg, int y) void CC_PaintCross( HWND hDlg, int x, int y) { HDC hDC; - int w = GetDialogBaseUnits(); + int w = GetDialogBaseUnits() - 1; + int wc = GetDialogBaseUnits() * 3 / 4; HWND hwnd = GetDlgItem(hDlg, 0x2c6); LPCCPRIV lpp = (LPCCPRIV) GetPropW( hDlg, szColourDialogProp ); RECT rect; @@ -525,8 +526,7 @@ void CC_PaintCross( HWND hDlg, int x, int y) GetClientRect(hwnd, &rect); hDC = GetDC(hwnd); SelectClipRgn( hDC, CreateRectRgnIndirect(&rect)); - hPen = CreatePen(PS_SOLID, 2, 0xffffff); /* -white- color */ - hPen = SelectObject(hDC, hPen); + point.x = ((long)rect.right * (long)x) / (long)MAXHORI; point.y = rect.bottom - ((long)rect.bottom * (long)y) / (long)MAXVERT; if ( lpp->oldcross.left != lpp->oldcross.right ) @@ -539,11 +539,18 @@ void CC_PaintCross( HWND hDlg, int x, int y) lpp->oldcross.top = point.y - w - 1; lpp->oldcross.bottom = point.y + w + 1; + hPen = CreatePen(PS_SOLID, 3, 0x000000); /* -black- color */ + hPen = SelectObject(hDC, hPen); MoveToEx(hDC, point.x - w, point.y, &p); + LineTo(hDC, point.x - wc, point.y); + MoveToEx(hDC, point.x + wc, point.y, &p); LineTo(hDC, point.x + w, point.y); MoveToEx(hDC, point.x, point.y - w, &p); + LineTo(hDC, point.x, point.y - wc); + MoveToEx(hDC, point.x, point.y + wc, &p); LineTo(hDC, point.x, point.y + w); - DeleteObject( SelectObject(hDC, hPen)) ; + DeleteObject( SelectObject(hDC, hPen)); + ReleaseDC(hwnd, hDC); } }

1 0

Gerald Pfeifer : gdi32: Tighten range checking in PlayEnhMetaFileRecord() and remove four useless checks.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 43837ed227b076edcf1e29cb55528a4faa1aa3e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43837ed227b076edcf1e29cb5… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Jan 6 18:42:57 2008 +0100 gdi32: Tighten range checking in PlayEnhMetaFileRecord() and remove four useless checks. --- dlls/gdi32/enhmetafile.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 081f7c1..150b82a 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -1669,11 +1669,13 @@ BOOL WINAPI PlayEnhMetaFileRecord( const EMRCREATEDIBPATTERNBRUSHPT *lpCreate = (const EMRCREATEDIBPATTERNBRUSHPT *)mr; LPVOID lpPackedStruct; - /* check that offsets and data are contained within the record */ - if ( !( (lpCreate->cbBmi>=0) && (lpCreate->cbBits>=0) && - (lpCreate->offBmi>=0) && (lpCreate->offBits>=0) && - ((lpCreate->offBmi +lpCreate->cbBmi ) <= mr->nSize) && - ((lpCreate->offBits+lpCreate->cbBits) <= mr->nSize) ) ) + /* Check that offsets and data are contained within the record + * (including checking for wrap arounds). + */ + if ( lpCreate->offBmi + lpCreate->cbBmi > mr->nSize + || lpCreate->offBits + lpCreate->cbBits > mr->nSize + || lpCreate->offBmi + lpCreate->cbBmi < lpCreate->offBmi + || lpCreate->offBits + lpCreate->cbBits < lpCreate->offBits ) { ERR("Invalid EMR_CREATEDIBPATTERNBRUSHPT record\n"); break;

1 0

Divan Burger : comdlg32: Modernize the look of the luminance bar in the colour dialog.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 155d320ae6fd231b3d634fca9c8981d4acfe9d07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155d320ae6fd231b3d634fca9… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 18:54:07 2008 +0200 comdlg32: Modernize the look of the luminance bar in the colour dialog. --- dlls/comdlg32/colordlg.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index aa7bca4..4abcd75 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -463,7 +463,7 @@ void CC_PaintTriangle( HWND hDlg, int y) { HDC hDC; long temp; - int w = LOWORD(GetDialogBaseUnits()); + int w = LOWORD(GetDialogBaseUnits()) / 2; POINT points[3]; int height; int oben; @@ -484,6 +484,7 @@ void CC_PaintTriangle( HWND hDlg, int y) oben = points[0].y; /* | \ | */ /* | \| */ temp = (long)height * (long)y; + points[0].x += 1; points[0].y = oben + height - temp / (long)MAXVERT; points[1].y = points[0].y + w; points[2].y = points[0].y - w; @@ -496,7 +497,11 @@ void CC_PaintTriangle( HWND hDlg, int y) lpp->old3angle.right = points[1].x + 1; lpp->old3angle.top = points[2].y - 1; lpp->old3angle.bottom= points[1].y + 1; + + hbr = SelectObject(hDC, GetStockObject(BLACK_BRUSH)); Polygon(hDC, points, 3); + SelectObject(hDC, hbr); + ReleaseDC(hDlg, hDC); } } @@ -647,7 +652,7 @@ static void CC_PaintLumBar( HWND hDlg, int hue, int sat ) rect.bottom = rect.top; } GetClientRect(hwnd, &rect); - FrameRect(hDC, &rect, GetStockObject(BLACK_BRUSH) ); + DrawEdge(hDC, &rect, BDR_SUNKENOUTER, BF_RECT); ReleaseDC(hwnd, hDC); } }

1 0

Divan Burger : comdlg32: Clamp hue and saturation when clicking in colour graph in colour dialog.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 8a0dab38c8fd0779ec26661ddc511cc41149cfe0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a0dab38c8fd0779ec26661dd… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 18:44:10 2008 +0200 comdlg32: Clamp hue and saturation when clicking in colour graph in colour dialog. --- dlls/comdlg32/colordlg.c | 37 +++++++++++++++++++++---------------- 1 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index a955650..aa7bca4 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -337,24 +337,29 @@ static int CC_MouseCheckColorGraph( HWND hDlg, int dlgitem, int *hori, int *vert ClientToScreen(hDlg, &point); hwnd = GetDlgItem( hDlg, dlgitem ); GetWindowRect(hwnd, &rect); - if (PtInRect(&rect, point)) - { - GetClientRect(hwnd, &rect); - ScreenToClient(hwnd, &point); - x = (long) point.x * MAXHORI; - x /= rect.right; - y = (long) (rect.bottom - point.y) * MAXVERT; - y /= rect.bottom; - - if (hori) - *hori = x; - if (vert) - *vert = y; - return 1; - } - else + if (!PtInRect(&rect, point)) return 0; + + GetClientRect(hwnd, &rect); + ScreenToClient(hwnd, &point); + + x = (long) point.x * MAXHORI; + x /= rect.right; + y = (long) (rect.bottom - point.y) * MAXVERT; + y /= rect.bottom; + + if (x < 0) x = 0; + if (y < 0) y = 0; + if (x > MAXHORI) x = MAXHORI; + if (y > MAXVERT) y = MAXVERT; + + if (hori) + *hori = x; + if (vert) + *vert = y; + + return 1; } /*********************************************************************** * CC_MouseCheckResultWindow [internal]

1 0

Alistair Leslie-Hughes : msxml3: Suppress IID_IRunnableObject FIXME since its not supported.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 3c94fb72de1c2a63858731799fa5065fdda055f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c94fb72de1c2a63858731799… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jan 9 12:26:51 2008 +1100 msxml3: Suppress IID_IRunnableObject FIXME since its not supported. --- dlls/msxml3/domdoc.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/domdoc.c b/dlls/msxml3/domdoc.c index 60a65d0..856fcb0 100644 --- a/dlls/msxml3/domdoc.c +++ b/dlls/msxml3/domdoc.c @@ -345,6 +345,8 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + *ppvObject = NULL; + if ( IsEqualGUID( riid, &IID_IUnknown ) || IsEqualGUID( riid, &IID_IXMLDOMDocument ) || IsEqualGUID( riid, &IID_IXMLDOMDocument2 ) ) @@ -360,6 +362,11 @@ static HRESULT WINAPI domdoc_QueryInterface( IXMLDOMDocument2 *iface, REFIID rii { *ppvObject = (IPersistStream*)&(This->lpvtblIPersistStream); } + 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));

1 0

Tony Wasserka : include: Add d3dx9core.h.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 5da83f03e2fd24638abe68996b5f3abb3edb648c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da83f03e2fd24638abe68996… Author: Tony Wasserka <tony.wasserka(a)freenet.de> Date: Tue Jan 8 16:42:36 2008 +0100 include: Add d3dx9core.h. --- include/Makefile.in | 1 + include/d3dx9.h | 1 + include/d3dx9core.h | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 0 deletions(-) diff --git a/include/Makefile.in b/include/Makefile.in index 733f9bd..cde66cc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -116,6 +116,7 @@ SRCDIR_INCLUDES = \ d3dx8math.h \ d3dx8math.inl \ d3dx9.h \ + d3dx9core.h \ d3dx9math.h \ d3dx9math.inl \ dbghelp.h \ diff --git a/include/d3dx9.h b/include/d3dx9.h index f1f2228..62319ec 100644 --- a/include/d3dx9.h +++ b/include/d3dx9.h @@ -22,6 +22,7 @@ #include <limits.h> #include "d3d9.h" +#include "d3dx9core.h" #include "d3dx9math.h" #endif diff --git a/include/d3dx9core.h b/include/d3dx9core.h new file mode 100644 index 0000000..31b2e23 --- /dev/null +++ b/include/d3dx9core.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2007 Tony Wasserka + * + * 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 + */ + +#ifndef __WINE_D3DX9CORE_H +#define __WINE_D3DX9CORE_H + +#include <d3dx9.h> + +#define D3DX_VERSION 0x0900 +#define D3DX_SDK_VERSION 9 + +#endif

1 0

Divan Burger : comdlg32: Fix bug where the colour graph' s cross is not painted.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 19ed5849035457f8d6bc607ac2a577efd9137db9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19ed5849035457f8d6bc607ac… Author: Divan Burger <divan.burger(a)gmail.com> Date: Mon Jan 7 18:08:07 2008 +0200 comdlg32: Fix bug where the colour graph's cross is not painted. --- dlls/comdlg32/colordlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/colordlg.c b/dlls/comdlg32/colordlg.c index aa56ebf..a955650 100644 --- a/dlls/comdlg32/colordlg.c +++ b/dlls/comdlg32/colordlg.c @@ -1075,10 +1075,10 @@ LRESULT CC_WMPaint( HWND hDlg, WPARAM wParam, LPARAM lParam ) CC_PaintPredefColorArray(hDlg, 6, 8); CC_PaintUserColorArray(hDlg, 2, 8, lpp->lpcc->lpCustColors); CC_PaintLumBar(hDlg, lpp->h, lpp->s); - CC_PaintCross(hDlg, lpp->h, lpp->s); CC_PaintTriangle(hDlg, lpp->l); CC_PaintSelectedColor(hDlg, lpp->lpcc->rgbResult); CC_PaintColorGraph(hDlg); + CC_PaintCross(hDlg, lpp->h, lpp->s); EndPaint(hDlg, &ps); return TRUE;

1 0

Alistair Leslie-Hughes : msxml3: previousSibling not supported for Attribute, Document and Document Fragment Nodes.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: 2896c462450a144ad122953e6ac76b25de0c4bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2896c462450a144ad122953e6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 8 11:34:29 2008 +1100 msxml3: previousSibling not supported for Attribute, Document and Document Fragment Nodes. --- dlls/msxml3/node.c | 18 +++++++++++++++++- dlls/msxml3/tests/domdoc.c | 18 ++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index dae9130..03d96f5 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -359,7 +359,23 @@ static HRESULT WINAPI xmlnode_get_previousSibling( IXMLDOMNode** previousSibling) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - return get_node( This, "previous", This->node->prev, previousSibling ); + + TRACE("%p\n", This ); + + if (!previousSibling) + return E_INVALIDARG; + + switch( This->node->type ) + { + /* Attribute, Document and Document Fragment Nodes do not support previousSibling */ + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_ATTRIBUTE_NODE: + *previousSibling = NULL; + return S_FALSE; + default: + return get_node( This, "previous", This->node->prev, previousSibling ); + } } static HRESULT WINAPI xmlnode_get_nextSibling( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 910c044..3418ebb 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1829,6 +1829,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pDocChild not NULL\n"); + /* test previous Sibling */ + hr = IXMLDOMDocument_get_previousSibling(doc, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + pNextChild = (IXMLDOMNode *)0x1; + hr = IXMLDOMDocument_get_previousSibling(doc, &pNextChild); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(pNextChild == NULL, "pNextChild not NULL\n"); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -1891,6 +1900,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); + /* test Previous Sibling*/ + hr = IXMLDOMAttribute_get_previousSibling(pAttrubute, NULL); + ok(hr == E_INVALIDARG, "ret %08x\n", hr ); + + pNextChild = (IXMLDOMNode *)0x1; + hr = IXMLDOMAttribute_get_previousSibling(pAttrubute, &pNextChild); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok(pNextChild == NULL, "pNextChild not NULL\n"); + hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pNewChild == NULL, "pNewChild not NULL\n");

1 0

Alistair Leslie-Hughes : msxml3: get_attributes not supported for Attribute , CData, Comment, Doc, Doc Frag, Entity and Text Nodes.
by Alexandre Julliard 09 Jan '08

09 Jan '08

Module: wine Branch: master Commit: e906b136eb17eb42b42313fd5ffd575c870cabcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=e906b136eb17eb42b42313fd5… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Jan 8 12:43:34 2008 +1100 msxml3: get_attributes not supported for Attribute, CData, Comment, Doc, Doc Frag, Entity and Text Nodes. --- dlls/msxml3/node.c | 22 ++++++++++++++++++++-- dlls/msxml3/tests/domdoc.c | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 03d96f5..2a93ab8 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -408,8 +408,26 @@ static HRESULT WINAPI xmlnode_get_attributes( { xmlnode *This = impl_from_IXMLDOMNode( iface ); TRACE("%p\n", This); - *attributeMap = create_nodemap( iface ); - return S_OK; + + if (!attributeMap) + return E_INVALIDARG; + + switch( This->node->type ) + { + /* Attribute, CDataSection, Comment, Documents, Documents Fragments, + Entity and Text Nodes does not support get_attributes */ + case XML_ATTRIBUTE_NODE: + case XML_COMMENT_NODE: + case XML_DOCUMENT_NODE: + case XML_DOCUMENT_FRAG_NODE: + case XML_ENTITY_NODE: + case XML_TEXT_NODE: + *attributeMap = NULL; + return S_FALSE; + default: + *attributeMap = create_nodemap( iface ); + return S_OK; + } } static HRESULT WINAPI xmlnode_insertBefore( diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 3418ebb..3038858 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -512,6 +512,8 @@ static void test_domdoc( void ) ok( r == S_OK, "returns %08x\n", r ); if(nodetext) { + IXMLDOMNamedNodeMap *pAttribs; + /* Text Last Child Checks */ r = IXMLDOMText_get_lastChild(nodetext, NULL); ok(r == E_INVALIDARG, "ret %08x\n", r ); @@ -520,6 +522,15 @@ static void test_domdoc( void ) r = IXMLDOMText_get_lastChild(nodetext, &nodeChild); ok(r == S_FALSE, "ret %08x\n", r ); ok(nodeChild == NULL, "nodeChild not NULL\n"); + + /* test get_attributes */ + r = IXMLDOMText_get_attributes( nodetext, NULL ); + ok( r == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + r = IXMLDOMText_get_attributes( nodetext, &pAttribs); + ok(r == S_FALSE, "ret %08x\n", r ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); } IXMLDOMText_Release( nodetext ); SysFreeString( str ); @@ -1838,6 +1849,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); + /* test get_attributes */ + hr = IXMLDOMDocument_get_attributes( doc, NULL ); + ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + hr = IXMLDOMDocument_get_attributes( doc, &pAttribs); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); + hr = IXMLDOMDocument_createElement(doc, _bstr_("Testing"), &pRoot); ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) @@ -1851,6 +1871,15 @@ static void test_xmlTypes(void) ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { + /* test get_attributes */ + hr = IXMLDOMComment_get_attributes( pComment, NULL ); + ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + hr = IXMLDOMComment_get_attributes( pComment, &pAttribs); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); + hr = IXMLDOMElement_appendChild(pRoot, (IXMLDOMNode*)pComment, NULL); ok(hr == S_OK, "ret %08x\n", hr ); @@ -1909,6 +1938,15 @@ static void test_xmlTypes(void) ok(hr == S_FALSE, "ret %08x\n", hr ); ok(pNextChild == NULL, "pNextChild not NULL\n"); + /* test get_attributes */ + hr = IXMLDOMAttribute_get_attributes( pAttrubute, NULL ); + ok( hr == E_INVALIDARG, "get_attributes returned wrong code\n"); + + pAttribs = (IXMLDOMNamedNodeMap*)0x1; + hr = IXMLDOMAttribute_get_attributes( pAttrubute, &pAttribs); + ok(hr == S_FALSE, "ret %08x\n", hr ); + ok( pAttribs == NULL, "pAttribs not NULL\n"); + hr = IXMLDOMElement_appendChild(pElement, (IXMLDOMNode*)pAttrubute, &pNewChild); ok(hr == E_FAIL, "ret %08x\n", hr ); ok(pNewChild == NULL, "pNewChild not NULL\n");

1 0