Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:52:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove rosrtl from advapi

Browse source 
svn path=/trunk/; revision=16161
This commit is contained in:
Alex Ionescu 2005-06-20 18:58:56 +00:00
parent cf9968925b
commit 44b8b1697a
3 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/include/ndk/rtlfuncs.h
View file

@ -15,7 +15,7 @@
/* PROTOTYPES ****************************************************************/ /* 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 */ /* List Macros */
static __inline static __inline
@ -193,6 +193,16 @@ RemoveTailList(
InsertTailList(current, &((NewEntry)->ListEntryField));\ 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 * Debug Functions
*/ */

3
reactos/lib/advapi32/advapi32.h
View file

@ -15,5 +15,4 @@
#define NTOS_MODE_USER #define NTOS_MODE_USER
#include <ndk/ntndk.h> #include <ndk/ntndk.h>
/* FIXME: ROSRTL */ /* EOF */
#include <rosrtl/string.h>

8
reactos/lib/advapi32/reg/reg.c
View file

@ -179,7 +179,7 @@ static NTSTATUS
OpenClassesRootKey (PHANDLE KeyHandle) OpenClassesRootKey (PHANDLE KeyHandle)
{ {
OBJECT_ATTRIBUTES Attributes; 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"); DPRINT("OpenClassesRootKey()\n");
@ -198,7 +198,7 @@ static NTSTATUS
OpenLocalMachineKey (PHANDLE KeyHandle) OpenLocalMachineKey (PHANDLE KeyHandle)
{ {
OBJECT_ATTRIBUTES Attributes; OBJECT_ATTRIBUTES Attributes;
UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\Machine"); UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine");
NTSTATUS Status; NTSTATUS Status;
DPRINT("OpenLocalMachineKey()\n"); DPRINT("OpenLocalMachineKey()\n");
@ -221,7 +221,7 @@ static NTSTATUS
OpenUsersKey (PHANDLE KeyHandle) OpenUsersKey (PHANDLE KeyHandle)
{ {
OBJECT_ATTRIBUTES Attributes; OBJECT_ATTRIBUTES Attributes;
UNICODE_STRING KeyName = ROS_STRING_INITIALIZER(L"\\Registry\\User"); UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\User");
DPRINT("OpenUsersKey()\n"); DPRINT("OpenUsersKey()\n");
@ -241,7 +241,7 @@ OpenCurrentConfigKey (PHANDLE KeyHandle)
{ {
OBJECT_ATTRIBUTES Attributes; OBJECT_ATTRIBUTES Attributes;
UNICODE_STRING KeyName = 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"); DPRINT("OpenCurrentConfigKey()\n");