Remove rosrtl usage from usetup Modified: trunk/reactos/subsys/system/usetup/registry.c Modified: trunk/reactos/subsys/system/usetup/usetup.c Modified: trunk/reactos/subsys/system/usetup/usetup.h _____
Modified: trunk/reactos/subsys/system/usetup/registry.c --- trunk/reactos/subsys/system/usetup/registry.c 2005-06-20 22:49:45 UTC (rev 16195) +++ trunk/reactos/subsys/system/usetup/registry.c 2005-06-20 22:51:54 UTC (rev 16196) @@ -604,14 +604,12 @@
SetInstallPathValue(PUNICODE_STRING InstallPath) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING KeyName; - UNICODE_STRING ValueName; + UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\Registry\Machine\HARDWARE"); + UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"InstallPath"); HANDLE KeyHandle; NTSTATUS Status;
- /* Create the 'secret' InstallPath key */ - RtlRosInitUnicodeStringFromLiteral (&KeyName, - L"\Registry\Machine\HARDWARE"); + /* Create the 'secret' InstallPath key */ InitializeObjectAttributes (&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, @@ -626,8 +624,6 @@ return FALSE; }
- RtlRosInitUnicodeStringFromLiteral (&ValueName, - L"InstallPath"); Status = NtSetValueKey (KeyHandle, &ValueName, 0, _____
Modified: trunk/reactos/subsys/system/usetup/usetup.c --- trunk/reactos/subsys/system/usetup/usetup.c 2005-06-20 22:49:45 UTC (rev 16195) +++ trunk/reactos/subsys/system/usetup/usetup.c 2005-06-20 22:51:54 UTC (rev 16196) @@ -3705,10 +3705,9 @@
{ NTSTATUS Status; OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeString; + UNICODE_STRING UnicodeString = RTL_CONSTANT_STRING(L"\ReactOSInitDone"); HANDLE ReactOSInitEvent;
- RtlRosInitUnicodeStringFromLiteral(&UnicodeString, L"\ReactOSInitDone"); InitializeObjectAttributes(&ObjectAttributes, &UnicodeString, EVENT_ALL_ACCESS, _____
Modified: trunk/reactos/subsys/system/usetup/usetup.h --- trunk/reactos/subsys/system/usetup/usetup.h 2005-06-20 22:49:45 UTC (rev 16195) +++ trunk/reactos/subsys/system/usetup/usetup.h 2005-06-20 22:51:54 UTC (rev 16196) @@ -42,9 +42,6 @@
/* FIXME: Put outside of DDK */ #include <ddk/ntddblue.h>
-/* FIXME: KILL ROSRTL */ -#include <rosrtl/string.h> - /* Helper Header */ #include <reactos/helper.h>