diff --git a/reactos/lib/advapi32/advapi32.def b/reactos/lib/advapi32/advapi32.def
index 2bd8160c31a..b53d75d2ebf 100644
--- a/reactos/lib/advapi32/advapi32.def
+++ b/reactos/lib/advapi32/advapi32.def
@@ -1,4 +1,4 @@
-; $Id: advapi32.def,v 1.3 1999/07/17 23:10:16 ea Exp $
+; $Id: advapi32.def,v 1.4 1999/07/26 20:46:39 ea Exp $
 ;
 ; advapi32.def
 ;
@@ -25,14 +25,14 @@ AreAllAccessesGranted@8
 AreAnyAccessesGranted@8
 BackupEventLogA@8
 BackupEventLogW@8
-BuildAccessRequestA
-BuildAccessRequestW
+BuildAccessRequestA@12
+BuildAccessRequestW@12
 BuildExplicitAccessWithNameA@20
 BuildExplicitAccessWithNameW@20
-BuildImpersonateExplicitAccessWithNameA
-BuildImpersonateExplicitAccessWithNameW
-BuildImpersonateTrusteeA
-BuildImpersonateTrusteeW
+BuildImpersonateExplicitAccessWithNameA@24
+BuildImpersonateExplicitAccessWithNameW@24
+BuildImpersonateTrusteeA@8
+BuildImpersonateTrusteeW@8
 BuildSecurityDescriptorA@36
 BuildSecurityDescriptorW@36
 BuildTrusteeWithNameA@8
@@ -109,7 +109,7 @@ ElfReportEventA@48
 ElfReportEventW@48
 EnumDependentServicesA@24
 EnumDependentServicesW@24
-EnumServiceGroupW
+EnumServiceGroupW@36
 EnumServicesStatusA@32
 EnumServicesStatusW@32
 EqualPrefixSid@8
@@ -118,30 +118,30 @@ FindFirstFreeAce@8
 FreeSid@4
 GetAce@12
 GetAclInformation@16
-GetAuditedPermissionsFromAclA
-GetAuditedPermissionsFromAclW
-GetAuditedPermissionsFromSDA
-GetAuditedPermissionsFromSDW
-GetCurrentHwProfileA
-GetCurrentHwProfileW
-GetEffectiveAccessRightsA
-GetEffectiveAccessRightsW
-GetEffectiveRightsFromAclA
-GetEffectiveRightsFromAclW
-GetEffectiveRightsFromSDA
-GetEffectiveRightsFromSDW
-GetExplicitAccessRightsA
-GetExplicitAccessRightsW
-GetExplicitEntriesFromAclA
-GetExplicitEntriesFromAclW
+GetAuditedPermissionsFromAclA@16
+GetAuditedPermissionsFromAclW@16
+GetAuditedPermissionsFromSDA@16
+GetAuditedPermissionsFromSDW@16
+GetCurrentHwProfileA@4
+GetCurrentHwProfileW@4
+GetEffectiveAccessRightsA@16
+GetEffectiveAccessRightsW@16
+GetEffectiveRightsFromAclA@12
+GetEffectiveRightsFromAclW@12
+GetEffectiveRightsFromSDA@12
+GetEffectiveRightsFromSDW@12
+GetExplicitAccessRightsA@16
+GetExplicitAccessRightsW@16
+GetExplicitEntriesFromAclA@12
+GetExplicitEntriesFromAclW@12
 GetFileSecurityA@20
 GetFileSecurityW@20
 GetKernelObjectSecurity@20
 GetLengthSid@4
-GetMultipleTrusteeA
-GetMultipleTrusteeOperationA
-GetMultipleTrusteeOperationW
-GetMultipleTrusteeW
+GetMultipleTrusteeA@4
+GetMultipleTrusteeOperationA@4
+GetMultipleTrusteeOperationW@4
+GetMultipleTrusteeW@4
 GetNamedSecurityInfoA@32
 GetNamedSecurityInfoW@32
 GetNumberOfEventLogRecords@8
@@ -170,9 +170,9 @@ GetTrusteeTypeA@4
 GetTrusteeTypeW@4
 GetUserNameA@8
 GetUserNameW@8
-GrantAccessRightsA
-GrantAccessRightsW
-I_ScGetCurrentGroupStateW
+GrantAccessRightsA@16
+GrantAccessRightsW@16
+I_ScGetCurrentGroupStateW@12
 I_ScSetServiceBitsA@20
 I_ScSetServiceBitsW@20
 ImpersonateLoggedOnUser@4
@@ -183,8 +183,8 @@ InitializeSecurityDescriptor@8
 InitializeSid@12
 InitiateSystemShutdownA@20
 InitiateSystemShutdownW@20
-IsAccessPermittedA
-IsAccessPermittedW
+IsAccessPermittedA@20
+IsAccessPermittedW@20
 IsTextUnicode@12
 IsValidAcl@4
 IsValidSecurityDescriptor@4
@@ -222,7 +222,7 @@ LsaEnumerateTrustedDomains@20
 LsaFreeMemory@4
 LsaGetQuotasForAccount@8
 LsaGetSystemAccessAccount@8
-LsaGetUserName
+LsaGetUserName@8
 LsaICLookupNames@28
 LsaICLookupSids@28
 LsaLookupNames@20
@@ -254,7 +254,7 @@ LsaStorePrivateData@12
 MakeAbsoluteSD@44
 MakeSelfRelativeSD@12
 MapGenericMask@8
-NTAccessMaskToProvAccessRights
+NTAccessMaskToProvAccessRights@12
 NotifyBootConfigStatus@4
 NotifyChangeEventLog@8
 ObjectCloseAuditAlarmA@12
@@ -278,7 +278,7 @@ OpenThreadToken@16
 PrivilegeCheck@12
 PrivilegedServiceAuditAlarmA@20
 PrivilegedServiceAuditAlarmW@20
-ProvAccessRightsToNTAccessMask
+ProvAccessRightsToNTAccessMask@8
 QueryServiceConfigA@16
 QueryServiceConfigW@16
 QueryServiceLockStatusA@16
@@ -344,10 +344,10 @@ ReplaceAllAccessRightsW
 ReportEventA@36
 ReportEventW@36
 RevertToSelf@0
-RevokeExplicitAccessRightsA
-RevokeExplicitAccessRightsW
-SetAccessRightsA
-SetAccessRightsW
+RevokeExplicitAccessRightsA@16
+RevokeExplicitAccessRightsW@16
+SetAccessRightsA@16
+SetAccessRightsW@16
 SetAclInformation@16
 SetEntriesInAclA@16
 SetEntriesInAclA@16
diff --git a/reactos/lib/advapi32/advapi32.edf b/reactos/lib/advapi32/advapi32.edf
index c3163fac031..02b3867c69d 100644
--- a/reactos/lib/advapi32/advapi32.edf
+++ b/reactos/lib/advapi32/advapi32.edf
@@ -1,4 +1,4 @@
-; $Id: advapi32.edf,v 1.1 1999/07/17 23:10:17 ea Exp $
+; $Id: advapi32.edf,v 1.2 1999/07/26 20:46:39 ea Exp $
 ;
 ; advapi32.def
 ;
@@ -25,8 +25,8 @@ AreAllAccessesGranted=AreAllAccessesGranted@8
 AreAnyAccessesGranted=AreAnyAccessesGranted@8
 BackupEventLogA=BackupEventLogA@8
 BackupEventLogW=BackupEventLogW@8
-BuildAccessRequestA
-BuildAccessRequestW
+BuildAccessRequestA=BuildAccessRequestA@12
+BuildAccessRequestW=BuildAccessRequestW@12
 BuildExplicitAccessWithNameA=BuildExplicitAccessWithNameA@20
 BuildExplicitAccessWithNameW=BuildExplicitAccessWithNameW@20
 BuildImpersonateExplicitAccessWithNameA
@@ -109,7 +109,7 @@ ElfReportEventA=ElfReportEventA@48
 ElfReportEventW=ElfReportEventW@48
 EnumDependentServicesA=EnumDependentServicesA@24
 EnumDependentServicesW=EnumDependentServicesW@24
-EnumServiceGroupW
+EnumServiceGroupW=EnumServiceGroupW@36
 EnumServicesStatusA=EnumServicesStatusA@32
 EnumServicesStatusW=EnumServicesStatusW@32
 EqualPrefixSid=EqualPrefixSid@8
@@ -118,30 +118,30 @@ FindFirstFreeAce=FindFirstFreeAce@8
 FreeSid=FreeSid@4
 GetAce=GetAce@12
 GetAclInformation=GetAclInformation@16
-GetAuditedPermissionsFromAclA
-GetAuditedPermissionsFromAclW
-GetAuditedPermissionsFromSDA
-GetAuditedPermissionsFromSDW
-GetCurrentHwProfileA
-GetCurrentHwProfileW
-GetEffectiveAccessRightsA
-GetEffectiveAccessRightsW
-GetEffectiveRightsFromAclA
-GetEffectiveRightsFromAclW
-GetEffectiveRightsFromSDA
-GetEffectiveRightsFromSDW
-GetExplicitAccessRightsA
-GetExplicitAccessRightsW
-GetExplicitEntriesFromAclA
-GetExplicitEntriesFromAclW
+GetAuditedPermissionsFromAclA=GetAuditedPermissionsFromAclA@16
+GetAuditedPermissionsFromAclW=GetAuditedPermissionsFromAclW@16
+GetAuditedPermissionsFromSDA=GetAuditedPermissionsFromSDA@16
+GetAuditedPermissionsFromSDW=GetAuditedPermissionsFromSDW@16
+GetCurrentHwProfileA=GetCurrentHwProfileA@4
+GetCurrentHwProfileW=GetCurrentHwProfileW@4
+GetEffectiveAccessRightsA=GetEffectiveAccessRightsA@16
+GetEffectiveAccessRightsW=GetEffectiveAccessRightsW@16
+GetEffectiveRightsFromAclA=GetEffectiveRightsFromAclA@12
+GetEffectiveRightsFromAclW=GetEffectiveRightsFromAclW@12
+GetEffectiveRightsFromSDA=GetEffectiveRightsFromSDA@12
+GetEffectiveRightsFromSDW=GetEffectiveRightsFromSDW@12
+GetExplicitAccessRightsA=GetExplicitAccessRightsA@16
+GetExplicitAccessRightsW=GetExplicitAccessRightsW@16
+GetExplicitEntriesFromAclA=GetExplicitEntriesFromAclA@12
+GetExplicitEntriesFromAclW=GetExplicitEntriesFromAclW@12
 GetFileSecurityA=GetFileSecurityA@20
 GetFileSecurityW=GetFileSecurityW@20
 GetKernelObjectSecurity=GetKernelObjectSecurity@20
 GetLengthSid=GetLengthSid@4
-GetMultipleTrusteeA
-GetMultipleTrusteeOperationA
-GetMultipleTrusteeOperationW
-GetMultipleTrusteeW
+GetMultipleTrusteeA=GetMultipleTrusteeA@4
+GetMultipleTrusteeOperationA=GetMultipleTrusteeOperationA@4
+GetMultipleTrusteeOperationW=GetMultipleTrusteeOperationW@4
+GetMultipleTrusteeW=GetMultipleTrusteeW@4
 GetNamedSecurityInfoA=GetNamedSecurityInfoA@32
 GetNamedSecurityInfoW=GetNamedSecurityInfoW@32
 GetNumberOfEventLogRecords=GetNumberOfEventLogRecords@8
@@ -170,9 +170,9 @@ GetTrusteeTypeA=GetTrusteeTypeA@4
 GetTrusteeTypeW=GetTrusteeTypeW@4
 GetUserNameA=GetUserNameA@8
 GetUserNameW=GetUserNameW@8
-GrantAccessRightsA
-GrantAccessRightsW
-I_ScGetCurrentGroupStateW
+GrantAccessRightsA=GrantAccessRightsA@16
+GrantAccessRightsW=GrantAccessRightsW@16
+I_ScGetCurrentGroupStateW=I_ScGetCurrentGroupStateW@12
 I_ScSetServiceBitsA=I_ScSetServiceBitsA@20
 I_ScSetServiceBitsW=I_ScSetServiceBitsW@20
 ImpersonateLoggedOnUser=ImpersonateLoggedOnUser@4
@@ -183,8 +183,8 @@ InitializeSecurityDescriptor=InitializeSecurityDescriptor@8
 InitializeSid=InitializeSid@12
 InitiateSystemShutdownA=InitiateSystemShutdownA@20
 InitiateSystemShutdownW=InitiateSystemShutdownW@20
-IsAccessPermittedA
-IsAccessPermittedW
+IsAccessPermittedA=IsAccessPermittedA@20
+IsAccessPermittedW=IsAccessPermittedW@20
 IsTextUnicode=IsTextUnicode@12
 IsValidAcl=IsValidAcl@4
 IsValidSecurityDescriptor=IsValidSecurityDescriptor@4
@@ -222,7 +222,7 @@ LsaEnumerateTrustedDomains=LsaEnumerateTrustedDomains@20
 LsaFreeMemory=LsaFreeMemory@4
 LsaGetQuotasForAccount=LsaGetQuotasForAccount@8
 LsaGetSystemAccessAccount=LsaGetSystemAccessAccount@8
-LsaGetUserName
+LsaGetUserName=LsaGetUserName@8
 LsaICLookupNames=LsaICLookupNames@28
 LsaICLookupSids=LsaICLookupSids@28
 LsaLookupNames=LsaLookupNames@20
@@ -254,7 +254,7 @@ LsaStorePrivateData=LsaStorePrivateData@12
 MakeAbsoluteSD=MakeAbsoluteSD@44
 MakeSelfRelativeSD=MakeSelfRelativeSD@12
 MapGenericMask=MapGenericMask@8
-NTAccessMaskToProvAccessRights
+NTAccessMaskToProvAccessRights=NTAccessMaskToProvAccessRights@12
 NotifyBootConfigStatus=NotifyBootConfigStatus@4
 NotifyChangeEventLog=NotifyChangeEventLog@8
 ObjectCloseAuditAlarmA=ObjectCloseAuditAlarmA@12
@@ -278,7 +278,7 @@ OpenThreadToken=OpenThreadToken@16
 PrivilegeCheck=PrivilegeCheck@12
 PrivilegedServiceAuditAlarmA=PrivilegedServiceAuditAlarmA@20
 PrivilegedServiceAuditAlarmW=PrivilegedServiceAuditAlarmW@20
-ProvAccessRightsToNTAccessMask
+ProvAccessRightsToNTAccessMask=ProvAccessRightsToNTAccessMask@8
 QueryServiceConfigA=QueryServiceConfigA@16
 QueryServiceConfigW=QueryServiceConfigW@16
 QueryServiceLockStatusA=QueryServiceLockStatusA@16
@@ -344,10 +344,10 @@ ReplaceAllAccessRightsW
 ReportEventA=ReportEventA@36
 ReportEventW=ReportEventW@36
 RevertToSelf=RevertToSelf@0
-RevokeExplicitAccessRightsA
-RevokeExplicitAccessRightsW
-SetAccessRightsA
-SetAccessRightsW
+RevokeExplicitAccessRightsA=RevokeExplicitAccessRightsA@16
+RevokeExplicitAccessRightsW=RevokeExplicitAccessRightsW@16
+SetAccessRightsA=SetAccessRightsA@16
+SetAccessRightsW=SetAccessRightsW@16
 SetAclInformation=SetAclInformation@16
 SetEntriesInAclA=SetEntriesInAclA@16
 SetEntriesInAclA=SetEntriesInAclA@16
diff --git a/reactos/lib/advapi32/makefile b/reactos/lib/advapi32/makefile
index b5a0d9d0b7a..04a4a34792a 100644
--- a/reactos/lib/advapi32/makefile
+++ b/reactos/lib/advapi32/makefile
@@ -1,4 +1,4 @@
-# $Id: makefile,v 1.5 1999/07/22 21:33:48 ekohl Exp $
+# $Id: makefile,v 1.6 1999/07/26 20:46:39 ea Exp $
 #
 # Makefile for ReactOS advapi32.dll
 #
@@ -15,7 +15,7 @@ endif
 
 
 MISC_OBJECTS = misc/dllmain.o misc/shutdown.o \
-		misc/sysfunc.o
+		misc/sysfunc.o misc/stubs.o
 
 REGISTRY_OBJECTS = reg/reg.o
 
diff --git a/reactos/lib/advapi32/misc/sysfunc.c b/reactos/lib/advapi32/misc/sysfunc.c
index de9b7082ce7..1ba69b79841 100644
--- a/reactos/lib/advapi32/misc/sysfunc.c
+++ b/reactos/lib/advapi32/misc/sysfunc.c
@@ -1,4 +1,5 @@
-/*
+/* $Id: sysfunc.c,v 1.3 1999/07/26 20:46:39 ea Exp $
+ *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
  * FILE:            lib/advapi32/misc/sysfun.c
diff --git a/reactos/lib/advapi32/sec/lsa.c b/reactos/lib/advapi32/sec/lsa.c
index 3fe5351749b..c727cd6fdc3 100644
--- a/reactos/lib/advapi32/sec/lsa.c
+++ b/reactos/lib/advapi32/sec/lsa.c
@@ -1,4 +1,4 @@
-/* $Id: lsa.c,v 1.1 1999/05/19 16:43:30 ea Exp $
+/* $Id: lsa.c,v 1.2 1999/07/26 20:46:39 ea Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -66,7 +66,12 @@ LsaClose (VOID)
  */
 INT
 STDCALL
-LsaCreateAccount (VOID)
+LsaCreateAccount (
+	DWORD	Unknown0,
+	DWORD	Unknown1,
+	DWORD	Unknown2,
+	DWORD	Unknown3	
+	)
 {
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
 	return 0;
diff --git a/reactos/lib/advapi32/sec/sec.c b/reactos/lib/advapi32/sec/sec.c
index 1164020f4e7..69feee97043 100644
--- a/reactos/lib/advapi32/sec/sec.c
+++ b/reactos/lib/advapi32/sec/sec.c
@@ -13,8 +13,11 @@
 DWORD
 STDCALL
 GetSecurityDescriptorLength (
-			     PSECURITY_DESCRIPTOR pSecurityDescriptor
-			      )
+	PSECURITY_DESCRIPTOR	pSecurityDescriptor
+	)
 {
         return RtlLengthSecurityDescriptor(pSecurityDescriptor);
 }
+
+
+/* EOF */
diff --git a/reactos/lib/advapi32/service/scm.c b/reactos/lib/advapi32/service/scm.c
index 792f1a10e8a..3f2524a8a9b 100644
--- a/reactos/lib/advapi32/service/scm.c
+++ b/reactos/lib/advapi32/service/scm.c
@@ -1,4 +1,4 @@
-/* $Id: scm.c,v 1.2 1999/07/22 21:36:14 ekohl Exp $
+/* $Id: scm.c,v 1.3 1999/07/26 20:46:40 ea Exp $
  * 
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS system libraries
@@ -192,14 +192,24 @@ EnumDependentServicesW(
 /**********************************************************************
  *	EnumServiceGroupW
  *
- * Return value unknown.
+ * (unknown)
  */
-DWORD
+BOOL
 STDCALL
-EnumServiceGroupW(VOID)
+EnumServiceGroupW (
+	DWORD	Unknown0,
+	DWORD	Unknown1,
+	DWORD	Unknown2,
+	DWORD	Unknown3,
+	DWORD	Unknown4,
+	DWORD	Unknown5,
+	DWORD	Unknown6,
+	DWORD	Unknown7,
+	DWORD	Unknown8
+	)
 {
 	SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-	return 1;
+	return FALSE;
 }
 
 
@@ -208,7 +218,7 @@ EnumServiceGroupW(VOID)
  */
 BOOL
 STDCALL
-EnumServicesStatusA(
+EnumServicesStatusA (
 	SC_HANDLE               hSCManager,
 	DWORD                   dwServiceType,
 	DWORD                   dwServiceState,