Commit 33bc90e6 authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

ntdll: Return correct status when manifest could not be loaded from file.

parent 6e754202
...@@ -2683,7 +2683,6 @@ todo_wine ...@@ -2683,7 +2683,6 @@ todo_wine
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
handle = CreateActCtxA(&actctx); handle = CreateActCtxA(&actctx);
ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle);
todo_wine
ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "got error %d\n", GetLastError()); ok(GetLastError() == ERROR_RESOURCE_NAME_NOT_FOUND, "got error %d\n", GetLastError());
/* load manifest from lpAssemblyDirectory directory */ /* load manifest from lpAssemblyDirectory directory */
......
...@@ -3020,7 +3020,7 @@ static NTSTATUS get_manifest_in_associated_manifest( struct actctx_loader* acl, ...@@ -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 ); status = get_manifest_in_manifest_file( acl, ai, nameW.Buffer, directory, FALSE, file );
NtClose( file ); NtClose( file );
} }
else status = STATUS_RESOURCE_TYPE_NOT_FOUND; else status = STATUS_RESOURCE_NAME_NOT_FOUND;
RtlFreeUnicodeString( &nameW ); RtlFreeUnicodeString( &nameW );
return status; return status;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment