[PATCH 2/2] ntdll: Return correct status when manifest could not be loaded from file.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 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;
 }
-- 
2.33.1

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=101821

Your paranoid android.


=== debiant2 (64 bit WoW report) ===

ntdll:
change.c:277: Test failed: should be ready