Module: wine Branch: master Commit: aa4ebeb57c66c8a98cf50c9ce7f7e47cf88d1271 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa4ebeb57c66c8a98cf50c9ce7...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Dec 30 00:25:38 2013 +0400
ntdll: Fix return value when failed to locate resource.
---
dlls/kernel32/tests/actctx.c | 1 - dlls/ntdll/actctx.c | 2 +- 2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index 9894568..ab655c0 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -2146,7 +2146,6 @@ todo_wine SetLastError(0xdeadbeef); handle = pCreateActCtxA(&actctx); ok(handle == INVALID_HANDLE_VALUE, "got handle %p\n", handle); -todo_wine ok(GetLastError() == ERROR_RESOURCE_TYPE_NOT_FOUND, "got error %d\n", GetLastError()); }
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 68dd7ec..962a4e5 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2633,7 +2633,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_DATA_NOT_FOUND; + else status = STATUS_RESOURCE_TYPE_NOT_FOUND; RtlFreeUnicodeString( &nameW ); return status; }