Module: wine Branch: master Commit: c27ee58420b08db8f116548637b19348870ff8d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c27ee58420b08db8f11654863...
Author: Nikita Morozkin nmzikcs@gmail.com Date: Thu Sep 26 14:01:28 2019 -0400
advapi32: Stub SetPrivateObjectSecurityEx().
Signed-off-by: Nikita Morozkin nmzikcs@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/advapi32/advapi32.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 11 +++++++++++ include/winbase.h | 1 + 6 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 3db5612c61..54b479dc5d 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -749,7 +749,7 @@ # @ stub SetNamedSecurityInfoExW @ stdcall SetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr) @ stdcall -import SetPrivateObjectSecurity(long ptr ptr ptr long) -# @ stub SetPrivateObjectSecurityEx +@ stdcall -import SetPrivateObjectSecurityEx(long ptr ptr long ptr long) # @ stub SetSecurityAccessMask @ stdcall -import SetSecurityDescriptorControl(ptr long long) @ stdcall -import SetSecurityDescriptorDacl(ptr long ptr long) diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec index b831e873f8..097c313303 100644 --- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec +++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec @@ -86,7 +86,7 @@ @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity -@ stub SetPrivateObjectSecurityEx +@ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) advapi32.SetPrivateObjectSecurityEx @ stub SetSecurityAccessMask @ stdcall SetSecurityDescriptorControl(ptr long long) advapi32.SetSecurityDescriptorControl @ stdcall SetSecurityDescriptorDacl(ptr long ptr long) advapi32.SetSecurityDescriptorDacl diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec index 93472ac6c8..b80ce69360 100644 --- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec +++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec @@ -91,7 +91,7 @@ @ stdcall SetFileSecurityW(wstr long ptr) advapi32.SetFileSecurityW @ stdcall SetKernelObjectSecurity(long long ptr) advapi32.SetKernelObjectSecurity @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) advapi32.SetPrivateObjectSecurity -@ stub SetPrivateObjectSecurityEx +@ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) advapi32.SetPrivateObjectSecurityEx @ stub SetSecurityAccessMask @ stdcall SetSecurityDescriptorControl(ptr long long) advapi32.SetSecurityDescriptorControl @ stdcall SetSecurityDescriptorDacl(ptr long ptr long) advapi32.SetSecurityDescriptorDacl diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b582b3d092..7d86399af5 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1451,7 +1451,7 @@ @ stdcall SetNamedPipeHandleState(long ptr ptr ptr) @ stdcall SetPriorityClass(long long) @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long) -@ stub SetPrivateObjectSecurityEx +@ stdcall SetPrivateObjectSecurityEx(long ptr ptr long ptr long) @ stdcall SetProcessAffinityUpdateMode(long long) # @ stub SetProcessDefaultCpuSets # @ stub SetProcessGroupAffinity diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 34734b566c..327172c236 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -1151,6 +1151,17 @@ BOOL WINAPI SetPrivateObjectSecurity( SECURITY_INFORMATION info, PSECURITY_DESCR return TRUE; }
+/************************************************************************* + * SetPrivateObjectSecurityEx (kernelbase.@) + */ +BOOL WINAPI SetPrivateObjectSecurityEx( SECURITY_INFORMATION info, PSECURITY_DESCRIPTOR descr, + PSECURITY_DESCRIPTOR *obj_descr, ULONG flags, + PGENERIC_MAPPING mapping, HANDLE token ) +{ + FIXME( "0x%08x %p %p %u %p %p - stub\n", info, descr, obj_descr, flags, mapping, token ); + return TRUE; +} + /****************************************************************************** * SetSecurityDescriptorControl (kernelbase.@) */ diff --git a/include/winbase.h b/include/winbase.h index 83a09d8473..90179b3d85 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2654,6 +2654,7 @@ WINBASEAPI BOOL WINAPI SetMailslotInfo(HANDLE,DWORD); WINBASEAPI BOOL WINAPI SetNamedPipeHandleState(HANDLE,LPDWORD,LPDWORD,LPDWORD); WINBASEAPI BOOL WINAPI SetPriorityClass(HANDLE,DWORD); WINADVAPI BOOL WINAPI SetPrivateObjectSecurity(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,PGENERIC_MAPPING,HANDLE); +WINADVAPI BOOL WINAPI SetPrivateObjectSecurityEx(SECURITY_INFORMATION,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,ULONG,PGENERIC_MAPPING,HANDLE); WINBASEAPI BOOL WINAPI SetProcessAffinityMask(HANDLE,DWORD_PTR); WINBASEAPI BOOL WINAPI SetProcessPriorityBoost(HANDLE,BOOL); WINBASEAPI BOOL WINAPI SetProcessShutdownParameters(DWORD,DWORD);