From 446e13745c72d9874091b9a808f371cc737dc2bd Mon Sep 17 00:00:00 2001 From: Pierre Schweitzer Date: Sun, 30 Dec 2018 20:36:20 +0100 Subject: [PATCH] [ADVAPI32] Stop pretending our advapi32 is NT6+ This is wrong and messes up with internal structures (such as TEB). For the two needed functions which are "NT6+", they were exported with NT6, but already existed in W2K3 SP2. This might fix random bugs CORE-15526 --- dll/win32/advapi32/CMakeLists.txt | 3 --- dll/win32/advapi32/wine/security.c | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dll/win32/advapi32/CMakeLists.txt b/dll/win32/advapi32/CMakeLists.txt index ff7961c492f..744dc098a10 100644 --- a/dll/win32/advapi32/CMakeLists.txt +++ b/dll/win32/advapi32/CMakeLists.txt @@ -2,9 +2,6 @@ spec2def(advapi32.dll advapi32.spec ADD_IMPORTLIB) add_definitions(-D_ADVAPI32_) -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) - include_directories( ${REACTOS_SOURCE_DIR}/sdk/include/reactos/idl ${REACTOS_SOURCE_DIR}/sdk/include/reactos/drivers/ksecdd diff --git a/dll/win32/advapi32/wine/security.c b/dll/win32/advapi32/wine/security.c index 54dd595d49b..449cbd354b4 100644 --- a/dll/win32/advapi32/wine/security.c +++ b/dll/win32/advapi32/wine/security.c @@ -17,6 +17,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(advapi); static BOOL ParseStringSidToSid(LPCWSTR StringSid, PSID pSid, LPDWORD cBytes); +#ifdef __REACTOS__ +VOID WINAPI QuerySecurityAccessMask(SECURITY_INFORMATION,LPDWORD); +VOID WINAPI SetSecurityAccessMask(SECURITY_INFORMATION,LPDWORD); +#endif typedef struct _ACEFLAG {