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
a81535d8
Commit
a81535d8
authored
Sep 13, 2023
by
Nikolay Sivov
Committed by
Alexandre Julliard
Sep 13, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll/actctx: Accept empty assembly elements.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
parent
a14c6b73
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
actctx.c
dlls/kernel32/tests/actctx.c
+0
-1
actctx.c
dlls/ntdll/actctx.c
+4
-1
No files found.
dlls/kernel32/tests/actctx.c
View file @
a81535d8
...
...
@@ -2521,7 +2521,6 @@ static void test_actctx(void)
/* Empty <assembly/> element. */
create_manifest_file
(
"empty_assembly.manifest"
,
empty_assembly_manifest
,
-
1
,
NULL
,
NULL
);
handle
=
test_create
(
"empty_assembly.manifest"
);
todo_wine
ok
(
handle
!=
INVALID_HANDLE_VALUE
,
"Failed to create activation context.
\n
"
);
DeleteFileA
(
"empty_assembly.manifest"
);
if
(
handle
!=
INVALID_HANDLE_VALUE
)
...
...
dlls/ntdll/actctx.c
View file @
a81535d8
...
...
@@ -2708,12 +2708,15 @@ static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly,
}
}
if
(
end
||
!
version
)
if
(
!
version
)
{
set_error
(
xmlbuf
);
return
;
}
if
(
end
)
return
;
while
(
next_xml_elem
(
xmlbuf
,
&
elem
,
parent
))
{
if
(
assembly
->
type
==
APPLICATION_MANIFEST
&&
xml_elem_cmp
(
&
elem
,
L"noInherit"
,
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