From 25102d6b25b27bed8ac4118642c8efbaab83967d Mon Sep 17 00:00:00 2001 From: Stefan Leichter Date: Tue, 29 Mar 2005 11:31:18 +0000 Subject: [PATCH] Fix GetFileSecurityW for not existing directories/files. --- dlls/advapi32/security.c | 3 +++ dlls/advapi32/tests/security.c | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 993f49b0d5b..94e8f914925 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -1323,6 +1323,9 @@ GetFileSecurityW( LPCWSTR lpFileName, DWORD iLocNow; SECURITY_DESCRIPTOR_RELATIVE *pSDRelative; + if(INVALID_FILE_ATTRIBUTES == GetFileAttributesW(lpFileName)) + return FALSE; + FIXME("(%s) : returns fake SECURITY_DESCRIPTOR\n", debugstr_w(lpFileName) ); nNeeded = sizeof(SECURITY_DESCRIPTOR_RELATIVE); diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 71338f07c89..5e17045a1cf 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -425,8 +425,9 @@ static void test_FileSecurity(void) SetLastError(NO_ERROR); result = pGetFileSecurityA( directory,OWNER_SECURITY_INFORMATION,buffer,0x40,&outSize); - todo_wine ok(!result, "GetFileSecurityA should fail for not existing directories\n"); - todo_wine ok( GetLastError() == ERROR_FILE_NOT_FOUND, "ERROR_FILE_NOT_FOUND expected\n"); + ok(!result, "GetFileSecurityA should fail for not existing directories/files\n"); + ok( GetLastError() == ERROR_FILE_NOT_FOUND, + "last error ERROR_FILE_NOT_FOUND expected, got %ld\n", GetLastError()); } START_TEST(security)