Module: wine Branch: master Commit: d2f0bc2f74b7899aac4308d0a886d0447ab6b32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2f0bc2f74b7899aac4308d0a8...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Fri Oct 9 18:21:21 2015 +0800
advapi32: Add CreatePrivateObjectSecurityWithMultipleInheritance semi-stub.
Signed-off-by: Dmitry Timoshkov dmitry@baikal.ru Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/advapi32/advapi32.spec | 2 +- dlls/advapi32/security.c | 8 ++++++++ .../api-ms-win-downlevel-advapi32-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-1-0.spec | 2 +- .../api-ms-win-security-base-l1-2-0.spec | 2 +- include/winbase.h | 1 + 6 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec index 8b1c0d5..ff2b0de 100644 --- a/dlls/advapi32/advapi32.spec +++ b/dlls/advapi32/advapi32.spec @@ -121,7 +121,7 @@ # @ stub CreateCodeAuthzLevel @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) # @ stub CreatePrivateObjectSecurityEx -# @ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) @ stdcall CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) # @ stub CreateProcessAsUserSecure @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index e8f64d5..00dafe8 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -5296,6 +5296,14 @@ BOOL WINAPI CreatePrivateObjectSecurity( return TRUE; }
+BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance( + PSECURITY_DESCRIPTOR parent, PSECURITY_DESCRIPTOR creator, PSECURITY_DESCRIPTOR *out, + GUID **types, ULONG count, BOOL is_container, ULONG flags, HANDLE token, PGENERIC_MAPPING mapping) +{ + FIXME(": semi-stub\n"); + return CreatePrivateObjectSecurity(parent, creator, out, is_container, token, mapping); +} + BOOL WINAPI DestroyPrivateObjectSecurity( PSECURITY_DESCRIPTOR* ObjectDescriptor ) { FIXME("%p - stub\n", ObjectDescriptor); diff --git a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec index 130f285..4105e59 100644 --- a/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec +++ b/dlls/api-ms-win-downlevel-advapi32-l1-1-0/api-ms-win-downlevel-advapi32-l1-1-0.spec @@ -27,7 +27,7 @@ @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stub CreatePrivateObjectSecurityEx -@ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) advapi32.CreateProcessAsUserW @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid 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 edae6d1..a44f5b8 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 @@ -27,7 +27,7 @@ @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stub CreatePrivateObjectSecurityEx -@ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid @ stdcall DeleteAce(ptr long) advapi32.DeleteAce 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 e19fe53..02e3b9a 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 @@ -31,7 +31,7 @@ @ stdcall CopySid(long ptr ptr) advapi32.CopySid @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) advapi32.CreatePrivateObjectSecurity @ stub CreatePrivateObjectSecurityEx -@ stub CreatePrivateObjectSecurityWithMultipleInheritance +@ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) advapi32.CreatePrivateObjectSecurityWithMultipleInheritance @ stdcall CreateRestrictedToken(long long long ptr long ptr long ptr ptr) advapi32.CreateRestrictedToken @ stdcall CreateWellKnownSid(long ptr ptr ptr) advapi32.CreateWellKnownSid @ stdcall DeleteAce(ptr long) advapi32.DeleteAce diff --git a/include/winbase.h b/include/winbase.h index b42bc0d..dd320c2 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1771,6 +1771,7 @@ WINBASEAPI HANDLE WINAPI CreateNamedPipeW(LPCWSTR,DWORD,DWORD,DWORD,DWORD,D #define CreateNamedPipe WINELIB_NAME_AW(CreateNamedPipe) WINBASEAPI BOOL WINAPI CreatePipe(PHANDLE,PHANDLE,LPSECURITY_ATTRIBUTES,DWORD); WINADVAPI BOOL WINAPI CreatePrivateObjectSecurity(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,BOOL,HANDLE,PGENERIC_MAPPING); +WINADVAPI BOOL WINAPI CreatePrivateObjectSecurityWithMultipleInheritance(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR*,GUID**,ULONG,BOOL,ULONG,HANDLE,PGENERIC_MAPPING); WINBASEAPI PTP_POOL WINAPI CreateThreadpool(PVOID); WINBASEAPI PTP_WORK WINAPI CreateThreadpoolWork(PTP_WORK_CALLBACK,PVOID,PTP_CALLBACK_ENVIRON); WINBASEAPI BOOL WINAPI CreateProcessA(LPCSTR,LPSTR,LPSECURITY_ATTRIBUTES,LPSECURITY_ATTRIBUTES,BOOL,DWORD,LPVOID,LPCSTR,LPSTARTUPINFOA,LPPROCESS_INFORMATION);