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
d3ce5fff
Commit
d3ce5fff
authored
Oct 20, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 20, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll/actctx: Handle empty <dependency> element.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
72016888
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
0 deletions
+21
-0
actctx.c
dlls/kernel32/tests/actctx.c
+19
-0
actctx.c
dlls/ntdll/actctx.c
+2
-0
No files found.
dlls/kernel32/tests/actctx.c
View file @
d3ce5fff
...
...
@@ -290,6 +290,13 @@ static const char manifest10[] =
"</asmv2:trustInfo>"
"</assembly>"
;
/* Empty <dependency> element */
static
const
char
manifest11
[]
=
"<assembly xmlns=
\"
urn:schemas-microsoft-com:asm.v1
\"
xmlns:asmv2=
\"
urn:schemas-microsoft-com:asm.v2
\"
manifestVersion=
\"
1.0
\"
>"
"<assemblyIdentity version=
\"
1.0.0.0
\"
name=
\"
Wine.Test
\"
type=
\"
win32
\"
></assemblyIdentity>"
"<dependency />"
"</assembly>"
;
static
const
char
testdep_manifest1
[]
=
"<assembly xmlns=
\"
urn:schemas-microsoft-com:asm.v1
\"
manifestVersion=
\"
1.0
\"
>"
"<assemblyIdentity type=
\"
win32
\"
name=
\"
testdep
\"
version=
\"
6.5.4.3
\"
processorArchitecture=
\"
"
ARCH
"
\"
/>"
...
...
@@ -2240,6 +2247,18 @@ static void test_actctx(void)
else
skip
(
"Could not create manifest file 10
\n
"
);
if
(
create_manifest_file
(
"test11.manifest"
,
manifest11
,
-
1
,
NULL
,
NULL
))
{
handle
=
test_create
(
"test11.manifest"
);
ok
(
handle
!=
INVALID_HANDLE_VALUE
,
"Failed to create activation context for %s, error %u
\n
"
,
"manifest11"
,
GetLastError
());
DeleteFileA
(
"test11.manifest"
);
if
(
handle
!=
INVALID_HANDLE_VALUE
)
ReleaseActCtx
(
handle
);
}
else
skip
(
"Could not create manifest file 11
\n
"
);
trace
(
"manifest4
\n
"
);
if
(
!
create_manifest_file
(
"test4.manifest"
,
manifest4
,
-
1
,
NULL
,
NULL
))
{
...
...
dlls/ntdll/actctx.c
View file @
d3ce5fff
...
...
@@ -2307,6 +2307,8 @@ static void parse_dependency_elem( xmlbuf_t *xmlbuf, struct actctx_loader *acl,
}
}
if
(
end
)
return
;
while
(
next_xml_elem
(
xmlbuf
,
&
elem
,
parent
))
{
if
(
xml_elem_cmp
(
&
elem
,
dependentAssemblyW
,
asmv1W
))
...
...
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