Remove rosrtl from advapi

svn path=/trunk/; revision=16161

diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h
index 0af658b..738b8dc 100644 (file)
--- a/reactos/include/ndk/rtlfuncs.h
+++ b/reactos/include/ndk/rtlfuncs.h
@@ -15,7 +15,7 @@
 
 /* PROTOTYPES ****************************************************************/
 
-/* FIXME: FILE NEEDS TO BE CLEANED UP AT THE END WHEN ALL THE FUNCTIONS HAVE BEEN ADDED */
+/* FIXME: FILE NEEDS SOME ALPHABETIZING AND REGROUP */
 
 /* List Macros */
 static __inline 
@@ -193,6 +193,16 @@ RemoveTailList(
   InsertTailList(current, &((NewEntry)->ListEntryField));\
 }
 
+/*
+ * Constant String Macro
+ */
+#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \
+{ \
+ sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \
+ sizeof(__SOURCE_STRING__), \
+ (__SOURCE_STRING__) \
+}
+
 /*
  * Debug Functions 
  */

diff --git a/reactos/lib/advapi32/advapi32.h b/reactos/lib/advapi32/advapi32.h
index efc9b9e..ac37127 100644 (file)
--- a/reactos/lib/advapi32/advapi32.h
+++ b/reactos/lib/advapi32/advapi32.h
@@ -15,5 +15,4 @@
 #define NTOS_MODE_USER
 #include <ndk/ntndk.h>
 
-/* FIXME: ROSRTL */
-#include <rosrtl/string.h>
\ No newline at end of file
+/* EOF */

diff --git a/reactos/lib/advapi32/reg/reg.c b/reactos/lib/advapi32/reg/reg.c
index 461d9f5..7355714 100644 (file)
--- a/reactos/lib/advapi32/reg/reg.c
+++ b/reactos/lib/advapi32/reg/reg.c
@@ -179,7 +179,7 @@ static NTSTATUS
 OpenClassesRootKey (PHANDLE KeyHandle)
 {
   OBJECT_ATTRIBUTES Attributes;
-  UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\Machine\\Software\\CLASSES");
+  UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\Software\\CLASSES");
 
   DPRINT("OpenClassesRootKey()\n");
 
@@ -198,7 +198,7 @@ static NTSTATUS
 OpenLocalMachineKey (PHANDLE KeyHandle)
 {
   OBJECT_ATTRIBUTES Attributes;
-  UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\Machine");
+  UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine");
   NTSTATUS Status;
 
   DPRINT("OpenLocalMachineKey()\n");
@@ -221,7 +221,7 @@ static NTSTATUS
 OpenUsersKey (PHANDLE KeyHandle)
 {
   OBJECT_ATTRIBUTES Attributes;
-  UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\User");
+  UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\User");
 
   DPRINT("OpenUsersKey()\n");
 
@@ -241,7 +241,7 @@ OpenCurrentConfigKey (PHANDLE KeyHandle)
 {
   OBJECT_ATTRIBUTES Attributes;
   UNICODE_STRING KeyName =
-  ROS_STRING_INITIALIZER(L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current");
+  RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Hardware Profiles\\Current");
 
   DPRINT("OpenCurrentConfigKey()\n");