Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
9fe98546
Commit
9fe98546
authored
Oct 09, 2008
by
Michael Karcher
Committed by
Alexandre Julliard
Oct 10, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Text node should not aggregate element.
parent
64e44d11
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
9 deletions
+11
-9
domdoc.c
dlls/msxml3/tests/domdoc.c
+3
-0
text.c
dlls/msxml3/text.c
+8
-9
No files found.
dlls/msxml3/tests/domdoc.c
View file @
9fe98546
...
...
@@ -559,6 +559,9 @@ static void test_domdoc( void )
{
IXMLDOMNamedNodeMap
*
pAttribs
;
r
=
IXMLDOMText_QueryInterface
(
nodetext
,
&
IID_IXMLDOMElement
,
(
LPVOID
*
)
&
element
);
ok
(
r
==
E_NOINTERFACE
,
"ret %08x
\n
"
,
r
);
/* Text Last Child Checks */
r
=
IXMLDOMText_get_lastChild
(
nodetext
,
NULL
);
ok
(
r
==
E_INVALIDARG
,
"ret %08x
\n
"
,
r
);
...
...
dlls/msxml3/text.c
View file @
9fe98546
...
...
@@ -42,7 +42,7 @@ typedef struct _domtext
{
const
struct
IXMLDOMTextVtbl
*
lpVtbl
;
LONG
ref
;
IUnknown
*
element
_unk
;
IUnknown
*
node
_unk
;
IXMLDOMNode
*
node
;
}
domtext
;
...
...
@@ -66,10 +66,9 @@ static HRESULT WINAPI domtext_QueryInterface(
{
*
ppvObject
=
iface
;
}
else
if
(
IsEqualGUID
(
riid
,
&
IID_IXMLDOMNode
)
||
IsEqualGUID
(
riid
,
&
IID_IXMLDOMElement
)
)
else
if
(
IsEqualGUID
(
riid
,
&
IID_IXMLDOMNode
)
)
{
return
IUnknown_QueryInterface
(
This
->
element
_unk
,
riid
,
ppvObject
);
return
IUnknown_QueryInterface
(
This
->
node
_unk
,
riid
,
ppvObject
);
}
else
{
...
...
@@ -98,7 +97,7 @@ static ULONG WINAPI domtext_Release(
ref
=
InterlockedDecrement
(
&
This
->
ref
);
if
(
ref
==
0
)
{
IUnknown_Release
(
This
->
element
_unk
);
IUnknown_Release
(
This
->
node
_unk
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
}
...
...
@@ -773,17 +772,17 @@ IUnknown* create_text( xmlNodePtr text )
This
->
lpVtbl
=
&
domtext_vtbl
;
This
->
ref
=
1
;
This
->
element_unk
=
create_element
(
text
,
(
IUnknown
*
)
&
This
->
lpVtbl
);
if
(
!
This
->
element
_unk
)
This
->
node_unk
=
create_basic_node
(
text
,
(
IUnknown
*
)
&
This
->
lpVtbl
);
if
(
!
This
->
node
_unk
)
{
HeapFree
(
GetProcessHeap
(),
0
,
This
);
return
NULL
;
}
hr
=
IUnknown_QueryInterface
(
This
->
element
_unk
,
&
IID_IXMLDOMNode
,
(
LPVOID
*
)
&
This
->
node
);
hr
=
IUnknown_QueryInterface
(
This
->
node
_unk
,
&
IID_IXMLDOMNode
,
(
LPVOID
*
)
&
This
->
node
);
if
(
FAILED
(
hr
))
{
IUnknown_Release
(
This
->
element
_unk
);
IUnknown_Release
(
This
->
node
_unk
);
HeapFree
(
GetProcessHeap
(),
0
,
This
);
return
NULL
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment