[ros-diffs] [ion] 16161: Remove rosrtl from advapi

Remove rosrtl from advapi
Modified: trunk/reactos/include/ndk/rtlfuncs.h
Modified: trunk/reactos/lib/advapi32/advapi32.h
Modified: trunk/reactos/lib/advapi32/reg/reg.c
  _____

Modified: trunk/reactos/include/ndk/rtlfuncs.h
--- trunk/reactos/include/ndk/rtlfuncs.h	2005-06-20 18:55:05 UTC
(rev 16160)
+++ trunk/reactos/include/ndk/rtlfuncs.h	2005-06-20 18:58:56 UTC
(rev 16161)
@@ -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 
@@ -194,6 +194,16 @@
 }

/*
+ * Constant String Macro
+ */
+#define RTL_CONSTANT_STRING(__SOURCE_STRING__) \
+{ \
+ sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \
+ sizeof(__SOURCE_STRING__), \
+ (__SOURCE_STRING__) \
+}
+
+/*
  * Debug Functions 
  */

_____

Modified: trunk/reactos/lib/advapi32/advapi32.h
--- trunk/reactos/lib/advapi32/advapi32.h	2005-06-20 18:55:05 UTC
(rev 16160)
+++ trunk/reactos/lib/advapi32/advapi32.h	2005-06-20 18:58:56 UTC
(rev 16161)
@@ -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 */
  _____

Modified: trunk/reactos/lib/advapi32/reg/reg.c
--- trunk/reactos/lib/advapi32/reg/reg.c	2005-06-20 18:55:05 UTC
(rev 16160)
+++ trunk/reactos/lib/advapi32/reg/reg.c	2005-06-20 18:58:56 UTC
(rev 16161)
@@ -179,7 +179,7 @@

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 @@
 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 @@
 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 @@
 {
   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\Ha
rdware Profiles\Current");

DPRINT("OpenCurrentConfigKey()\n");