From fdbabc8ad92987a8a4e959cecce9d8b437ca8a8e Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Sun, 17 Jun 2001 20:20:21 +0000 Subject: [PATCH] Implemented AllocateLocallyUniqueId(). svn path=/trunk/; revision=1978 --- reactos/lib/advapi32/advapi32.edf | 4 +-- reactos/lib/advapi32/misc/dllmain.c | 42 ++++++++++++++--------------- reactos/lib/advapi32/sec/sid.c | 20 +++++++++++--- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/reactos/lib/advapi32/advapi32.edf b/reactos/lib/advapi32/advapi32.edf index ff56f8a002d..279be114bcf 100644 --- a/reactos/lib/advapi32/advapi32.edf +++ b/reactos/lib/advapi32/advapi32.edf @@ -1,4 +1,4 @@ -; $Id: advapi32.edf,v 1.12 2001/03/17 22:05:25 ea Exp $ +; $Id: advapi32.edf,v 1.13 2001/06/17 20:20:00 ekohl Exp $ ; ; advapi32.def ; @@ -20,7 +20,7 @@ AddAuditAccessAce=AddAuditAccessAce@24 AdjustTokenGroups=AdjustTokenGroups@24 AdjustTokenPrivileges=AdjustTokenPrivileges@24 AllocateAndInitializeSid=AllocateAndInitializeSid@44 -;AllocateLocallyUniqueId=AllocateLocallyUniqueId@4 +AllocateLocallyUniqueId=AllocateLocallyUniqueId@4 ;AreAllAccessesGranted=AreAllAccessesGranted@8 ;AreAnyAccessesGranted=AreAnyAccessesGranted@8 ;BackupEventLogA=BackupEventLogA@8 diff --git a/reactos/lib/advapi32/misc/dllmain.c b/reactos/lib/advapi32/misc/dllmain.c index e5353b7ed91..acc2ba53714 100644 --- a/reactos/lib/advapi32/misc/dllmain.c +++ b/reactos/lib/advapi32/misc/dllmain.c @@ -1,4 +1,4 @@ -/* $Id: dllmain.c,v 1.2 2000/09/05 22:59:58 ekohl Exp $ +/* $Id: dllmain.c,v 1.3 2001/06/17 20:20:21 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -12,34 +12,32 @@ #include #include -//#define NDEBUG +#define NDEBUG #include -INT -STDCALL -DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved - ) +INT STDCALL +DllMain(PVOID hinstDll, + ULONG dwReason, + PVOID reserved) { -DPRINT1("ADVAPI32: DllMain() called\n"); - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls (hinstDll); - RegInitialize (); - break; + DPRINT("ADVAPI32: DllMain() called\n"); - case DLL_PROCESS_DETACH: - RegCleanup (); - break; - } + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls(hinstDll); + RegInitialize(); + break; -DPRINT1("ADVAPI32: DllMain() done\n"); + case DLL_PROCESS_DETACH: + RegCleanup(); + break; + } - return TRUE; + DPRINT1("ADVAPI32: DllMain() done\n"); + + return TRUE; } /* EOF */ diff --git a/reactos/lib/advapi32/sec/sid.c b/reactos/lib/advapi32/sec/sid.c index c16d8496d47..9fc51aacb21 100644 --- a/reactos/lib/advapi32/sec/sid.c +++ b/reactos/lib/advapi32/sec/sid.c @@ -1,4 +1,4 @@ -/* $Id: sid.c,v 1.2 2001/01/14 12:15:19 ea Exp $ +/* $Id: sid.c,v 1.3 2001/06/17 20:19:45 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries @@ -11,8 +11,21 @@ #include -BOOL -STDCALL +BOOL STDCALL +AllocateLocallyUniqueId(PLUID Luid) +{ + NTSTATUS Status; + + Status = NtAllocateLocallyUniqueId(Luid); + if (!NT_SUCCESS(Status)) + { + SetLastError(RtlNtStatusToDosError(Status)); + return(FALSE); + } + return(TRUE); +} + +BOOL STDCALL AllocateAndInitializeSid ( PSID_IDENTIFIER_AUTHORITY pIdentifierAuthority, BYTE nSubAuthorityCount, @@ -47,7 +60,6 @@ AllocateAndInitializeSid ( } return TRUE; - } BOOL