diff --git a/reactos/include/ddk/rtl.h b/reactos/include/ddk/rtl.h
index e92906cd78e..3f99e9f4478 100644
--- a/reactos/include/ddk/rtl.h
+++ b/reactos/include/ddk/rtl.h
@@ -1,4 +1,4 @@
-/* $Id: rtl.h,v 1.47 2001/02/10 22:51:07 dwelch Exp $
+/* $Id: rtl.h,v 1.48 2001/03/01 15:33:39 ekohl Exp $
  * 
  */
 
@@ -814,6 +814,13 @@ RtlDowncaseUnicodeString (
 	IN BOOLEAN		AllocateDestinationString
 	);
 
+NTSTATUS
+STDCALL
+RtlEmptyAtomTable (
+	IN	PRTL_ATOM_TABLE	AtomTable,
+		ULONG		Unknown2
+	);
+
 LARGE_INTEGER
 STDCALL
 RtlEnlargedIntegerMultiply (
@@ -1398,6 +1405,17 @@ RtlPrefixUnicodeString (
 	BOOLEAN		CaseInsensitive
 	);
 
+NTSTATUS
+STDCALL
+RtlQueryAtomInAtomTable (
+	IN	PRTL_ATOM_TABLE	AtomTable,
+	IN	PRTL_ATOM	Atom,
+	IN	ULONG		Unknown3,
+	IN	ULONG		Unknown4,
+	IN OUT	PVOID		Buffer,
+	IN OUT	PULONG		ReturnLength
+	);
+
 NTSTATUS
 STDCALL
 RtlQueryRegistryValues (
diff --git a/reactos/ntoskrnl/nt/atom.c b/reactos/ntoskrnl/nt/atom.c
index 336e40b3eac..efb1729e960 100644
--- a/reactos/ntoskrnl/nt/atom.c
+++ b/reactos/ntoskrnl/nt/atom.c
@@ -1,4 +1,4 @@
-/* $Id: atom.c,v 1.4 2000/10/08 12:49:26 ekohl Exp $
+/* $Id: atom.c,v 1.5 2001/03/01 15:35:40 ekohl Exp $
  *
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
@@ -13,9 +13,10 @@
 
 #include <ddk/ntddk.h>
 
+//#define NDEBUG
 #include <internal/debug.h>
 
-static PRTL_ATOM_TABLE RtlpGetGlobalAtomTable (VOID);
+static PRTL_ATOM_TABLE RtlpGetGlobalAtomTable(VOID);
 
 /* GLOBALS *******************************************************************/
 
@@ -24,10 +25,9 @@ static PRTL_ATOM_TABLE GlobalAtomTable = NULL;
 /* FUNCTIONS *****************************************************************/
 
 
-NTSTATUS
-STDCALL
-NtAddAtom (OUT PRTL_ATOM Atom,
-	   IN PUNICODE_STRING AtomString)
+NTSTATUS STDCALL
+NtAddAtom(OUT PRTL_ATOM Atom,
+	  IN PUNICODE_STRING AtomString)
 {
    PRTL_ATOM_TABLE AtomTable;
 
@@ -41,9 +41,8 @@ NtAddAtom (OUT PRTL_ATOM Atom,
 }
 
 
-NTSTATUS
-STDCALL
-NtDeleteAtom (IN RTL_ATOM Atom)
+NTSTATUS STDCALL
+NtDeleteAtom(IN RTL_ATOM Atom)
 {
    PRTL_ATOM_TABLE AtomTable;
 
@@ -56,10 +55,9 @@ NtDeleteAtom (IN RTL_ATOM Atom)
 }
 
 
-NTSTATUS
-STDCALL
-NtFindAtom (OUT PRTL_ATOM Atom,
-	    IN PUNICODE_STRING AtomString)
+NTSTATUS STDCALL
+NtFindAtom(OUT PRTL_ATOM Atom,
+	   IN PUNICODE_STRING AtomString)
 {
    PRTL_ATOM_TABLE AtomTable;
 
@@ -73,14 +71,12 @@ NtFindAtom (OUT PRTL_ATOM Atom,
 }
 
 
-NTSTATUS
-STDCALL
-NtQueryInformationAtom (IN RTL_ATOM Atom,
-	IN	CINT	AtomInformationClass,
-	OUT	PVOID	AtomInformation,
-	IN	ULONG	AtomInformationLength,
-	OUT	PULONG	ReturnLength
-	)
+NTSTATUS STDCALL
+NtQueryInformationAtom(IN RTL_ATOM Atom,
+		       IN CINT AtomInformationClass,
+		       OUT PVOID AtomInformation,
+		       IN ULONG AtomInformationLength,
+		       OUT PULONG ReturnLength)
 {
 #if 0
    PRTL_ATOM_TABLE AtomTable;
@@ -100,7 +96,7 @@ NtQueryInformationAtom (IN RTL_ATOM Atom,
 
 
 static PRTL_ATOM_TABLE
-RtlpGetGlobalAtomTable (VOID)
+RtlpGetGlobalAtomTable(VOID)
 {
    NTSTATUS Status;
 
@@ -116,8 +112,8 @@ RtlpGetGlobalAtomTable (VOID)
 
 
 NTSTATUS STDCALL
-RtlCreateAtomTable (ULONG TableSize,
-		    PRTL_ATOM_TABLE *AtomTable)
+RtlCreateAtomTable(ULONG TableSize,
+		   PRTL_ATOM_TABLE *AtomTable)
 {
 #if 0
    PRTL_ATOM_TABLE Table;
@@ -143,7 +139,7 @@ RtlCreateAtomTable (ULONG TableSize,
 
 
 NTSTATUS STDCALL
-RtlDestroyAtomTable (IN PRTL_ATOM_TABLE AtomTable)
+RtlDestroyAtomTable(IN PRTL_ATOM_TABLE AtomTable)
 {
    UNIMPLEMENTED;
    return STATUS_SUCCESS;
@@ -151,8 +147,8 @@ RtlDestroyAtomTable (IN PRTL_ATOM_TABLE AtomTable)
 
 
 NTSTATUS STDCALL
-RtlEmptyAtomTable (IN PRTL_ATOM_TABLE AtomTable,
-		   ULONG Unknown2)
+RtlEmptyAtomTable(IN PRTL_ATOM_TABLE AtomTable,
+		  ULONG Unknown2)
 {
    UNIMPLEMENTED;
    return STATUS_SUCCESS;
@@ -160,9 +156,9 @@ RtlEmptyAtomTable (IN PRTL_ATOM_TABLE AtomTable,
 
 
 NTSTATUS STDCALL
-RtlAddAtomToAtomTable (IN PRTL_ATOM_TABLE AtomTable,
-		       IN PWSTR AtomName,
-		       OUT PRTL_ATOM Atom)
+RtlAddAtomToAtomTable(IN PRTL_ATOM_TABLE AtomTable,
+		      IN PWSTR AtomName,
+		      OUT PRTL_ATOM Atom)
 {
    UNIMPLEMENTED;
    return STATUS_SUCCESS;
@@ -170,8 +166,8 @@ RtlAddAtomToAtomTable (IN PRTL_ATOM_TABLE AtomTable,
 
 
 NTSTATUS STDCALL
-RtlDeleteAtomFromAtomTable (IN PRTL_ATOM_TABLE AtomTable,
-			    IN RTL_ATOM Atom)
+RtlDeleteAtomFromAtomTable(IN PRTL_ATOM_TABLE AtomTable,
+			   IN RTL_ATOM Atom)
 {
    UNIMPLEMENTED;
    return STATUS_SUCCESS;
@@ -179,9 +175,9 @@ RtlDeleteAtomFromAtomTable (IN PRTL_ATOM_TABLE AtomTable,
 
 
 NTSTATUS STDCALL
-RtlLookupAtomInAtomTable (IN PRTL_ATOM_TABLE AtomTable,
-			  IN PUNICODE_STRING AtomName,
-			  OUT PRTL_ATOM Atom)
+RtlLookupAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable,
+			 IN PUNICODE_STRING AtomName,
+			 OUT PRTL_ATOM Atom)
 {
    UNIMPLEMENTED;
    return STATUS_SUCCESS;
@@ -189,19 +185,24 @@ RtlLookupAtomInAtomTable (IN PRTL_ATOM_TABLE AtomTable,
 
 
 NTSTATUS STDCALL
-RtlPinAtomInAtomTable (IN PRTL_ATOM_TABLE AtomTable,
-		       IN PRTL_ATOM Atom)
+RtlPinAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable,
+		      IN PRTL_ATOM Atom)
 {
    UNIMPLEMENTED;
    return STATUS_SUCCESS;
 }
 
 
-/*
 NTSTATUS STDCALL
-RtlQueryAtomInAtomTable (IN PRTL_ATOM_TABLE AtomTable,
-			 IN RTL_ATOM Atom,
-*/
-
+RtlQueryAtomInAtomTable(IN PRTL_ATOM_TABLE AtomTable,
+			IN PRTL_ATOM Atom,
+			IN ULONG Unknown3,
+			IN ULONG Unknown4,
+			IN OUT PVOID Buffer,
+			IN OUT PULONG ReturnLength)
+{
+   UNIMPLEMENTED;
+   return STATUS_SUCCESS;
+}
 
 /* EOF */
diff --git a/reactos/ntoskrnl/ntoskrnl.def b/reactos/ntoskrnl/ntoskrnl.def
index 2e8db103d26..9baae1ebe92 100644
--- a/reactos/ntoskrnl/ntoskrnl.def
+++ b/reactos/ntoskrnl/ntoskrnl.def
@@ -1,4 +1,4 @@
-; $Id: ntoskrnl.def,v 1.98 2001/02/21 18:19:19 ekohl Exp $
+; $Id: ntoskrnl.def,v 1.99 2001/03/01 15:36:34 ekohl Exp $
 ;
 ; reactos/ntoskrnl/ntoskrnl.def
 ;
@@ -668,7 +668,7 @@ RtlDeleteRegistryValue@12
 RtlDestroyAtomTable@4
 ;RtlDestroyHeap
 RtlDowncaseUnicodeString@12
-;RtlEmptyAtomTable
+RtlEmptyAtomTable@8
 RtlEnlargedIntegerMultiply@8
 RtlEnlargedUnsignedDivide@16
 RtlEnlargedUnsignedMultiply@8
@@ -749,7 +749,7 @@ RtlOemToUnicodeN@20
 RtlPinAtomInAtomTable@8
 RtlPrefixString@12
 RtlPrefixUnicodeString@12
-;RtlQueryAtomInAtomTable
+RtlQueryAtomInAtomTable@24
 RtlQueryRegistryValues@20
 ;RtlQueryTimeZoneInformation
 RtlRaiseException@4
diff --git a/reactos/ntoskrnl/ntoskrnl.edf b/reactos/ntoskrnl/ntoskrnl.edf
index f68ae1931b5..f86d966f4c1 100644
--- a/reactos/ntoskrnl/ntoskrnl.edf
+++ b/reactos/ntoskrnl/ntoskrnl.edf
@@ -1,4 +1,4 @@
-; $Id: ntoskrnl.edf,v 1.85 2001/02/21 18:19:19 ekohl Exp $
+; $Id: ntoskrnl.edf,v 1.86 2001/03/01 15:36:34 ekohl Exp $
 ;
 ; reactos/ntoskrnl/ntoskrnl.def
 ;
@@ -667,7 +667,7 @@ RtlDeleteRegistryValue=RtlDeleteRegistryValue@12
 RtlDestroyAtomTable=RtlDestroyAtomTable@4
 ;RtlDestroyHeap
 RtlDowncaseUnicodeString=RtlDowncaseUnicodeString@12
-;RtlEmptyAtomTable
+RtlEmptyAtomTable=RtlEmptyAtomTable@8
 RtlEnlargedIntegerMultiply=RtlEnlargedIntegerMultiply@8
 RtlEnlargedUnsignedDivide=RtlEnlargedUnsignedDivide@16
 RtlEnlargedUnsignedMultiply=RtlEnlargedUnsignedMultiply@8
@@ -747,7 +747,7 @@ RtlOemStringToUnicodeString=RtlOemStringToUnicodeString@12
 RtlPinAtomInAtomTable=RtlPinAtomInAtomTable@8
 RtlPrefixString=RtlPrefixString@12
 RtlPrefixUnicodeString=RtlPrefixUnicodeString@12
-;RtlQueryAtomInAtomTable
+RtlQueryAtomInAtomTable=RtlQueryAtomInAtomTable@24
 RtlQueryRegistryValues=RtlQueryRegistryValues@20
 ;RtlQueryTimeZoneInformation
 RtlRaiseException=RtlRaiseException@4