10 Jul
2014
10 Jul
'14
9:05 a.m.
Author: jgardou
Date: Thu Jul 10 09:05:37 2014
New Revision: 63705
URL: http://svn.reactos.org/svn/reactos?rev=63705&view=rev
Log:
[NTOSKRNL]
- Partial revert of r63700 on Alex's request
- This cancels the "Use ZwSetValueKey" instead of NtSetValueKey" part
Oddly enough, it doesn't cause a problem anymore. I must have messed up in my initial
testings
Modified:
trunk/reactos/ntoskrnl/config/cmconfig.c
trunk/reactos/ntoskrnl/config/cmsysini.c
trunk/reactos/ntoskrnl/config/i386/cmhardwr.c
trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c
trunk/reactos/ntoskrnl/ex/init.c
trunk/reactos/ntoskrnl/io/iomgr/bootlog.c
Modified: trunk/reactos/ntoskrnl/config/cmconfig.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c…
==============================================================================
--- trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] Thu Jul 10 09:05:37 2014
@@ -97,7 +97,7 @@
/* Setup the component information key */
RtlInitUnicodeString(&ValueName, L"Component Information");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_BINARY,
@@ -124,7 +124,7 @@
if (NT_SUCCESS(Status))
{
/* Save the identifier in the registry */
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_SZ,
@@ -178,7 +178,7 @@
CmpConfigurationData->BusNumber = BusNumber;
/* Save the actual data */
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_FULL_RESOURCE_DESCRIPTOR,
Modified: trunk/reactos/ntoskrnl/config/cmsysini.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c…
==============================================================================
--- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Thu Jul 10 09:05:37 2014
@@ -416,7 +416,7 @@
/* Key opened, now write to the key */
RtlInitUnicodeString(&KeyName, L"SystemStartOptions");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&KeyName,
0,
REG_SZ,
@@ -427,7 +427,7 @@
/* Setup value name for system boot device in ARC format */
RtlInitUnicodeString(&KeyName, L"SystemBootDevice");
RtlCreateUnicodeStringFromAsciiz(&ValueName, LoaderBlock->ArcBootDeviceName);
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&KeyName,
0,
REG_SZ,
@@ -474,7 +474,7 @@
OBJ_CASE_INSENSITIVE,
NULL,
NULL);
- Status = ZwOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes);
+ Status = NtOpenKey(&SelectHandle, KEY_READ, &ObjectAttributes);
if (!NT_SUCCESS(Status))
{
/* ReactOS Hack: Hard-code current to 001 for SetupLdr */
@@ -488,17 +488,16 @@
OBJ_CASE_INSENSITIVE,
NULL,
NULL);
- Status = ZwCreateKey(&KeyHandle,
+ Status = NtCreateKey(&KeyHandle,
KEY_ALL_ACCESS,
&ObjectAttributes,
0,
NULL,
0,
&Disposition);
- if (!NT_SUCCESS(Status))
- return Status;
-
- /* We don't need the handle */
+ if (!NT_SUCCESS(Status)) return Status;
+
+ /* Don't need the handle */
ZwClose(KeyHandle);
/* Use hard-coded setting */
@@ -534,7 +533,7 @@
OBJ_CASE_INSENSITIVE,
NULL,
NULL);
- Status = ZwCreateKey(&KeyHandle,
+ Status = NtCreateKey(&KeyHandle,
KEY_CREATE_LINK,
&ObjectAttributes,
0,
@@ -558,7 +557,7 @@
Status = RtlAnsiStringToUnicodeString(&KeyName, &TempString, FALSE);
/* Set the value */
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&CmSymbolicLinkValueName,
0,
REG_LINK,
@@ -573,7 +572,7 @@
KeyHandle,
NULL);
Status = NtOpenKey(&ConfigHandle, KEY_READ, &ObjectAttributes);
- ZwClose(KeyHandle);
+ NtClose(KeyHandle);
/* Check if we don't have one */
if (!NT_SUCCESS(Status))
@@ -690,7 +689,7 @@
ASSERT(STATUS_SUCCESS == Status);
/* Set it */
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&CmSymbolicLinkValueName,
0,
REG_LINK,
@@ -2181,7 +2180,7 @@
RtlInitUnicodeString(&ValueData,
Buffer);
- ZwSetValueKey(CurrentVersionKeyHandle,
+ NtSetValueKey(CurrentVersionKeyHandle,
&ValueName,
0,
REG_SZ,
Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar…
==============================================================================
--- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Thu Jul 10 09:05:37 2014
@@ -268,7 +268,7 @@
/* Set the value */
RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension");
- ZwSetValueKey(KeyHandle,
+ NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_DWORD,
@@ -463,7 +463,7 @@
/* Add it to the registry */
RtlInitUnicodeString(&ValueName,
L"ProcessorNameString");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_SZ,
@@ -486,7 +486,7 @@
/* Add it to the registry */
RtlInitUnicodeString(&ValueName, L"VendorIdentifier");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_SZ,
@@ -502,7 +502,7 @@
{
/* Add them to the registry */
RtlInitUnicodeString(&ValueName, L"FeatureSet");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_DWORD,
@@ -515,7 +515,7 @@
{
/* Add it to the registry */
RtlInitUnicodeString(&ValueName, L"~MHz");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_DWORD,
@@ -528,7 +528,7 @@
{
/* Add it to the registry */
RtlInitUnicodeString(&ValueName, L"Update Signature");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_BINARY,
@@ -621,7 +621,7 @@
/* Write the date into the registry */
RtlInitUnicodeString(&ValueName, L"SystemBiosDate");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_SZ,
@@ -643,7 +643,7 @@
if (NT_SUCCESS(Status))
{
/* Save it to the registry */
- Status = ZwSetValueKey(BiosHandle,
+ Status = NtSetValueKey(BiosHandle,
&ValueName,
0,
REG_SZ,
@@ -703,7 +703,7 @@
/* Write the BIOS Version to the registry */
RtlInitUnicodeString(&ValueName, L"SystemBiosVersion");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_MULTI_SZ,
@@ -746,7 +746,7 @@
/* Write the date into the registry */
RtlInitUnicodeString(&ValueName, L"VideoBiosDate");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_SZ,
@@ -801,7 +801,7 @@
/* Write the BIOS Version to the registry */
RtlInitUnicodeString(&ValueName, L"VideoBiosVersion");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_MULTI_SZ,
Modified: trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/powerpc/cm…
==============================================================================
--- trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/powerpc/cmhardwr.c [iso-8859-1] Thu Jul 10 09:05:37
2014
@@ -267,7 +267,7 @@
/* Set the value */
RtlInitUnicodeString(&ValueName, L"PhysicalAddressExtension");
- ZwSetValueKey(KeyHandle,
+ NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_DWORD,
@@ -465,7 +465,7 @@
/* Add it to the registry */
RtlInitUnicodeString(&ValueName,
L"ProcessorNameString");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_SZ,
@@ -488,7 +488,7 @@
/* Add it to the registry */
RtlInitUnicodeString(&ValueName, L"VendorIdentifier");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_SZ,
@@ -504,7 +504,7 @@
{
/* Add them to the registry */
RtlInitUnicodeString(&ValueName, L"FeatureSet");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_DWORD,
@@ -517,7 +517,7 @@
{
/* Add it to the registry */
RtlInitUnicodeString(&ValueName, L"~MHz");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_DWORD,
@@ -530,7 +530,7 @@
{
/* Add it to the registry */
RtlInitUnicodeString(&ValueName, L"Update Signature");
- Status = ZwSetValueKey(KeyHandle,
+ Status = NtSetValueKey(KeyHandle,
&ValueName,
0,
REG_BINARY,
@@ -623,7 +623,7 @@
/* Write the date into the registry */
RtlInitUnicodeString(&ValueName, L"SystemBiosDate");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_SZ,
@@ -645,7 +645,7 @@
if (NT_SUCCESS(Status))
{
/* Save it to the registry */
- Status = ZwSetValueKey(BiosHandle,
+ Status = NtSetValueKey(BiosHandle,
&ValueName,
0,
REG_SZ,
@@ -705,7 +705,7 @@
/* Write the BIOS Version to the registry */
RtlInitUnicodeString(&ValueName, L"SystemBiosVersion");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_MULTI_SZ,
@@ -749,7 +749,7 @@
/* Write the date into the registry */
RtlInitUnicodeString(&ValueName, L"VideoBiosDate");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_SZ,
@@ -804,7 +804,7 @@
/* Write the BIOS Version to the registry */
RtlInitUnicodeString(&ValueName, L"VideoBiosVersion");
- Status = ZwSetValueKey(SystemHandle,
+ Status = NtSetValueKey(SystemHandle,
&ValueName,
0,
REG_MULTI_SZ,
Modified: trunk/reactos/ntoskrnl/ex/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=637…
==============================================================================
--- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Jul 10 09:05:37 2014
@@ -1853,7 +1853,7 @@
{
/* Write the safe boot type */
RtlInitUnicodeString(&KeyName, L"OptionValue");
- ZwSetValueKey(OptionHandle,
+ NtSetValueKey(OptionHandle,
&KeyName,
0,
REG_DWORD,
@@ -1866,7 +1866,7 @@
/* Remember this for later */
Disposition = TRUE;
RtlInitUnicodeString(&KeyName, L"UseAlternateShell");
- ZwSetValueKey(OptionHandle,
+ NtSetValueKey(OptionHandle,
&KeyName,
0,
REG_DWORD,
Modified: trunk/reactos/ntoskrnl/io/iomgr/bootlog.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/bootlog.…
==============================================================================
--- trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/io/iomgr/bootlog.c [iso-8859-1] Thu Jul 10 09:05:37 2014
@@ -135,7 +135,7 @@
if (!NT_SUCCESS(Status))
{
- DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status);
+ DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);
}
else
{