18 Dec
2023
18 Dec
'23
9:14 p.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0db5d8a3886166e025947…
commit 0db5d8a3886166e0259478df8702a22a1b86168c
Author: Timo Kreuzer <timo.kreuzer(a)reactos.org>
AuthorDate: Thu Dec 14 20:01:18 2023 +0200
Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org>
CommitDate: Mon Dec 18 23:14:14 2023 +0200
[SERVICES] Use RegCopyTreeW from advapi32_vista
---
base/system/services/CMakeLists.txt | 2 +-
base/system/services/controlset.c | 343 +--------------------------
dll/win32/advapi32_vista/advapi32_vista.spec | 1 +
3 files changed, 4 insertions(+), 342 deletions(-)
diff --git a/base/system/services/CMakeLists.txt b/base/system/services/CMakeLists.txt
index ba38f656da2..7961dd54ce1 100644
--- a/base/system/services/CMakeLists.txt
+++ b/base/system/services/CMakeLists.txt
@@ -23,6 +23,6 @@ add_executable(services ${SOURCE} services.rc)
target_link_libraries(services ${PSEH_LIB})
set_module_type(services win32gui UNICODE)
-add_importlibs(services userenv user32 advapi32 rpcrt4 msvcrt kernel32 ntdll)
+add_importlibs(services userenv user32 advapi32 advapi32_vista rpcrt4 msvcrt kernel32
ntdll)
add_pch(services services.h SOURCE)
add_cd_file(TARGET services DESTINATION reactos/system32 FOR all)
diff --git a/base/system/services/controlset.c b/base/system/services/controlset.c
index b387ffd335c..e9fdc967e12 100644
--- a/base/system/services/controlset.c
+++ b/base/system/services/controlset.c
@@ -14,6 +14,8 @@
#define NDEBUG
#include <debug.h>
+LSTATUS WINAPI RegCopyTreeW(_In_ HKEY, _In_opt_ LPCWSTR, _In_ HKEY);
+LSTATUS WINAPI RegDeleteTreeW(_In_ HKEY, _In_opt_ LPCWSTR);
/* GLOBALS *******************************************************************/
@@ -22,337 +24,6 @@ static BOOL bBootAccepted = FALSE;
/* FUNCTIONS *****************************************************************/
-#if (_WIN32_WINNT < 0x0600)
-static
-DWORD
-ScmCopyTree(
- HKEY hSrcKey,
- HKEY hDstKey)
-{
- DWORD dwSubKeys;
- DWORD dwValues;
- DWORD dwType;
- DWORD dwMaxSubKeyNameLength;
- DWORD dwSubKeyNameLength;
- DWORD dwMaxValueNameLength;
- DWORD dwValueNameLength;
- DWORD dwMaxValueLength;
- DWORD dwValueLength;
- DWORD dwDisposition;
- DWORD i;
- LPWSTR lpNameBuffer;
- LPBYTE lpDataBuffer;
- HKEY hDstSubKey;
- HKEY hSrcSubKey;
- DWORD dwError;
-
- DPRINT("ScmCopyTree()\n");
-
- dwError = RegQueryInfoKey(hSrcKey,
- NULL,
- NULL,
- NULL,
- &dwSubKeys,
- &dwMaxSubKeyNameLength,
- NULL,
- &dwValues,
- &dwMaxValueNameLength,
- &dwMaxValueLength,
- NULL,
- NULL);
- if (dwError != ERROR_SUCCESS)
- {
- DPRINT1("RegQueryInfoKey() failed (Error %lu)\n", dwError);
- return dwError;
- }
-
- dwMaxSubKeyNameLength++;
- dwMaxValueNameLength++;
-
- DPRINT("dwSubKeys %lu\n", dwSubKeys);
- DPRINT("dwMaxSubKeyNameLength %lu\n", dwMaxSubKeyNameLength);
- DPRINT("dwValues %lu\n", dwValues);
- DPRINT("dwMaxValueNameLength %lu\n", dwMaxValueNameLength);
- DPRINT("dwMaxValueLength %lu\n", dwMaxValueLength);
-
- /* Copy subkeys */
- if (dwSubKeys != 0)
- {
- lpNameBuffer = HeapAlloc(GetProcessHeap(),
- 0,
- dwMaxSubKeyNameLength * sizeof(WCHAR));
- if (lpNameBuffer == NULL)
- {
- DPRINT1("Buffer allocation failed\n");
- return ERROR_NOT_ENOUGH_MEMORY;
- }
-
- for (i = 0; i < dwSubKeys; i++)
- {
- dwSubKeyNameLength = dwMaxSubKeyNameLength;
- dwError = RegEnumKeyExW(hSrcKey,
- i,
- lpNameBuffer,
- &dwSubKeyNameLength,
- NULL,
- NULL,
- NULL,
- NULL);
- if (dwError != ERROR_SUCCESS)
- {
- DPRINT1("Subkey enumeration failed (Error %lu)\n", dwError);
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- return dwError;
- }
-
- dwError = RegCreateKeyExW(hDstKey,
- lpNameBuffer,
- 0,
- NULL,
- REG_OPTION_NON_VOLATILE,
- KEY_WRITE,
- NULL,
- &hDstSubKey,
- &dwDisposition);
- if (dwError != ERROR_SUCCESS)
- {
- DPRINT1("Subkey creation failed (Error %lu)\n", dwError);
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- return dwError;
- }
-
- dwError = RegOpenKeyExW(hSrcKey,
- lpNameBuffer,
- 0,
- KEY_READ,
- &hSrcSubKey);
- if (dwError != ERROR_SUCCESS)
- {
- DPRINT1("Error: %lu\n", dwError);
- RegCloseKey(hDstSubKey);
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- return dwError;
- }
-
- dwError = ScmCopyTree(hSrcSubKey,
- hDstSubKey);
- if (dwError != ERROR_SUCCESS)
- {
- DPRINT1("Error: %lu\n", dwError);
- RegCloseKey (hSrcSubKey);
- RegCloseKey (hDstSubKey);
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- return dwError;
- }
-
- RegCloseKey(hSrcSubKey);
- RegCloseKey(hDstSubKey);
- }
-
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- }
-
- /* Copy values */
- if (dwValues != 0)
- {
- lpNameBuffer = HeapAlloc(GetProcessHeap(),
- 0,
- dwMaxValueNameLength * sizeof(WCHAR));
- if (lpNameBuffer == NULL)
- {
- DPRINT1("Buffer allocation failed\n");
- return ERROR_NOT_ENOUGH_MEMORY;
- }
-
- /* RegSetValueExW tries to read behind the maximum length, so give it space for
that */
- lpDataBuffer = HeapAlloc(GetProcessHeap(),
- HEAP_ZERO_MEMORY,
- dwMaxValueLength + sizeof(WCHAR));
- if (lpDataBuffer == NULL)
- {
- DPRINT1("Buffer allocation failed\n");
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- return ERROR_NOT_ENOUGH_MEMORY;
- }
-
- for (i = 0; i < dwValues; i++)
- {
- dwValueNameLength = dwMaxValueNameLength;
- dwValueLength = dwMaxValueLength;
- dwError = RegEnumValueW(hSrcKey,
- i,
- lpNameBuffer,
- &dwValueNameLength,
- NULL,
- &dwType,
- lpDataBuffer,
- &dwValueLength);
- if (dwError != ERROR_SUCCESS)
- {
- DPRINT1("Error: %lu\n", dwError);
- HeapFree(GetProcessHeap(),
- 0,
- lpDataBuffer);
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- return dwError;
- }
-
- dwError = RegSetValueExW(hDstKey,
- lpNameBuffer,
- 0,
- dwType,
- lpDataBuffer,
- dwValueLength);
- if (dwError != ERROR_SUCCESS)
- {
- DPRINT1("Error: %lu\n", dwError);
- HeapFree(GetProcessHeap(),
- 0,
- lpDataBuffer);
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- return dwError;
- }
- }
-
- HeapFree(GetProcessHeap(),
- 0,
- lpDataBuffer);
-
- HeapFree(GetProcessHeap(),
- 0,
- lpNameBuffer);
- }
-
- DPRINT("ScmCopyTree() done\n");
-
- return ERROR_SUCCESS;
-}
-
-
-DWORD
-ScmDeleteTree(
- HKEY hKey,
- PCWSTR pszSubKey)
-{
- DWORD dwMaxSubkeyLength, dwMaxValueLength;
- DWORD dwMaxLength, dwSize;
- PWSTR pszName = NULL;
- HKEY hSubKey = NULL;
- DWORD dwError;
-
- if (pszSubKey != NULL)
- {
- dwError = RegOpenKeyExW(hKey, pszSubKey, 0, KEY_READ, &hSubKey);
- if (dwError != ERROR_SUCCESS)
- return dwError;
- }
- else
- {
- hSubKey = hKey;
- }
-
- /* Get highest length for keys, values */
- dwError = RegQueryInfoKeyW(hSubKey,
- NULL,
- NULL,
- NULL,
- NULL,
- &dwMaxSubkeyLength,
- NULL,
- NULL,
- &dwMaxValueLength,
- NULL,
- NULL,
- NULL);
- if (dwError != ERROR_SUCCESS)
- goto done;
-
- dwMaxSubkeyLength++;
- dwMaxValueLength++;
- dwMaxLength = max(dwMaxSubkeyLength, dwMaxValueLength);
-
- /* Allocate a buffer for key and value names */
- pszName = HeapAlloc(GetProcessHeap(),
- 0,
- dwMaxLength * sizeof(WCHAR));
- if (pszName == NULL)
- {
- dwError = ERROR_NOT_ENOUGH_MEMORY;
- goto done;
- }
-
- /* Recursively delete all the subkeys */
- while (TRUE)
- {
- dwSize = dwMaxLength;
- if (RegEnumKeyExW(hSubKey,
- 0,
- pszName,
- &dwSize,
- NULL,
- NULL,
- NULL,
- NULL))
- break;
-
- dwError = ScmDeleteTree(hSubKey, pszName);
- if (dwError != ERROR_SUCCESS)
- goto done;
- }
-
- if (pszSubKey != NULL)
- {
- dwError = RegDeleteKeyW(hKey, pszSubKey);
- }
- else
- {
- while (TRUE)
- {
- dwSize = dwMaxLength;
- if (RegEnumValueW(hKey,
- 0,
- pszName,
- &dwSize,
- NULL,
- NULL,
- NULL,
- NULL))
- break;
-
- dwError = RegDeleteValueW(hKey, pszName);
- if (dwError != ERROR_SUCCESS)
- goto done;
- }
- }
-
-done:
- if (pszName != NULL)
- HeapFree(GetProcessHeap(), 0, pszName);
-
- if (pszSubKey != NULL)
- RegCloseKey(hSubKey);
-
- return dwError;
-}
-#endif
-
-
static
DWORD
ScmGetControlSetValues(
@@ -546,14 +217,9 @@ ScmCopyControlSet(
goto done;
/* Copy the source control set to the destination control set */
-#if (_WIN32_WINNT >= 0x0600)
dwError = RegCopyTreeW(hSourceControlSetKey,
NULL,
hDestinationControlSetKey);
-#else
- dwError = ScmCopyTree(hSourceControlSetKey,
- hDestinationControlSetKey);
-#endif
if (dwError != ERROR_SUCCESS)
goto done;
@@ -595,13 +261,8 @@ ScmDeleteControlSet(
return dwError;
/* Delete the control set */
-#if (_WIN32_WINNT >= 0x0600)
dwError = RegDeleteTreeW(hControlSetKey,
NULL);
-#else
- dwError = ScmDeleteTree(hControlSetKey,
- NULL);
-#endif
/* Open the system key */
RegCloseKey(hControlSetKey);
diff --git a/dll/win32/advapi32_vista/advapi32_vista.spec
b/dll/win32/advapi32_vista/advapi32_vista.spec
index 969207292f6..9ca09897481 100644
--- a/dll/win32/advapi32_vista/advapi32_vista.spec
+++ b/dll/win32/advapi32_vista/advapi32_vista.spec
@@ -1,4 +1,5 @@
+@ stdcall RegCopyTreeW(ptr wstr ptr)
@ stdcall RegDeleteTreeA(long str)
@ stdcall RegDeleteTreeW(long wstr)
@ stdcall RegSetKeyValueW(long wstr wstr long ptr long)