Module: wine Branch: master Commit: 7b8554b3b861563b7d23c8bc1881c162b666e79a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b8554b3b861563b7d23c8bc1...
Author: Andrey Gusev andrey.goosev@gmail.com Date: Thu May 30 13:52:36 2019 +0300
advapi32: Implement LookupAccountSidLocalA/W.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47286 Signed-off-by: Andrey Gusev andrey.goosev@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/advapi32/advapi32.spec | 2 ++ dlls/advapi32/security.c | 30 ++++++++++++++++++++++ .../api-ms-win-security-lsalookup-l1-1-0.spec | 4 +-- .../api-ms-win-security-lsalookup-l1-1-1.spec | 4 +-- include/winbase.h | 3 +++ 5 files changed, 39 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index a97161f..06c4f8f 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -430,6 +430,8 @@ @ stdcall LookupAccountNameA(str str ptr ptr ptr ptr ptr) @ stdcall LookupAccountNameW(wstr wstr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidA(ptr ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) @ stdcall LookupAccountSidW(ptr ptr ptr ptr ptr ptr ptr) @ stdcall LookupPrivilegeDisplayNameA(str str str ptr ptr) @ stdcall LookupPrivilegeDisplayNameW(wstr wstr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 8027434..2030ebf 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2316,6 +2316,21 @@ LookupAccountSidA( }
/****************************************************************************** + * LookupAccountSidLocalA [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalA( + PSID sid, + LPSTR account, + LPDWORD accountSize, + LPSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidA(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * LookupAccountSidW [ADVAPI32.@] * * PARAMS @@ -2492,6 +2507,21 @@ LookupAccountSidW( }
/****************************************************************************** + * LookupAccountSidLocalW [ADVAPI32.@] + */ +BOOL WINAPI +LookupAccountSidLocalW( + PSID sid, + LPWSTR account, + LPDWORD accountSize, + LPWSTR domain, + LPDWORD domainSize, + PSID_NAME_USE name_use ) +{ + return LookupAccountSidW(NULL, sid, account, accountSize, domain, domainSize, name_use); +} + +/****************************************************************************** * SetFileSecurityA [ADVAPI32.@] * * See SetFileSecurityW. diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec index 9b45265..6e9e6ed 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-0/api-ms-win-security-lsalookup-l1-1-0.spec @@ -1,7 +1,7 @@ @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec index 215c7b7..35a79f1 100644 --- a/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec +++ b/dlls/api-ms-win-security-lsalookup-l1-1-1/api-ms-win-security-lsalookup-l1-1-1.spec @@ -4,8 +4,8 @@ @ stub GetIdentityProviderInfoByName @ stub LookupAccountNameLocalA @ stub LookupAccountNameLocalW -@ stub LookupAccountSidLocalA -@ stub LookupAccountSidLocalW +@ stdcall LookupAccountSidLocalA(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalA +@ stdcall LookupAccountSidLocalW(ptr ptr ptr ptr ptr ptr) advapi32.LookupAccountSidLocalW @ stub LsaLookupClose @ stub LsaLookupFreeMemory @ stub LsaLookupGetDomainInfo diff --git a/include/winbase.h b/include/winbase.h index 8b2eb2c..44bfe98 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2430,6 +2430,9 @@ WINADVAPI BOOL WINAPI LookupAccountNameW(LPCWSTR,LPCWSTR,PSID,LPDWORD,LP WINADVAPI BOOL WINAPI LookupAccountSidA(LPCSTR,PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); WINADVAPI BOOL WINAPI LookupAccountSidW(LPCWSTR,PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); #define LookupAccountSid WINELIB_NAME_AW(LookupAccountSid) +WINADVAPI BOOL WINAPI LookupAccountSidLocalA(PSID,LPSTR,LPDWORD,LPSTR,LPDWORD,PSID_NAME_USE); +WINADVAPI BOOL WINAPI LookupAccountSidLocalW(PSID,LPWSTR,LPDWORD,LPWSTR,LPDWORD,PSID_NAME_USE); +#define LookupAccountSidLocal WINELIB_NAME_AW(LookupAccountSidLocal) WINBASEAPI BOOL WINAPI LocalFileTimeToFileTime(const FILETIME*,LPFILETIME); WINBASEAPI BOOL WINAPI LockFile(HANDLE,DWORD,DWORD,DWORD,DWORD); WINBASEAPI BOOL WINAPI LockFileEx(HANDLE, DWORD, DWORD, DWORD, DWORD, LPOVERLAPPED);