Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
ede880a1
Commit
ede880a1
authored
Nov 16, 2011
by
Nikolay Sivov
Committed by
Alexandre Julliard
Nov 16, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msxml3: Return qualified name from get_nodeName().
parent
12bb4a47
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
5 deletions
+26
-5
node.c
dlls/msxml3/node.c
+24
-3
domdoc.c
dlls/msxml3/tests/domdoc.c
+2
-2
No files found.
dlls/msxml3/node.c
View file @
ede880a1
...
...
@@ -128,12 +128,33 @@ xmlnode *get_node_obj(IXMLDOMNode *node)
HRESULT
node_get_nodeName
(
xmlnode
*
This
,
BSTR
*
name
)
{
BSTR
prefix
,
base
;
HRESULT
hr
;
if
(
!
name
)
return
E_INVALIDARG
;
*
name
=
bstr_from_xmlChar
(
This
->
node
->
name
);
if
(
!*
name
)
return
S_FALSE
;
hr
=
node_get_base_name
(
This
,
&
base
);
if
(
hr
!=
S_OK
)
return
hr
;
hr
=
node_get_prefix
(
This
,
&
prefix
);
if
(
hr
==
S_OK
)
{
static
const
WCHAR
colW
=
':'
;
WCHAR
*
ptr
;
/* +1 for ':' */
ptr
=
*
name
=
SysAllocStringLen
(
NULL
,
SysStringLen
(
base
)
+
SysStringLen
(
prefix
)
+
1
);
memcpy
(
ptr
,
prefix
,
SysStringByteLen
(
prefix
));
ptr
+=
SysStringLen
(
prefix
);
memcpy
(
ptr
++
,
&
colW
,
sizeof
(
WCHAR
));
memcpy
(
ptr
,
base
,
SysStringByteLen
(
base
));
SysFreeString
(
base
);
SysFreeString
(
prefix
);
}
else
*
name
=
base
;
return
S_OK
;
}
...
...
dlls/msxml3/tests/domdoc.c
View file @
ede880a1
...
...
@@ -7009,7 +7009,7 @@ static void test_namespaces(void)
hr
=
IXMLDOMNode_get_nodeName
(
node2
,
&
str
);
EXPECT_HR
(
hr
,
S_OK
);
todo_wine
ok
(
!
lstrcmpW
(
str
,
_bstr_
(
"Model:Package"
)),
"got %s
\n
"
,
wine_dbgstr_w
(
str
));
ok
(
!
lstrcmpW
(
str
,
_bstr_
(
"Model:Package"
)),
"got %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
/* Test get_namespaceURI */
...
...
@@ -7030,7 +7030,7 @@ static void test_namespaces(void)
hr
=
IXMLDOMAttribute_get_nodeName
(
attr
,
&
str
);
EXPECT_HR
(
hr
,
S_OK
);
todo_wine
ok
(
!
lstrcmpW
(
str
,
_bstr_
(
"Model:name2"
)),
"got %s
\n
"
,
wine_dbgstr_w
(
str
));
ok
(
!
lstrcmpW
(
str
,
_bstr_
(
"Model:name2"
)),
"got %s
\n
"
,
wine_dbgstr_w
(
str
));
SysFreeString
(
str
);
hr
=
IXMLDOMAttribute_get_prefix
(
attr
,
&
str
);
...
...
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