Dmitry Timoshkov : ntdll: Return correct status when manifest could not be loaded from file.
Alexandre Julliard
julliard at winehq.org
Fri Nov 12 16:16:04 CST 2021
Module: wine
Branch: master
Commit: 33bc90e6873f9663550964df1e2f49515d9c5580
URL: https://source.winehq.org/git/wine.git/?a=commit;h=33bc90e6873f9663550964df1e2f49515d9c5580
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Fri Nov 12 16:49:49 2021 +0300
ntdll: Return correct status when manifest could not be loaded from file.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/kernel32/tests/actctx.c | 1 -
dlls/ntdll/actctx.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index adf2549bece..e103dfdcf2b 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -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 */
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index f9afb655885..ca38f37e673 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -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_TYPE_NOT_FOUND;
+ else status = STATUS_RESOURCE_NAME_NOT_FOUND;
RtlFreeUnicodeString( &nameW );
return status;
}
More information about the wine-cvs
mailing list