Use RTL_CONSTANT_STRING instead of RtlRos macro

svn path=/trunk/; revision=16111
This commit is contained in:
Alex Ionescu 2005-06-19 20:43:13 +00:00
parent 3b65c45a7c
commit 299cedf334
2 changed files with 8 additions and 8 deletions

View file

@ -650,7 +650,7 @@ CmiCreateCurrentControlSetLink(VOID)
DPRINT("Link target '%S'\n", TargetNameBuffer); DPRINT("Link target '%S'\n", TargetNameBuffer);
RtlInitUnicodeString(&LinkName, LinkName = RTL_CONSTANT_STRING(
L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&LinkName, &LinkName,
@ -670,7 +670,7 @@ CmiCreateCurrentControlSetLink(VOID)
return(Status); return(Status);
} }
RtlInitUnicodeString(&LinkValue, LinkValue = RTL_CONSTANT_STRING(
L"SymbolicLinkValue"); L"SymbolicLinkValue");
Status = ZwSetValueKey(KeyHandle, Status = ZwSetValueKey(KeyHandle,
&LinkValue, &LinkValue,
@ -925,7 +925,7 @@ CmiInitControlSetLink (VOID)
NTSTATUS Status; NTSTATUS Status;
/* Create 'ControlSet001' key */ /* Create 'ControlSet001' key */
RtlInitUnicodeString(&ControlSetKeyName, ControlSetKeyName = RTL_CONSTANT_STRING(
L"\\Registry\\Machine\\SYSTEM\\ControlSet001"); L"\\Registry\\Machine\\SYSTEM\\ControlSet001");
InitializeObjectAttributes (&ObjectAttributes, InitializeObjectAttributes (&ObjectAttributes,
&ControlSetKeyName, &ControlSetKeyName,
@ -947,7 +947,7 @@ CmiInitControlSetLink (VOID)
ZwClose (KeyHandle); ZwClose (KeyHandle);
/* Link 'CurrentControlSet' to 'ControlSet001' key */ /* Link 'CurrentControlSet' to 'ControlSet001' key */
RtlInitUnicodeString (&ControlSetLinkName, ControlSetLinkName = RTL_CONSTANT_STRING(
L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet"); L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet");
InitializeObjectAttributes (&ObjectAttributes, InitializeObjectAttributes (&ObjectAttributes,
&ControlSetLinkName, &ControlSetLinkName,
@ -967,7 +967,7 @@ CmiInitControlSetLink (VOID)
return Status; return Status;
} }
RtlInitUnicodeString (&ControlSetValueName, ControlSetValueName = RTL_CONSTANT_STRING(
L"SymbolicLinkValue"); L"SymbolicLinkValue");
Status = ZwSetValueKey (KeyHandle, Status = ZwSetValueKey (KeyHandle,
&ControlSetValueName, &ControlSetValueName,
@ -1008,7 +1008,7 @@ CmiInitHives(BOOLEAN SetupBoot)
if (SetupBoot == TRUE) if (SetupBoot == TRUE)
{ {
RtlInitUnicodeString(&KeyName, KeyName = RTL_CONSTANT_STRING(
L"\\Registry\\Machine\\HARDWARE"); L"\\Registry\\Machine\\HARDWARE");
InitializeObjectAttributes(&ObjectAttributes, InitializeObjectAttributes(&ObjectAttributes,
&KeyName, &KeyName,
@ -1024,7 +1024,7 @@ CmiInitHives(BOOLEAN SetupBoot)
return(Status); return(Status);
} }
RtlInitUnicodeString(&ValueName, ValueName = RTL_CONSTANT_STRING(
L"InstallPath"); L"InstallPath");
BufferSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 4096; BufferSize = sizeof(KEY_VALUE_PARTIAL_INFORMATION) + 4096;

View file

@ -65,7 +65,7 @@ ExpInitializeCallbacks(VOID)
} }
/* Initialize the Object */ /* Initialize the Object */
RtlInitUnicodeString(&DirName, L"\\Callback" ); DirName = RTL_CONSTANT_STRING(L"\\Callback" );
InitializeObjectAttributes( InitializeObjectAttributes(
&ObjectAttributes, &ObjectAttributes,
&DirName, &DirName,