From a9d96a9cfc3a87439d7b5ec12ba4adacfb16ea01 Mon Sep 17 00:00:00 2001 From: "KJK::Hyperion" Date: Sun, 2 Feb 2003 19:24:44 +0000 Subject: [PATCH] Finally solved some advapi32 nonsense: - advapi32 doesn't import any more from itself - smarter stubbing (look at the files modified in this commit) svn path=/trunk/; revision=4106 --- reactos/lib/advapi32/advapi32.def | 24 +- reactos/lib/advapi32/advapi32.edf | 110 ++--- reactos/lib/advapi32/sec/lsa.c | 651 +++++------------------------- 3 files changed, 174 insertions(+), 611 deletions(-) diff --git a/reactos/lib/advapi32/advapi32.def b/reactos/lib/advapi32/advapi32.def index 9ef7ccce751..dfa19f39405 100644 --- a/reactos/lib/advapi32/advapi32.def +++ b/reactos/lib/advapi32/advapi32.def @@ -1,11 +1,11 @@ -; $Id: advapi32.def,v 1.5 1999/10/26 19:47:02 ea Exp $ -; -; advapi32.def -; -; ReactOS Operating System -; -; Some stack sizes are taken from Ander Norlander's .DEFs. -; + $Id: advapi32.def,v 1.6 2003/02/02 19:24:43 hyperion Exp $ + + advapi32.def + + ReactOS Operating System + + Some stack sizes are taken from Ander Norlander's .DEFs. + LIBRARY advapi32.dll EXPORTS AbortSystemShutdownA@4 @@ -223,8 +223,8 @@ LsaFreeMemory@4 LsaGetQuotasForAccount@8 LsaGetSystemAccessAccount@8 LsaGetUserName@8 -LsaICLookupNames@28 -LsaICLookupSids@28 +LsaICLookupNames@32 +LsaICLookupSids@32 LsaLookupNames@20 LsaLookupPrivilegeDisplayName@16 LsaLookupPrivilegeName@12 @@ -235,11 +235,11 @@ LsaOpenAccount@16 LsaOpenPolicy@16 LsaOpenSecret@16 LsaOpenTrustedDomain@16 -LsaQueryInfoTrustedDomain@12 LsaQueryInformationPolicy@12 +LsaQueryInfoTrustedDomain@12 LsaQuerySecret@20 LsaQuerySecurityObject@12 -LsaQueryTrustedDomainInfo@16 +LsaQueryTrustedDomainInfo@20 LsaRemoveAccountRights@20 LsaRemovePrivilegesFromAccount@12 LsaRetrievePrivateData@12 diff --git a/reactos/lib/advapi32/advapi32.edf b/reactos/lib/advapi32/advapi32.edf index d8b2d487ca9..699250b9db6 100644 --- a/reactos/lib/advapi32/advapi32.edf +++ b/reactos/lib/advapi32/advapi32.edf @@ -1,4 +1,4 @@ -; $Id: advapi32.edf,v 1.18 2003/01/15 20:05:50 robd Exp $ +; $Id: advapi32.edf,v 1.19 2003/02/02 19:24:43 hyperion Exp $ ; ; advapi32.edf ; @@ -203,53 +203,67 @@ LookupPrivilegeValueA=LookupPrivilegeValueA@12 LookupPrivilegeValueW=LookupPrivilegeValueW@12 ;LookupSecurityDescriptorPartsA=LookupSecurityDescriptorPartsA@28 ;LookupSecurityDescriptorPartsW=LookupSecurityDescriptorPartsW@28 -;LsaAddAccountRights=LsaAddAccountRights@16 -;LsaAddPrivilegesToAccount=LsaAddPrivilegesToAccount@8 -;LsaClearAuditLog=LsaClearAuditLog@4 -LsaClose=LsaClose@4 -;LsaCreateAccount=LsaCreateAccount@16 -;LsaCreateSecret=LsaCreateSecret@16 -;LsaCreateTrustedDomain=LsaCreateTrustedDomain@16 -;LsaDelete=LsaDelete@4 -;LsaDeleteTrustedDomain=LsaDeleteTrustedDomain@8 -;LsaEnumerateAccountRights=LsaEnumerateAccountRights@16 -;LsaEnumerateAccounts=LsaEnumerateAccounts@20 -;LsaEnumerateAccountsWithUserRight=LsaEnumerateAccountsWithUserRight@16 -;LsaEnumeratePrivileges=LsaEnumeratePrivileges@20 -;LsaEnumeratePrivilegesOfAccount=LsaEnumeratePrivilegesOfAccount@8 -;LsaEnumerateTrustedDomains=LsaEnumerateTrustedDomains@20 -LsaFreeMemory=LsaFreeMemory@4 -;LsaGetQuotasForAccount=LsaGetQuotasForAccount@8 -;LsaGetSystemAccessAccount=LsaGetSystemAccessAccount@8 -;LsaGetUserName=LsaGetUserName@8 -;LsaICLookupNames=LsaICLookupNames@28 -;LsaICLookupSids=LsaICLookupSids@28 -;LsaLookupNames=LsaLookupNames@20 -;LsaLookupPrivilegeDisplayName=LsaLookupPrivilegeDisplayName@16 -;LsaLookupPrivilegeName=LsaLookupPrivilegeName@12 -;LsaLookupPrivilegeValue=LsaLookupPrivilegeValue@12 -;LsaLookupSids=LsaLookupSids@20 -LsaNtStatusToWinError=LsaNtStatusToWinError@4 -;LsaOpenAccount=LsaOpenAccount@16 -LsaOpenPolicy=LsaOpenPolicy@16 -;LsaOpenSecret=LsaOpenSecret@16 -;LsaOpenTrustedDomain=LsaOpenTrustedDomain@16 -;LsaQueryInfoTrustedDomain=LsaQueryInfoTrustedDomain@12 -LsaQueryInformationPolicy=LsaQueryInformationPolicy@12 -;LsaQuerySecret=LsaQuerySecret@20 -;LsaQuerySecurityObject=LsaQuerySecurityObject@12 -;LsaQueryTrustedDomainInfo=LsaQueryTrustedDomainInfo@16 -;LsaRemoveAccountRights=LsaRemoveAccountRights@20 -;LsaRemovePrivilegesFromAccount=LsaRemovePrivilegesFromAccount@12 -;LsaRetrievePrivateData=LsaRetrievePrivateData@12 -;LsaSetInformationPolicy=LsaSetInformationPolicy@12 -;LsaSetInformationTrustedDomain=LsaSetInformationTrustedDomain@12 -;LsaSetQuotasForAccount=LsaSetQuotasForAccount@8 -;LsaSetSecret=LsaSetSecret@12 -;LsaSetSecurityObject=LsaSetSecurityObject@12 -;LsaSetSystemAccessAccount=LsaSetSystemAccessAccount@8 -;LsaSetTrustedDomainInformation=LsaSetTrustedDomainInformation@16 -;LsaStorePrivateData=LsaStorePrivateData@12 + +; 1 parameter stubs +LsaClearAuditLog=_LsaStub1@4 +LsaClose=_LsaStub1@4 +LsaDelete=_LsaStub1@4 +LsaFreeMemory=_LsaStub1@4 + +; 2 parameters stubs +LsaAddPrivilegesToAccount=_LsaStub2@8 +LsaDeleteTrustedDomain=_LsaStub2@8 +LsaEnumeratePrivilegesOfAccount=_LsaStub2@8 +LsaGetQuotasForAccount=_LsaStub2@8 +LsaGetSystemAccessAccount=_LsaStub2@8 +LsaGetUserName=_LsaStub2@8 +LsaSetQuotasForAccount=_LsaStub2@8 +LsaSetSystemAccessAccount=_LsaStub2@8 + +; 3 parameters stubs +LsaLookupPrivilegeName=_LsaStub3@12 +LsaLookupPrivilegeValue=_LsaStub3@12 +LsaQueryInfoTrustedDomain=_LsaStub3@12 +LsaQueryInformationPolicy=_LsaStub3@12 +LsaQuerySecurityObject=_LsaStub3@12 +LsaRemovePrivilegesFromAccount=_LsaStub3@12 +LsaRetrievePrivateData=_LsaStub3@12 +LsaSetInformationPolicy=_LsaStub3@12 +LsaSetInformationTrustedDomain=_LsaStub3@12 +LsaSetSecret=_LsaStub3@12 +LsaSetSecurityObject=_LsaStub3@12 +LsaStorePrivateData=_LsaStub3@12 + +; 4 parameters stubs +LsaAddAccountRights=_LsaStub4@16 +LsaCreateAccount=_LsaStub4@16 +LsaCreateSecret=_LsaStub4@16 +LsaCreateTrustedDomain=_LsaStub4@16 +LsaEnumerateAccountRights=_LsaStub4@16 +LsaEnumerateAccountsWithUserRight=_LsaStub4@16 +LsaLookupPrivilegeDisplayName=_LsaStub4@16 +LsaOpenAccount=_LsaStub4@16 +LsaOpenPolicy=_LsaStub4@16 +LsaOpenSecret=_LsaStub4@16 +LsaOpenTrustedDomain=_LsaStub4@16 +LsaSetTrustedDomainInformation=_LsaStub4@16 + +; 5 parameters stubs +LsaEnumerateAccounts=_LsaStub5@20 +LsaEnumeratePrivileges=_LsaStub5@20 +LsaEnumerateTrustedDomains=_LsaStub5@20 +LsaLookupNames=_LsaStub5@20 +LsaLookupSids=_LsaStub5@20 +LsaQuerySecret=_LsaStub5@20 +LsaQueryTrustedDomainInfo=_LsaStub5@20 +LsaRemoveAccountRights=_LsaStub5@20 + +; 8 parameters stubs +LsaICLookupNames=_LsaStub8@32 +LsaICLookupSids=_LsaStub8@32 + +LsaNtStatusToWinError=NTDLL.RtlNtStatusToDosError + MakeAbsoluteSD=MakeAbsoluteSD@44 MakeSelfRelativeSD=MakeSelfRelativeSD@12 MapGenericMask=MapGenericMask@8 diff --git a/reactos/lib/advapi32/sec/lsa.c b/reactos/lib/advapi32/sec/lsa.c index 9b7db4e9e4b..35d57a678bf 100644 --- a/reactos/lib/advapi32/sec/lsa.c +++ b/reactos/lib/advapi32/sec/lsa.c @@ -1,4 +1,4 @@ -/* $Id: lsa.c,v 1.4 2002/09/08 10:22:37 chorns Exp $ +/* $Id: lsa.c,v 1.5 2003/02/02 19:24:44 hyperion Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -8,579 +8,128 @@ * UPDATE HISTORY: * 19990322 EA created * 19990515 EA stubs + * 20030202 KJK compressed stubs */ #include #include - -/********************************************************************** - * LsaAddAccountRights - */ -INT -STDCALL -LsaAddAccountRights (VOID) +/* +LsaClearAuditLog +LsaClose +LsaDelete +LsaFreeMemory +*/ +NTSTATUS STDCALL _LsaStub1(ULONG_PTR Unknown0) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return STATUS_NOT_IMPLEMENTED; } - -/********************************************************************** - * LsaAddPrivilegesToAccount - */ -INT -STDCALL -LsaAddPrivilegesToAccount (VOID) +/* +LsaAddPrivilegesToAccount +LsaDeleteTrustedDomain +LsaEnumeratePrivilegesOfAccount +LsaGetQuotasForAccount +LsaGetSystemAccessAccount +LsaGetUserName +LsaSetQuotasForAccount +LsaSetSystemAccessAccount +*/ +NTSTATUS STDCALL _LsaStub2(ULONG_PTR Unknown0, ULONG_PTR Unknown1) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return STATUS_NOT_IMPLEMENTED; } - -/********************************************************************** - * LsaClearAuditLog - */ -INT -STDCALL -LsaClearAuditLog (VOID) +/* +LsaLookupPrivilegeName +LsaLookupPrivilegeValue +LsaQueryInfoTrustedDomain +LsaQueryInformationPolicy +LsaQuerySecurityObject +LsaRemovePrivilegesFromAccount +LsaRetrievePrivateData +LsaSetInformationPolicy +LsaSetInformationTrustedDomain +LsaSetSecret +LsaSetSecurityObject +LsaStorePrivateData +*/ +NTSTATUS STDCALL _LsaStub3 +( + ULONG_PTR Unknown0, + ULONG_PTR Unknown1, + ULONG_PTR Unknown2 +) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return STATUS_NOT_IMPLEMENTED; } - -/********************************************************************** - * LsaClose - */ -INT -STDCALL -LsaClose (VOID) +/* +LsaAddAccountRights +LsaCreateAccount +LsaCreateSecret +LsaCreateTrustedDomain +LsaEnumerateAccountRights +LsaEnumerateAccountsWithUserRight +LsaLookupPrivilegeDisplayName +LsaOpenAccount +LsaOpenPolicy +LsaOpenSecret +LsaOpenTrustedDomain +LsaSetTrustedDomainInformation +*/ +NTSTATUS STDCALL _LsaStub4 +( + ULONG_PTR Unknown0, + ULONG_PTR Unknown1, + ULONG_PTR Unknown2, + ULONG_PTR Unknown3 +) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return STATUS_NOT_IMPLEMENTED; } - -/********************************************************************** - * LsaCreateAccount - */ -INT -STDCALL -LsaCreateAccount ( - DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2, - DWORD Unknown3 - ) +/* +LsaEnumerateAccounts +LsaEnumeratePrivileges +LsaEnumerateTrustedDomains +LsaLookupNames +LsaLookupSids +LsaQuerySecret +LsaQueryTrustedDomainInfo +LsaRemoveAccountRights +*/ +NTSTATUS STDCALL _LsaStub5 +( + ULONG_PTR Unknown0, + ULONG_PTR Unknown1, + ULONG_PTR Unknown2, + ULONG_PTR Unknown3, + ULONG_PTR Unknown4 +) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return STATUS_NOT_IMPLEMENTED; } - -/********************************************************************** - * LsaCreateSecret - */ -INT -STDCALL -LsaCreateSecret (VOID) +/* +LsaICLookupNames +LsaICLookupSids +*/ +NTSTATUS STDCALL _LsaStub8 +( + ULONG_PTR Unknown0, + ULONG_PTR Unknown1, + ULONG_PTR Unknown2, + ULONG_PTR Unknown3, + ULONG_PTR Unknown4, + ULONG_PTR Unknown5, + ULONG_PTR Unknown6, + ULONG_PTR Unknown7 +) { - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return STATUS_NOT_IMPLEMENTED; } -/********************************************************************** - * LsaCreateTrustedDomain - */ -INT -STDCALL -LsaCreateTrustedDomain (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaDelete - */ -INT -STDCALL -LsaDelete (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaDeleteTrustedDomain - */ -INT -STDCALL -LsaDeleteTrustedDomain (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaEnumerateAccountRights - */ -INT -STDCALL -LsaEnumerateAccountRights (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaEnumerateAccounts - */ -INT -STDCALL -LsaEnumerateAccounts (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaEnumerateAccountsWithUserRight - */ -INT -STDCALL -LsaEnumerateAccountsWithUserRight (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaEnumeratePrivileges - */ -INT -STDCALL -LsaEnumeratePrivileges (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaEnumeratePrivilegesOfAccount - */ -INT -STDCALL -LsaEnumeratePrivilegesOfAccount (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaEnumerateTrustedDomains - */ -INT -STDCALL -LsaEnumerateTrustedDomains (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaFreeMemory - */ -INT -STDCALL -LsaFreeMemory (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaGetQuotasForAccount - */ -INT -STDCALL -LsaGetQuotasForAccount (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaGetSystemAccessAccount - */ -INT -STDCALL -LsaGetSystemAccessAccount (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaGetUserName - */ -INT -STDCALL -LsaGetUserName (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaICLookupNames - */ -INT -STDCALL -LsaICLookupNames (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaICLookupSids - */ -INT -STDCALL -LsaICLookupSids (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaLookupNames - */ -INT -STDCALL -LsaLookupNames (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaLookupPrivilegeDisplayName - */ -INT -STDCALL -LsaLookupPrivilegeDisplayName (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaLookupPrivilegeName - */ -INT -STDCALL -LsaLookupPrivilegeName (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaLookupPrivilegeValue - */ -INT -STDCALL -LsaLookupPrivilegeValue (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaLookupSids - */ -INT -STDCALL -LsaLookupSids (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaNtStatusToWinError - */ -INT -STDCALL -LsaNtStatusToWinError (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaOpenAccount - */ -INT -STDCALL -LsaOpenAccount (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaOpenPolicy - */ -INT -STDCALL -LsaOpenPolicy (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaOpenSecret - */ -INT -STDCALL -LsaOpenSecret (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaOpenTrustedDomain - */ -INT -STDCALL -LsaOpenTrustedDomain (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaQueryInfoTrustedDomain - */ -INT -STDCALL -LsaQueryInfoTrustedDomain (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaQueryInformationPolicy - */ -INT -STDCALL -LsaQueryInformationPolicy (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaQuerySecret - */ -INT -STDCALL -LsaQuerySecret (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaQuerySecurityObject - */ -INT -STDCALL -LsaQuerySecurityObject (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaQueryTrustedDomainInfo - */ -INT -STDCALL -LsaQueryTrustedDomainInfo (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaRemoveAccountRights - */ -INT -STDCALL -LsaRemoveAccountRights (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaRemovePrivilegesFromAccount - */ -INT -STDCALL -LsaRemovePrivilegesFromAccount (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaRetrievePrivateData - */ -INT -STDCALL -LsaRetrievePrivateData (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaSetInformationPolicy - */ -INT -STDCALL -LsaSetInformationPolicy (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaSetInformationTrustedDomain - */ -INT -STDCALL -LsaSetInformationTrustedDomain (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaSetQuotasForAccount - */ -INT -STDCALL -LsaSetQuotasForAccount (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaSetSecret - */ -INT -STDCALL -LsaSetSecret (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaSetSecurityObject - */ -INT -STDCALL -LsaSetSecurityObject (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaSetSystemAccessAccount - */ -INT -STDCALL -LsaSetSystemAccessAccount (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaSetTrustedDomainInformation - */ -INT -STDCALL -LsaSetTrustedDomainInformation (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/********************************************************************** - * LsaStorePrivateData - */ -INT -STDCALL -LsaStorePrivateData (VOID) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - /* EOF */