[PATCH 1/2] ntdll: Copy the correct number of bytes with RTL_QUERY_REGISTRY_DIRECT.

[Alex Henrie]

From: Alex Henrie

---
 dlls/ntdll/reg.c       | 2 +-
 dlls/ntdll/tests/reg.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index d4bf530537a..265ea34d962 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -259,7 +259,7 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo,
         {
             ULONG default_size = pQuery->DefaultLength;
             if (!default_size && pQuery->DefaultType == REG_SZ && pQuery->DefaultData)
-                default_size = wcslen(pQuery->DefaultData) + 1;
+                default_size = (wcslen(pQuery->DefaultData) + 1) * sizeof(WCHAR);
             if (str->MaximumLength < default_size)
                 return STATUS_BUFFER_TOO_SMALL;
             memcpy(str->Buffer, pQuery->DefaultData, default_size);
diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index fe36ce41a29..afbf921469b 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -2734,7 +2734,7 @@ static struct query_reg_values_test query_reg_values_tests[] =
     {
         {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist",
            &query_reg_values_direct_str, REG_SZ, (WCHAR*)L"%SYSTEMDRIVE%" }},
-        STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA | WINE_TODO_DATA
+        STATUS_SUCCESS, 0, EXPECT_DEFAULT_DATA
     },
     {
         {{ NULL, RTL_QUERY_REGISTRY_DIRECT, (WCHAR*)L"I don't exist",