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
33bc90e6
Commit
33bc90e6
authored
Nov 12, 2021
by
Dmitry Timoshkov
Committed by
Alexandre Julliard
Nov 12, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Return correct status when manifest could not be loaded from file.
Signed-off-by:
Dmitry Timoshkov
<
dmitry@baikal.ru
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
6e754202
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
2 deletions
+1
-2
actctx.c
dlls/kernel32/tests/actctx.c
+0
-1
actctx.c
dlls/ntdll/actctx.c
+1
-1
No files found.
dlls/kernel32/tests/actctx.c
View file @
33bc90e6
...
...
@@ -2683,7 +2683,6 @@ todo_wine
SetLastError
(
0xdeadbeef
);
handle
=
CreateActCtxA
(
&
actctx
);
ok
(
handle
==
INVALID_HANDLE_VALUE
,
"got handle %p
\n
"
,
handle
);
todo_wine
ok
(
GetLastError
()
==
ERROR_RESOURCE_NAME_NOT_FOUND
,
"got error %d
\n
"
,
GetLastError
());
/* load manifest from lpAssemblyDirectory directory */
...
...
dlls/ntdll/actctx.c
View file @
33bc90e6
...
...
@@ -3020,7 +3020,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl,
status
=
get_manifest_in_manifest_file
(
acl
,
ai
,
nameW
.
Buffer
,
directory
,
FALSE
,
file
);
NtClose
(
file
);
}
else
status
=
STATUS_RESOURCE_
TYP
E_NOT_FOUND
;
else
status
=
STATUS_RESOURCE_
NAM
E_NOT_FOUND
;
RtlFreeUnicodeString
(
&
nameW
);
return
status
;
}
...
...
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