https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7ed4c1dd03a9d82f47708538daf829e8f68f9a82
commit 7ed4c1dd03a9d82f47708538daf829e8f68f9a82 Author: Amine Khaldi <[email protected]> AuthorDate: Thu Dec 7 23:34:28 2017 +0100 [ADVAPI32] Remove unused debug channels and comment out unused variables. Silences some clang-cl warnings. --- dll/win32/advapi32/misc/dllmain.c | 1 - dll/win32/advapi32/misc/unicode.c | 2 -- dll/win32/advapi32/sec/trustee.c | 2 -- dll/win32/advapi32/wine/security.c | 6 ++++++ 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dll/win32/advapi32/misc/dllmain.c b/dll/win32/advapi32/misc/dllmain.c index 7959cc2dd7..e914bc8b88 100644 --- a/dll/win32/advapi32/misc/dllmain.c +++ b/dll/win32/advapi32/misc/dllmain.c @@ -9,7 +9,6 @@ */ #include <advapi32.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); extern BOOL RegInitialize(VOID); extern BOOL RegCleanup(VOID); diff --git a/dll/win32/advapi32/misc/unicode.c b/dll/win32/advapi32/misc/unicode.c index b4e2ddb009..d9cebc5596 100644 --- a/dll/win32/advapi32/misc/unicode.c +++ b/dll/win32/advapi32/misc/unicode.c @@ -10,8 +10,6 @@ #include <advapi32.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); - /************************************************************************** * IsTextUnicode (ADVAPI32.@) * diff --git a/dll/win32/advapi32/sec/trustee.c b/dll/win32/advapi32/sec/trustee.c index a889cc9e6a..196cbd9832 100644 --- a/dll/win32/advapi32/sec/trustee.c +++ b/dll/win32/advapi32/sec/trustee.c @@ -6,8 +6,6 @@ */ #include <advapi32.h> -WINE_DEFAULT_DEBUG_CHANNEL(advapi); - /****************************************************************************** * BuildImpersonateTrusteeA [ADVAPI32.@] diff --git a/dll/win32/advapi32/wine/security.c b/dll/win32/advapi32/wine/security.c index 9b85eeef46..5885f5d738 100644 --- a/dll/win32/advapi32/wine/security.c +++ b/dll/win32/advapi32/wine/security.c @@ -120,7 +120,9 @@ static const WELLKNOWNRID WellKnownRids[] = { { {'R','S'}, WinAccountRasAndIasServersSid, DOMAIN_ALIAS_RID_RAS_SERVERS }, }; +#ifndef __REACTOS__ static const SID sidWorld = { SID_REVISION, 1, { SECURITY_WORLD_SID_AUTHORITY} , { SECURITY_WORLD_RID } }; +#endif static const WCHAR SDDL_NO_READ_UP[] = {'N','R',0}; static const WCHAR SDDL_NO_WRITE_UP[] = {'N','W',0}; @@ -131,13 +133,17 @@ static const WCHAR SDDL_NO_EXECUTE_UP[] = {'N','X',0}; */ static const WCHAR SDDL_ACCESS_ALLOWED[] = {'A',0}; static const WCHAR SDDL_ACCESS_DENIED[] = {'D',0}; +#ifndef __REACTOS__ static const WCHAR SDDL_OBJECT_ACCESS_ALLOWED[] = {'O','A',0}; static const WCHAR SDDL_OBJECT_ACCESS_DENIED[] = {'O','D',0}; +#endif static const WCHAR SDDL_AUDIT[] = {'A','U',0}; static const WCHAR SDDL_ALARM[] = {'A','L',0}; static const WCHAR SDDL_MANDATORY_LABEL[] = {'M','L',0}; +#ifndef __REACTOS__ static const WCHAR SDDL_OBJECT_AUDIT[] = {'O','U',0}; static const WCHAR SDDL_OBJECT_ALARM[] = {'O','L',0}; +#endif /* * SDDL ADS Rights
