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
c1344662
Commit
c1344662
authored
Dec 26, 2014
by
Nikolay Sivov
Committed by
Alexandre Julliard
Dec 28, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Fix 'description' element parsing to allow empty elements.
parent
37c17979
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
4 deletions
+10
-4
actctx.c
dlls/kernel32/tests/actctx.c
+1
-0
actctx.c
dlls/ntdll/actctx.c
+9
-4
No files found.
dlls/kernel32/tests/actctx.c
View file @
c1344662
...
...
@@ -97,6 +97,7 @@ static const char manifest3[] =
"<assembly xmlns=
\"
urn:schemas-microsoft-com:asm.v1
\"
manifestVersion=
\"
1.0
\"
>"
"<assemblyIdentity version=
\"
1.2.3.4
\"
name=
\"
Wine.Test
\"
type=
\"
win32
\"
"
" publicKeyToken=
\"
6595b6414666f1df
\"
/>"
"<description />"
"<file name=
\"
testlib.dll
\"
>"
"<windowClass>wndClass</windowClass>"
" <comClass description=
\"
Test com class
\"
"
...
...
dlls/ntdll/actctx.c
View file @
c1344662
...
...
@@ -1834,11 +1834,16 @@ static BOOL parse_binding_redirect_elem(xmlbuf_t* xmlbuf)
static
BOOL
parse_description_elem
(
xmlbuf_t
*
xmlbuf
)
{
xmlstr_t
elem
,
content
;
BOOL
end
=
FALSE
,
ret
=
TRUE
;
xmlstr_t
elem
,
content
,
attr_name
,
attr_value
;
BOOL
end
=
FALSE
,
ret
=
TRUE
,
error
=
FALSE
;
if
(
!
parse_expect_no_attr
(
xmlbuf
,
&
end
)
||
end
||
!
parse_text_content
(
xmlbuf
,
&
content
))
while
(
next_xml_attr
(
xmlbuf
,
&
attr_name
,
&
attr_value
,
&
error
,
&
end
))
WARN
(
"unknown attr %s=%s
\n
"
,
debugstr_xmlstr
(
&
attr_name
),
debugstr_xmlstr
(
&
attr_value
));
if
(
error
)
return
FALSE
;
if
(
end
)
return
TRUE
;
if
(
!
parse_text_content
(
xmlbuf
,
&
content
))
return
FALSE
;
TRACE
(
"Got description %s
\n
"
,
debugstr_xmlstr
(
&
content
));
...
...
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