mirror of
https://github.com/reactos/reactos.git
synced 2024-06-23 14:31:47 +00:00
Revert "[VIDEOPRT] Fix updating of new registry path values"
This reverts commitecf3416f49
. This commit was meant to fix CORE-17688. While its effectively fixed the problem, it introduced another regression CORE-17719. In the mean time, commitc05a45e17e
fixed things properly. CORE-17719
This commit is contained in:
parent
ee3659d5d5
commit
5dc56dd1d6
|
@ -557,42 +557,42 @@ IntCreateNewRegistryPath(
|
||||||
ERR_(VIDEOPRT, "Failed create key '%wZ'\n", &DeviceExtension->NewRegistryPath);
|
ERR_(VIDEOPRT, "Failed create key '%wZ'\n", &DeviceExtension->NewRegistryPath);
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
/* Open the new key */
|
/* Open the new key */
|
||||||
InitializeObjectAttributes(&ObjectAttributes,
|
InitializeObjectAttributes(&ObjectAttributes,
|
||||||
&DeviceExtension->NewRegistryPath,
|
&DeviceExtension->NewRegistryPath,
|
||||||
OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
|
OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes);
|
Status = ZwOpenKey(&NewKey, KEY_READ, &ObjectAttributes);
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status);
|
ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status);
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Open the device profile key */
|
/* Open the device profile key */
|
||||||
InitializeObjectAttributes(&ObjectAttributes,
|
InitializeObjectAttributes(&ObjectAttributes,
|
||||||
&DeviceExtension->RegistryPath,
|
&DeviceExtension->RegistryPath,
|
||||||
OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
|
OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
|
||||||
NULL,
|
NULL,
|
||||||
NULL);
|
NULL);
|
||||||
Status = ZwOpenKey(&SettingsKey, KEY_READ, &ObjectAttributes);
|
Status = ZwOpenKey(&SettingsKey, KEY_READ, &ObjectAttributes);
|
||||||
if (!NT_SUCCESS(Status))
|
if (!NT_SUCCESS(Status))
|
||||||
{
|
{
|
||||||
ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status);
|
ERR_(VIDEOPRT, "Failed to open settings key. Status 0x%lx\n", Status);
|
||||||
|
ObCloseHandle(NewKey, KernelMode);
|
||||||
|
return Status;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Copy the registry data from the legacy key */
|
||||||
|
Status = IntCopyRegistryKey(SettingsKey, NewKey);
|
||||||
|
|
||||||
|
/* Close the key handles */
|
||||||
|
ObCloseHandle(SettingsKey, KernelMode);
|
||||||
ObCloseHandle(NewKey, KernelMode);
|
ObCloseHandle(NewKey, KernelMode);
|
||||||
return Status;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Copy the registry data from the legacy key */
|
|
||||||
Status = IntCopyRegistryKey(SettingsKey, NewKey);
|
|
||||||
|
|
||||||
/* Close the key handles */
|
|
||||||
ObCloseHandle(SettingsKey, KernelMode);
|
|
||||||
ObCloseHandle(NewKey, KernelMode);
|
|
||||||
|
|
||||||
return Status;
|
return Status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue