[PATCH v3 1/9] kernel32: Implement CreateBoundaryDescriptorA.
Needed for IE11. Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- v2: - Use static sized buffer for name. - Create new security file in kernel32. This function doesn't seem like it belongs in kernel_main and I didn't want to make a new file just for one function so I added all the relevant boundary descriptor functions. --- dlls/kernel32/Makefile.in | 1 + dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/security.c | 42 +++++++++++++++++++++++++++++++++++++ include/namespaceapi.h | 2 ++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 dlls/kernel32/security.c diff --git a/dlls/kernel32/Makefile.in b/dlls/kernel32/Makefile.in index 7e68a950b71..bda8d03e90c 100644 --- a/dlls/kernel32/Makefile.in +++ b/dlls/kernel32/Makefile.in @@ -23,6 +23,7 @@ C_SRCS = \ process.c \ profile.c \ resource.c \ + security.c \ sync.c \ tape.c \ thread.c \ diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 7db82db375d..e040fedab08 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -266,7 +266,7 @@ @ stdcall CopyLZFile(long long) LZCopy @ stdcall CreateActCtxA(ptr) @ stdcall -import CreateActCtxW(ptr) -# @ stub CreateBoundaryDescriptorA +@ stdcall CreateBoundaryDescriptorA(str long) @ stdcall -import CreateBoundaryDescriptorW(wstr long) @ stdcall -import CreateConsoleScreenBuffer(long long ptr long ptr) @ stdcall -import CreateDirectoryA(str ptr) diff --git a/dlls/kernel32/security.c b/dlls/kernel32/security.c new file mode 100644 index 00000000000..ec8a348e1a2 --- /dev/null +++ b/dlls/kernel32/security.c @@ -0,0 +1,42 @@ +/* + * Kernel32 security functions + * + * Copyright (C) 2022 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#include "windef.h" +#include "winbase.h" +#include "winnls.h" + +/****************************************************************************** + * CreateBoundaryDescriptorA (KERNEL32.@) + */ +HANDLE WINAPI CreateBoundaryDescriptorA( LPCSTR name, ULONG flags ) +{ + WCHAR buffer[MAX_PATH]; + + if (!name) return CreateBoundaryDescriptorW( NULL, flags ); + + if (!MultiByteToWideChar( CP_ACP, 0, name, -1, buffer, MAX_PATH )) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return 0; + } + return CreateBoundaryDescriptorW( buffer, flags ); +} diff --git a/include/namespaceapi.h b/include/namespaceapi.h index 9446806f82e..f219a2a7488 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -27,7 +27,9 @@ extern "C" { WINBASEAPI BOOL WINAPI AddSIDToBoundaryDescriptor(HANDLE*,PSID); WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); +WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorA(LPCSTR,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); +#define CreateBoundaryDescriptor WINELIB_NAME_AW(CreateBoundaryDescriptor) WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); -- 2.35.1
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../api-ms-win-core-namespace-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec index a47682fc9b9..15386ac841c 100644 --- a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec +++ b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec @@ -1,6 +1,6 @@ @ stub AddSIDToBoundaryDescriptor @ stub ClosePrivateNamespace @ stdcall CreateBoundaryDescriptorW(wstr long) kernelbase.CreateBoundaryDescriptorW -@ stub CreatePrivateNamespaceW +@ stdcall CreatePrivateNamespaceW(ptr ptr wstr) kernelbase.CreatePrivateNamespaceW @ stub DeleteBoundaryDescriptor @ stub OpenPrivateNamespaceW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b038aa23704..0e7ca8a69f8 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -309,7 +309,7 @@ # @ stub CreateNlsSecurityDescriptor @ stdcall -import CreatePipe(ptr ptr ptr long) # @ stub CreatePrivateNamespaceA -# @ stub CreatePrivateNamespaceW +@ stdcall -import CreatePrivateNamespaceW(ptr ptr wstr) @ stdcall -import CreateProcessA(str str ptr ptr long long ptr str ptr ptr) @ stdcall -import CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) @ stdcall -import CreateProcessAsUserW(long wstr wstr ptr ptr long long ptr wstr ptr ptr) diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index c1175af2f9f..3692117a5cc 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -204,7 +204,7 @@ @ stdcall CreateMutexW(ptr long wstr) @ stdcall CreateNamedPipeW(wstr long long long long long long ptr) @ stdcall CreatePipe(ptr ptr ptr long) -# @ stub CreatePrivateNamespaceW +@ stdcall CreatePrivateNamespaceW(ptr ptr wstr) @ stdcall CreatePrivateObjectSecurity(ptr ptr ptr long long ptr) @ stdcall CreatePrivateObjectSecurityEx(ptr ptr ptr ptr long long long ptr) @ stdcall CreatePrivateObjectSecurityWithMultipleInheritance(ptr ptr ptr ptr long long long long ptr) diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index 26878982b6f..a20b20f32a8 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -931,6 +931,15 @@ HANDLE WINAPI CreateBoundaryDescriptorW( LPCWSTR name, ULONG flags ) return NULL; } +/****************************************************************************** + * CreatePrivateNamespaceW (kernelbase.@) + */ +HANDLE WINAPI CreatePrivateNamespaceW( LPSECURITY_ATTRIBUTES attr, LPVOID descr, LPCWSTR prefix ) +{ + FIXME( "%p %p %s - stub\n", attr, descr, debugstr_w(prefix) ); + return NULL; +} + /****************************************************************************** * CreatePrivateObjectSecurity (kernelbase.@) */ -- 2.35.1
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- .../api-ms-win-core-namespace-l1-1-0.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/security.c | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec index 15386ac841c..91d6b20b2bc 100644 --- a/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec +++ b/dlls/api-ms-win-core-namespace-l1-1-0/api-ms-win-core-namespace-l1-1-0.spec @@ -3,4 +3,4 @@ @ stdcall CreateBoundaryDescriptorW(wstr long) kernelbase.CreateBoundaryDescriptorW @ stdcall CreatePrivateNamespaceW(ptr ptr wstr) kernelbase.CreatePrivateNamespaceW @ stub DeleteBoundaryDescriptor -@ stub OpenPrivateNamespaceW +@ stdcall OpenPrivateNamespaceW(ptr wstr) kernelbase.OpenPrivateNamespaceW diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0e7ca8a69f8..dc7253786c0 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1136,7 +1136,7 @@ @ stdcall OpenMutexA(long long str) @ stdcall -import OpenMutexW(long long wstr) # @ stub OpenPrivateNamespaceA -# @ stub OpenPrivateNamespaceW +@ stdcall -import OpenPrivateNamespaceW(ptr wstr) @ stdcall -import OpenProcess(long long long) @ stdcall -import OpenProcessToken(long long ptr) @ stdcall OpenProfileUserMapping() diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 3692117a5cc..4444e7da5af 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1020,7 +1020,7 @@ @ stdcall OpenMutexW(long long wstr) # @ stub OpenPackageInfoByFullName # @ stub OpenPackageInfoByFullNameForUser -# @ stub OpenPrivateNamespaceW +@ stdcall OpenPrivateNamespaceW(ptr wstr) @ stdcall OpenProcess(long long long) @ stdcall OpenProcessToken(long long ptr) @ stub OpenRegKey diff --git a/dlls/kernelbase/security.c b/dlls/kernelbase/security.c index a20b20f32a8..70fbe435475 100644 --- a/dlls/kernelbase/security.c +++ b/dlls/kernelbase/security.c @@ -1200,6 +1200,15 @@ BOOL WINAPI MakeSelfRelativeSD( PSECURITY_DESCRIPTOR abs_descr, PSECURITY_DESCRI return set_ntstatus( RtlMakeSelfRelativeSD( abs_descr, rel_descr, len )); } +/****************************************************************************** + * OpenPrivateNamespaceW (kernelbase.@) + */ +HANDLE WINAPI OpenPrivateNamespaceW( LPVOID descr, LPCWSTR prefix ) +{ + FIXME( "%p %s - stub\n", descr, debugstr_w(prefix) ); + return NULL; +} + /****************************************************************************** * SetFileSecurityW (kernelbase.@) */ -- 2.35.1
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/security.c | 17 +++++++++++++++++ include/namespaceapi.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index c108272f1b1..df340fa4d21 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -308,7 +308,7 @@ @ stdcall -import CreateNamedPipeW(wstr long long long long long long ptr) # @ stub CreateNlsSecurityDescriptor @ stdcall -import CreatePipe(ptr ptr ptr long) -# @ stub CreatePrivateNamespaceA +@ stdcall CreatePrivateNamespaceA(ptr ptr str) @ stdcall -import CreatePrivateNamespaceW(ptr ptr wstr) @ stdcall -import CreateProcessA(str str ptr ptr long long ptr str ptr ptr) @ stdcall -import CreateProcessAsUserA(long str str ptr ptr long long ptr str ptr ptr) diff --git a/dlls/kernel32/security.c b/dlls/kernel32/security.c index ec8a348e1a2..a75d5c2b67a 100644 --- a/dlls/kernel32/security.c +++ b/dlls/kernel32/security.c @@ -40,3 +40,20 @@ HANDLE WINAPI CreateBoundaryDescriptorA( LPCSTR name, ULONG flags ) } return CreateBoundaryDescriptorW( buffer, flags ); } + +/****************************************************************************** + * CreatePrivateNamespaceA (KERNEL32.@) + */ +HANDLE WINAPI CreatePrivateNamespaceA( LPSECURITY_ATTRIBUTES attr, LPVOID descr, LPCSTR prefix ) +{ + WCHAR buffer[MAX_PATH]; + + if (!prefix) return CreatePrivateNamespaceW( attr, descr, NULL ); + + if (!MultiByteToWideChar( CP_ACP, 0, prefix, -1, buffer, MAX_PATH )) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return 0; + } + return CreatePrivateNamespaceW( attr, descr, buffer ); +} diff --git a/include/namespaceapi.h b/include/namespaceapi.h index f219a2a7488..6b3198b67c6 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -30,7 +30,9 @@ WINBASEAPI BOOLEAN WINAPI ClosePrivateNamespace(HANDLE,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorA(LPCSTR,ULONG); WINBASEAPI HANDLE WINAPI CreateBoundaryDescriptorW(LPCWSTR,ULONG); #define CreateBoundaryDescriptor WINELIB_NAME_AW(CreateBoundaryDescriptor) +WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceA(LPSECURITY_ATTRIBUTES,LPVOID,LPCSTR); WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); +#define CreatePrivateNamespace WINELIB_NAME_AW(CreatePrivateNamespace) WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); -- 2.35.1
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/security.c | 17 +++++++++++++++++ include/namespaceapi.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index df340fa4d21..0bf462f1c30 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1135,7 +1135,7 @@ @ stdcall OpenJobObjectW(long long wstr) @ stdcall OpenMutexA(long long str) @ stdcall -import OpenMutexW(long long wstr) -# @ stub OpenPrivateNamespaceA +@ stdcall OpenPrivateNamespaceA(ptr str) @ stdcall -import OpenPrivateNamespaceW(ptr wstr) @ stdcall -import OpenProcess(long long long) @ stdcall -import OpenProcessToken(long long ptr) diff --git a/dlls/kernel32/security.c b/dlls/kernel32/security.c index a75d5c2b67a..8763398265c 100644 --- a/dlls/kernel32/security.c +++ b/dlls/kernel32/security.c @@ -57,3 +57,20 @@ HANDLE WINAPI CreatePrivateNamespaceA( LPSECURITY_ATTRIBUTES attr, LPVOID descr, } return CreatePrivateNamespaceW( attr, descr, buffer ); } + +/****************************************************************************** + * OpenPrivateNamespaceA (KERNEL32.@) + */ +HANDLE WINAPI OpenPrivateNamespaceA( LPVOID descr, LPCSTR prefix ) +{ + WCHAR buffer[MAX_PATH]; + + if (!prefix) return OpenPrivateNamespaceW( descr, NULL ); + + if (!MultiByteToWideChar( CP_ACP, 0, prefix, -1, buffer, MAX_PATH )) + { + SetLastError( ERROR_FILENAME_EXCED_RANGE ); + return 0; + } + return OpenPrivateNamespaceW( descr, NULL ); +} diff --git a/include/namespaceapi.h b/include/namespaceapi.h index 6b3198b67c6..2210edea17a 100644 --- a/include/namespaceapi.h +++ b/include/namespaceapi.h @@ -34,7 +34,9 @@ WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceA(LPSECURITY_ATTRIBUTES,LPVOID,L WINBASEAPI HANDLE WINAPI CreatePrivateNamespaceW(LPSECURITY_ATTRIBUTES,LPVOID,LPCWSTR); #define CreatePrivateNamespace WINELIB_NAME_AW(CreatePrivateNamespace) WINBASEAPI void WINAPI DeleteBoundaryDescriptor(HANDLE); +WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceA(LPVOID,LPCSTR); WINBASEAPI HANDLE WINAPI OpenPrivateNamespaceW(LPVOID,LPCWSTR); +#define OpenPrivateNamespace WINELIB_NAME_AW(OpenPrivateNamespace) #ifdef __cplusplus } -- 2.35.1
Signed-off-by: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> --- dlls/kernel32/kernel32.spec | 2 +- dlls/kernel32/security.c | 13 +++++++++++++ include/winbase.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index f6ff2e647e7..bb9e2b765f4 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -141,7 +141,7 @@ @ stdcall -import AddConsoleAliasA(str str str) @ stdcall -import AddConsoleAliasW(wstr wstr wstr) @ stdcall -import AddDllDirectory(wstr) -# @ stub AddIntegrityLabelToBoundaryDescriptor +@ stdcall AddIntegrityLabelToBoundaryDescriptor(ptr ptr) # @ stub AddLocalAlternateComputerNameA # @ stub AddLocalAlternateComputerNameW @ stdcall -import AddRefActCtx(ptr) diff --git a/dlls/kernel32/security.c b/dlls/kernel32/security.c index 8763398265c..1fa6d060829 100644 --- a/dlls/kernel32/security.c +++ b/dlls/kernel32/security.c @@ -24,6 +24,19 @@ #include "winbase.h" #include "winnls.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(security); + +/****************************************************************************** + * AddIntegrityLabelToBoundaryDescriptor (KERNEL32.@) + */ +BOOL WINAPI AddIntegrityLabelToBoundaryDescriptor( HANDLE *descr, PSID label ) +{ + FIXME( "(%p %p)- stub\n", descr, label ); + return TRUE; +} + /****************************************************************************** * CreateBoundaryDescriptorA (KERNEL32.@) */ diff --git a/include/winbase.h b/include/winbase.h index a0c62d710b9..f8064e3ac1c 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -1782,6 +1782,7 @@ WINADVAPI BOOL WINAPI AccessCheckAndAuditAlarmW(LPCWSTR,LPVOID,LPWSTR,LP WINADVAPI BOOL WINAPI AccessCheckByType(PSECURITY_DESCRIPTOR,PSID,HANDLE,DWORD,POBJECT_TYPE_LIST,DWORD,PGENERIC_MAPPING,PPRIVILEGE_SET,LPDWORD,LPDWORD,LPBOOL); WINBASEAPI VOID WINAPI AcquireSRWLockExclusive(PSRWLOCK); WINBASEAPI VOID WINAPI AcquireSRWLockShared(PSRWLOCK); +WINBASEAPI BOOL WINAPI AddIntegrityLabelToBoundaryDescriptor(HANDLE*,PSID); WINADVAPI BOOL WINAPI AdjustTokenPrivileges(HANDLE,BOOL,PTOKEN_PRIVILEGES,DWORD,PTOKEN_PRIVILEGES,PDWORD); WINADVAPI BOOL WINAPI AllocateAndInitializeSid(PSID_IDENTIFIER_AUTHORITY,BYTE,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,PSID *); WINADVAPI BOOL WINAPI AllocateLocallyUniqueId(PLUID); -- 2.35.1
Sent the wrong patch for this stub. Sorry about that. This one should work. (hopefully) -- Kind regards, Mohamad
participants (1)
-
Mohamad Al-Jaf