From 7cd6c44a8af2186a1a9cfda93d7678b7f34f9e01 Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Fri, 12 Nov 2004 12:06:54 +0000 Subject: [PATCH] - Move NtAllocateUuids from the Security Reference Monitor to the Executive. - Update NtAllocateUuids to W2K signature. - Add NtSetUuidSeed. svn path=/trunk/; revision=11628 --- reactos/iface/native/sysfuncs.lst | 3 ++- reactos/include/ntos/zw.h | 22 +++++++++++++++------- reactos/lib/ntdll/def/ntdll.def | 8 +++++--- reactos/ntoskrnl/Makefile | 1 + reactos/ntoskrnl/ntoskrnl.def | 4 ++-- reactos/ntoskrnl/se/semgr.c | 16 +--------------- 6 files changed, 26 insertions(+), 28 deletions(-) diff --git a/reactos/iface/native/sysfuncs.lst b/reactos/iface/native/sysfuncs.lst index 38bc1d73cdb..2d512ef5874 100644 --- a/reactos/iface/native/sysfuncs.lst +++ b/reactos/iface/native/sysfuncs.lst @@ -8,7 +8,7 @@ NtAdjustPrivilegesToken ZwAdjustPrivilegesToken 6 NtAlertResumeThread ZwAlertResumeThread 2 NtAlertThread ZwAlertThread 1 NtAllocateLocallyUniqueId ZwAllocateLocallyUniqueId 1 -NtAllocateUuids ZwAllocateUuids 3 +NtAllocateUuids ZwAllocateUuids 4 NtAllocateVirtualMemory ZwAllocateVirtualMemory 6 NtAssignProcessToJobObject ZwAssignProcessToJobObject 2 NtCallbackReturn ZwCallbackReturn 3 @@ -202,6 +202,7 @@ NtSetSystemPowerState ZwSetSystemPowerState 3 NtSetSystemTime ZwSetSystemTime 2 NtSetTimer ZwSetTimer 7 NtSetTimerResolution ZwSetTimerResolution 3 +NtSetUuidSeed ZwSetUuidSeed 1 NtSetValueKey ZwSetValueKey 6 NtSetVolumeInformationFile ZwSetVolumeInformationFile 5 NtShutdownSystem ZwShutdownSystem 1 diff --git a/reactos/include/ntos/zw.h b/reactos/include/ntos/zw.h index 6fcf5f25e3d..81495797148 100755 --- a/reactos/include/ntos/zw.h +++ b/reactos/include/ntos/zw.h @@ -1,5 +1,5 @@ -/* $Id: zw.h,v 1.34 2004/10/24 20:37:26 weiden Exp $ +/* $Id: zw.h,v 1.35 2004/11/12 12:06:17 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -5765,17 +5765,19 @@ ZwAddAtom( NTSTATUS STDCALL NtAllocateUuids( - PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence + OUT PULARGE_INTEGER Time, + OUT PULONG Range, + OUT PULONG Sequence, + OUT PUCHAR Seed ); NTSTATUS STDCALL ZwAllocateUuids( - PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence + OUT PULARGE_INTEGER Time, + OUT PULONG Range, + OUT PULONG Sequence, + OUT PUCHAR Seed ); NTSTATUS @@ -6333,6 +6335,12 @@ ZwSetTimer( OUT PBOOLEAN PreviousState OPTIONAL ); +NTSTATUS STDCALL +NtSetUuidSeed(IN PUCHAR Seed); + +NTSTATUS STDCALL +ZwSetUuidSeed(IN PUCHAR Seed); + /* * FUNCTION: Unloads a registry key. * ARGUMENTS: diff --git a/reactos/lib/ntdll/def/ntdll.def b/reactos/lib/ntdll/def/ntdll.def index d0a9898bc3d..885dbe27963 100644 --- a/reactos/lib/ntdll/def/ntdll.def +++ b/reactos/lib/ntdll/def/ntdll.def @@ -1,4 +1,4 @@ -; $Id: ntdll.def,v 1.133 2004/11/07 13:08:24 hyperion Exp $ +; $Id: ntdll.def,v 1.134 2004/11/12 12:06:54 ekohl Exp $ ; ; ReactOS Operating System ; @@ -65,7 +65,7 @@ NtAdjustPrivilegesToken@24 NtAlertResumeThread@8 NtAlertThread@4 NtAllocateLocallyUniqueId@4 -NtAllocateUuids@12 +NtAllocateUuids@16 NtAllocateVirtualMemory@24 NtAssignProcessToJobObject@8 NtCallbackReturn@12 @@ -252,6 +252,7 @@ NtSetSystemPowerState@12 NtSetSystemTime@8 NtSetTimer@28 NtSetTimerResolution@12 +NtSetUuidSeed@4 NtSetValueKey@24 NtSetVolumeInformationFile@20 NtShutdownSystem@4 @@ -691,7 +692,7 @@ ZwAdjustPrivilegesToken@24 ZwAlertResumeThread@8 ZwAlertThread@4 ZwAllocateLocallyUniqueId@4 -ZwAllocateUuids@12 +ZwAllocateUuids@16 ZwAllocateVirtualMemory@24 ZwCallbackReturn@12 ZwCancelIoFile@8 @@ -870,6 +871,7 @@ ZwSetSystemPowerState@12 ZwSetSystemTime@8 ZwSetTimer@28 ZwSetTimerResolution@12 +ZwSetUuidSeed@4 ZwSetValueKey@24 ZwSetVolumeInformationFile@20 ZwShutdownSystem@4 diff --git a/reactos/ntoskrnl/Makefile b/reactos/ntoskrnl/Makefile index b62b9c4d0f1..5dce5cf309a 100644 --- a/reactos/ntoskrnl/Makefile +++ b/reactos/ntoskrnl/Makefile @@ -260,6 +260,7 @@ OBJECTS_EX = \ ex/sysinfo.o \ ex/time.o \ ex/util.o \ + ex/uuid.o \ ex/win32k.o \ ex/work.o \ ex/zone.o diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def index 0f4aada183a..5c59357d3b2 100644 --- a/reactos/ntoskrnl/ntoskrnl.def +++ b/reactos/ntoskrnl/ntoskrnl.def @@ -1,4 +1,4 @@ -; $Id: ntoskrnl.def,v 1.199 2004/11/07 22:55:37 navaraf Exp $ +; $Id: ntoskrnl.def,v 1.200 2004/11/12 12:05:27 ekohl Exp $ ; ; reactos/ntoskrnl/ntoskrnl.def ; @@ -767,7 +767,7 @@ NtAddAtom@12 NtAdjustPrivilegesToken@24 NtAlertThread@4 NtAllocateLocallyUniqueId@4 -NtAllocateUuids@12 +NtAllocateUuids@16 NtAllocateVirtualMemory@24 NtBuildNumber DATA NtClose@4 diff --git a/reactos/ntoskrnl/se/semgr.c b/reactos/ntoskrnl/se/semgr.c index 1142c8a5e26..1d62f00f4eb 100644 --- a/reactos/ntoskrnl/se/semgr.c +++ b/reactos/ntoskrnl/se/semgr.c @@ -1,4 +1,4 @@ -/* $Id: semgr.c,v 1.49 2004/10/24 15:26:14 weiden Exp $ +/* $Id: semgr.c,v 1.50 2004/11/12 12:05:05 ekohl Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -190,20 +190,6 @@ VOID SepDeReferenceLogonSession(PLUID AuthenticationId) } - -/* - * @unimplemented - */ -NTSTATUS STDCALL -NtAllocateUuids(PULARGE_INTEGER Time, - PULONG Range, - PULONG Sequence) -{ - UNIMPLEMENTED; - return(STATUS_NOT_IMPLEMENTED); -} - - /* * @implemented */