From d974b427de07020508ce876e2d4944f36c5a3b8d Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Fri, 5 Aug 2005 10:31:28 +0000 Subject: [PATCH] #include "advapi32.h" -> #include svn path=/trunk/; revision=17068 --- reactos/lib/advapi32/advapi32.h | 29 ++++++++++++++--------- reactos/lib/advapi32/crypt/crypt.c | 2 +- reactos/lib/advapi32/crypt/crypt_des.c | 2 +- reactos/lib/advapi32/crypt/crypt_lmhash.c | 2 +- reactos/lib/advapi32/crypt/crypt_md4.c | 2 +- reactos/lib/advapi32/crypt/crypt_md5.c | 2 +- reactos/lib/advapi32/crypt/crypt_sha.c | 2 +- reactos/lib/advapi32/misc/dllmain.c | 2 +- reactos/lib/advapi32/misc/hwprofiles.c | 2 +- reactos/lib/advapi32/misc/logon.c | 2 +- reactos/lib/advapi32/misc/shutdown.c | 2 +- reactos/lib/advapi32/misc/sysfunc.c | 2 +- reactos/lib/advapi32/reg/reg.c | 2 +- reactos/lib/advapi32/sec/ac.c | 2 +- reactos/lib/advapi32/sec/audit.c | 2 +- reactos/lib/advapi32/sec/lsa.c | 2 +- reactos/lib/advapi32/sec/misc.c | 2 +- reactos/lib/advapi32/sec/sec.c | 2 +- reactos/lib/advapi32/sec/sid.c | 2 +- reactos/lib/advapi32/sec/trustee.c | 2 +- reactos/lib/advapi32/service/eventlog.c | 2 +- reactos/lib/advapi32/service/scm.c | 2 +- reactos/lib/advapi32/service/sctrl.c | 2 +- reactos/lib/advapi32/service/undoc.c | 2 +- reactos/lib/advapi32/token/privilege.c | 2 +- reactos/lib/advapi32/token/token.c | 2 +- 26 files changed, 43 insertions(+), 36 deletions(-) diff --git a/reactos/lib/advapi32/advapi32.h b/reactos/lib/advapi32/advapi32.h index c768773dd1b..59c518e2e02 100644 --- a/reactos/lib/advapi32/advapi32.h +++ b/reactos/lib/advapi32/advapi32.h @@ -31,16 +31,16 @@ typedef struct _NTMARTA { HINSTANCE hDllInstance; - PVOID LookupAccountTrustee; - PVOID LookupAccountName; - PVOID LookupAccountSid; - PVOID SetEntriesInAList; - PVOID ConvertAccessToSecurityDescriptor; - PVOID ConvertSDToAccess; - PVOID ConvertAclToAccess; - PVOID GetAccessForTrustee; - PVOID GetExplicitEntries; - + /* 2CC */PVOID LookupAccountTrustee; + /* 2D0 */PVOID LookupAccountName; + /* 2D4 */PVOID LookupAccountSid; + /* 2D8 */PVOID SetEntriesInAList; + /* 2DC */PVOID ConvertAccessToSecurityDescriptor; + /* 2E0 */PVOID ConvertSDToAccess; + /* 2E4 */PVOID ConvertAclToAccess; + /* 2E8 */PVOID GetAccessForTrustee; + /* 2EC */PVOID GetExplicitEntries; + /* 2F0 */ DWORD (STDCALL *RewriteGetNamedRights)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -50,11 +50,13 @@ typedef struct _NTMARTA PACL* ppSacl, PSECURITY_DESCRIPTOR* ppSecurityDescriptor); + /* 2F4 */ DWORD (STDCALL *RewriteSetNamedRights)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSECURITY_DESCRIPTOR pSecurityDescriptor); + /*2F8*/ DWORD (STDCALL *RewriteGetHandleRights)(HANDLE handle, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -64,20 +66,24 @@ typedef struct _NTMARTA PACL* ppSacl, PSECURITY_DESCRIPTOR* ppSecurityDescriptor); + /* 2FC */ DWORD (STDCALL *RewriteSetHandleRights)(HANDLE handle, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, PSECURITY_DESCRIPTOR pSecurityDescriptor); + /* 300 */ DWORD (STDCALL *RewriteSetEntriesInAcl)(ULONG cCountOfExplicitEntries, PEXPLICIT_ACCESS_W pListOfExplicitEntries, PACL OldAcl, PACL* NewAcl); + /* 304 */ DWORD (STDCALL *RewriteGetExplicitEntriesFromAcl)(PACL pacl, PULONG pcCountOfExplicitEntries, PEXPLICIT_ACCESS_W* pListOfExplicitEntries); + /* 308 */ DWORD (STDCALL *TreeResetNamedSecurityInfo)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -89,7 +95,7 @@ typedef struct _NTMARTA FN_PROGRESSW fnProgress, PROG_INVOKE_SETTING ProgressInvokeSetting, PVOID Args); - + /* 30C */ DWORD (STDCALL *GetInheritanceSource)(LPWSTR pObjectName, SE_OBJECT_TYPE ObjectType, SECURITY_INFORMATION SecurityInfo, @@ -101,6 +107,7 @@ typedef struct _NTMARTA PGENERIC_MAPPING pGenericMapping, PINHERITED_FROMW pInheritArray); + /* 310 */ DWORD (STDCALL *FreeIndexArray)(PINHERITED_FROMW pInheritArray, USHORT AceCnt, PFN_OBJECT_MGR_FUNCTS pfnArray OPTIONAL); diff --git a/reactos/lib/advapi32/crypt/crypt.c b/reactos/lib/advapi32/crypt/crypt.c index f4862251f44..7e396353892 100644 --- a/reactos/lib/advapi32/crypt/crypt.c +++ b/reactos/lib/advapi32/crypt/crypt.c @@ -25,7 +25,7 @@ * - Signature checking */ -#include "advapi32.h" +#include #include "crypt.h" #define NDEBUG diff --git a/reactos/lib/advapi32/crypt/crypt_des.c b/reactos/lib/advapi32/crypt/crypt_des.c index 875d6b3c881..3c9b1d58eab 100644 --- a/reactos/lib/advapi32/crypt/crypt_des.c +++ b/reactos/lib/advapi32/crypt/crypt_des.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include #include "crypt.h" static const unsigned char InitialPermuteMap[64] = diff --git a/reactos/lib/advapi32/crypt/crypt_lmhash.c b/reactos/lib/advapi32/crypt/crypt_lmhash.c index e4d04cc3f62..14ee05c3e15 100644 --- a/reactos/lib/advapi32/crypt/crypt_lmhash.c +++ b/reactos/lib/advapi32/crypt/crypt_lmhash.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include #include "crypt.h" diff --git a/reactos/lib/advapi32/crypt/crypt_md4.c b/reactos/lib/advapi32/crypt/crypt_md4.c index b230a87a41d..c3a98c73b90 100644 --- a/reactos/lib/advapi32/crypt/crypt_md4.c +++ b/reactos/lib/advapi32/crypt/crypt_md4.c @@ -33,7 +33,7 @@ * will fill a supplied 16-byte array with the digest. */ -#include "advapi32.h" +#include #include "crypt.h" diff --git a/reactos/lib/advapi32/crypt/crypt_md5.c b/reactos/lib/advapi32/crypt/crypt_md5.c index ae17174f6f7..91d2e9eec37 100644 --- a/reactos/lib/advapi32/crypt/crypt_md5.c +++ b/reactos/lib/advapi32/crypt/crypt_md5.c @@ -33,7 +33,7 @@ * will fill a supplied 16-byte array with the digest. */ -#include "advapi32.h" +#include #include "crypt.h" diff --git a/reactos/lib/advapi32/crypt/crypt_sha.c b/reactos/lib/advapi32/crypt/crypt_sha.c index 40b79afb789..4eada865081 100644 --- a/reactos/lib/advapi32/crypt/crypt_sha.c +++ b/reactos/lib/advapi32/crypt/crypt_sha.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include #include "crypt.h" diff --git a/reactos/lib/advapi32/misc/dllmain.c b/reactos/lib/advapi32/misc/dllmain.c index 47fcb6acbeb..26639426b1d 100644 --- a/reactos/lib/advapi32/misc/dllmain.c +++ b/reactos/lib/advapi32/misc/dllmain.c @@ -9,7 +9,7 @@ * Created ??? */ -#include "advapi32.h" +#include #define NDEBUG #include diff --git a/reactos/lib/advapi32/misc/hwprofiles.c b/reactos/lib/advapi32/misc/hwprofiles.c index de11372211e..ce3f58e8522 100644 --- a/reactos/lib/advapi32/misc/hwprofiles.c +++ b/reactos/lib/advapi32/misc/hwprofiles.c @@ -9,7 +9,7 @@ * 20042502 */ -#include "advapi32.h" +#include #include /****************************************************************************** diff --git a/reactos/lib/advapi32/misc/logon.c b/reactos/lib/advapi32/misc/logon.c index 97db084b306..eb95f8c7102 100644 --- a/reactos/lib/advapi32/misc/logon.c +++ b/reactos/lib/advapi32/misc/logon.c @@ -7,7 +7,7 @@ * PROGRAMMER: Eric Kohl */ -#include "advapi32.h" +#include #define NDEBUG #include diff --git a/reactos/lib/advapi32/misc/shutdown.c b/reactos/lib/advapi32/misc/shutdown.c index 49369dd3a66..b2c324c0bf8 100644 --- a/reactos/lib/advapi32/misc/shutdown.c +++ b/reactos/lib/advapi32/misc/shutdown.c @@ -10,7 +10,7 @@ * 19990515 EA */ -#include "advapi32.h" +#include #define USZ {0,0,0} diff --git a/reactos/lib/advapi32/misc/sysfunc.c b/reactos/lib/advapi32/misc/sysfunc.c index b2e6742d42e..c9dc3a07806 100644 --- a/reactos/lib/advapi32/misc/sysfunc.c +++ b/reactos/lib/advapi32/misc/sysfunc.c @@ -10,7 +10,7 @@ * 19990415 EA */ -#include "advapi32.h" +#include /********************************************************************** * SystemFunction001 diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c index 73557148ba9..2073dd7f106 100644 --- a/reactos/lib/advapi32/reg/reg.c +++ b/reactos/lib/advapi32/reg/reg.c @@ -13,7 +13,7 @@ /* INCLUDES *****************************************************************/ -#include "advapi32.h" +#include #define NDEBUG #include diff --git a/reactos/lib/advapi32/sec/ac.c b/reactos/lib/advapi32/sec/ac.c index 3868b9de98a..e5892e70291 100644 --- a/reactos/lib/advapi32/sec/ac.c +++ b/reactos/lib/advapi32/sec/ac.c @@ -6,7 +6,7 @@ * PURPOSE: ACL/ACE functions */ -#include "advapi32.h" +#include #define NDEBUG #include diff --git a/reactos/lib/advapi32/sec/audit.c b/reactos/lib/advapi32/sec/audit.c index 380cd75b301..61fb41f114b 100644 --- a/reactos/lib/advapi32/sec/audit.c +++ b/reactos/lib/advapi32/sec/audit.c @@ -11,7 +11,7 @@ /* INCLUDES *****************************************************************/ -#include "advapi32.h" +#include /* FUNCTIONS ****************************************************************/ diff --git a/reactos/lib/advapi32/sec/lsa.c b/reactos/lib/advapi32/sec/lsa.c index ede45831b62..0c600acc98a 100644 --- a/reactos/lib/advapi32/sec/lsa.c +++ b/reactos/lib/advapi32/sec/lsa.c @@ -11,7 +11,7 @@ * */ -#include "advapi32.h" +#include #define NDEBUG #include diff --git a/reactos/lib/advapi32/sec/misc.c b/reactos/lib/advapi32/sec/misc.c index 0af5fca6c3d..736dfdd3b19 100644 --- a/reactos/lib/advapi32/sec/misc.c +++ b/reactos/lib/advapi32/sec/misc.c @@ -5,7 +5,7 @@ * PURPOSE: Miscellaneous security functions */ -#include "advapi32.h" +#include #include #include #include diff --git a/reactos/lib/advapi32/sec/sec.c b/reactos/lib/advapi32/sec/sec.c index 7de4fb72816..e12e5d1ea21 100644 --- a/reactos/lib/advapi32/sec/sec.c +++ b/reactos/lib/advapi32/sec/sec.c @@ -11,7 +11,7 @@ * Created 01/11/98 */ -#include "advapi32.h" +#include #include /* diff --git a/reactos/lib/advapi32/sec/sid.c b/reactos/lib/advapi32/sec/sid.c index 0b863b9014a..774d8302d1c 100644 --- a/reactos/lib/advapi32/sec/sid.c +++ b/reactos/lib/advapi32/sec/sid.c @@ -6,7 +6,7 @@ * PURPOSE: Security ID functions */ -#include "advapi32.h" +#include #include diff --git a/reactos/lib/advapi32/sec/trustee.c b/reactos/lib/advapi32/sec/trustee.c index 0808708af16..a0adf3fa57d 100644 --- a/reactos/lib/advapi32/sec/trustee.c +++ b/reactos/lib/advapi32/sec/trustee.c @@ -6,7 +6,7 @@ * PURPOSE: Trustee functions */ -#include "advapi32.h" +#include #define NDEBUG #include "debug.h" diff --git a/reactos/lib/advapi32/service/eventlog.c b/reactos/lib/advapi32/service/eventlog.c index e7df03109a9..222352c229c 100644 --- a/reactos/lib/advapi32/service/eventlog.c +++ b/reactos/lib/advapi32/service/eventlog.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "advapi32.h" +#include #define NDEBUG #include diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c index 568a400f215..1de3e6a70a5 100644 --- a/reactos/lib/advapi32/service/scm.c +++ b/reactos/lib/advapi32/service/scm.c @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ -#include "advapi32.h" +#include #include "svcctl_c.h" #define NDEBUG diff --git a/reactos/lib/advapi32/service/sctrl.c b/reactos/lib/advapi32/service/sctrl.c index 5492f3a91c6..0670acc7724 100644 --- a/reactos/lib/advapi32/service/sctrl.c +++ b/reactos/lib/advapi32/service/sctrl.c @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ -#include "advapi32.h" +#include #include #define NDEBUG diff --git a/reactos/lib/advapi32/service/undoc.c b/reactos/lib/advapi32/service/undoc.c index 398f38283ca..7f596c726e9 100644 --- a/reactos/lib/advapi32/service/undoc.c +++ b/reactos/lib/advapi32/service/undoc.c @@ -12,7 +12,7 @@ /* INCLUDES ******************************************************************/ -#include "advapi32.h" +#include /* FUNCTIONS *****************************************************************/ diff --git a/reactos/lib/advapi32/token/privilege.c b/reactos/lib/advapi32/token/privilege.c index f70f387c6e0..7d460256e0b 100644 --- a/reactos/lib/advapi32/token/privilege.c +++ b/reactos/lib/advapi32/token/privilege.c @@ -9,7 +9,7 @@ * 20010317 ea stubs */ -#include "advapi32.h" +#include /********************************************************************** diff --git a/reactos/lib/advapi32/token/token.c b/reactos/lib/advapi32/token/token.c index bd4a95be90c..50d97cffea0 100644 --- a/reactos/lib/advapi32/token/token.c +++ b/reactos/lib/advapi32/token/token.c @@ -8,7 +8,7 @@ * Created 01/11/98 */ -#include "advapi32.h" +#include #define NDEBUG #include