[PATCH 0/2] MR5856: ntdll: Fixes for RtlQueryRegistryValues with multi-strings.

[PATCH 1/2] ntdll: Fix multi-string callbacks in RtlQueryRegistryValues.

[Alex Henrie]

From: Alex Henrie

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

diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index 3cbd055f367..ec4ec41c5fb 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -250,8 +250,6 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo,
     DWORD res;
     NTSTATUS status = STATUS_SUCCESS;
     ULONG len;
-    LPWSTR String;
-    ULONG count = 0;

if (pInfo == NULL)
     {
@@ -381,38 +379,13 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo,
         }
         else /* REG_MULTI_SZ */
         {
-            if(pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND)
+            for (offset = 0; offset < pInfo->DataLength; offset += len)
             {
-                for (offset = 0; offset <= pInfo->DataLength; offset += len + sizeof(WCHAR))
-                    {
-                    wstr = (WCHAR*)(((CHAR*)pInfo) + offset);
-                    len = wcslen(wstr) * sizeof(WCHAR);
-                    status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, wstr, len,
-                        pContext, pQuery->EntryContext);
-                    if(status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL)
-                        return status;
-                    }
-            }
-            else
-            {
-                while(count<=pInfo->DataLength)
-                {
-                    String = (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset)+count;
-                    count+=wcslen(String)+1;
-                    RtlInitUnicodeString(&src, (WCHAR*)(((CHAR*)pInfo) + pInfo->DataOffset));
-                    res = 0;
-                    dst.MaximumLength = 0;
-                    RtlExpandEnvironmentStrings_U(pEnvironment, &src, &dst, &res);
-                    dst.Length = 0;
-                    dst.MaximumLength = res;
-                    dst.Buffer = RtlAllocateHeap(GetProcessHeap(), 0, res * sizeof(WCHAR));
-                    RtlExpandEnvironmentStrings_U(pEnvironment, &src, &dst, &res);
-                    status = pQuery->QueryRoutine(pQuery->Name, pInfo->Type, dst.Buffer,
-                                                  dst.Length, pContext, pQuery->EntryContext);
-                    RtlFreeHeap(GetProcessHeap(), 0, dst.Buffer);
-                    if(status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL)
-                        return status;
-                }
+                wstr = (WCHAR*)((char*)pInfo + pInfo->DataOffset + offset);
+                len = (wcslen(wstr) + 1) * sizeof(WCHAR);
+                status = pQuery->QueryRoutine(pQuery->Name, REG_SZ, wstr, len, pContext, pQuery->EntryContext);
+                if (status != STATUS_SUCCESS && status != STATUS_BUFFER_TOO_SMALL)
+                    return status;
             }
         }
     }
diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 14227db755c..50e32cf901a 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -2644,7 +2644,7 @@ static struct query_reg_values_test query_reg_values_tests[] =
     /* The query routine is called for every value in current key */
     {
         {{ query_routine }},
-        STATUS_SUCCESS, 4, SKIP_NAME_CHECK | SKIP_DATA_CHECK | WINE_TODO_CALLS
+        STATUS_SUCCESS, 4, SKIP_NAME_CHECK | SKIP_DATA_CHECK
     },
     /* NOVALUE is ignored when the name is not null */
     {
@@ -2686,7 +2686,7 @@ static struct query_reg_values_test query_reg_values_tests[] =
     {
         {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope",
            &query_reg_values_direct_str }},
-        STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0Madrid\0", sizeof(L"Brussels\0Paris\0Madrid\0")
+        STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0")
     },
     /* DIRECT with a null buffer crashes on Windows */
     /* {
@@ -2710,14 +2710,14 @@ static struct query_reg_values_test query_reg_values_tests[] =
         {{ query_routine, RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"WindowsDrive" }},
         STATUS_SUCCESS, 1, 0, REG_EXPAND_SZ, L"%SYSTEMDRIVE%"
     },
-    /* NOEXPAND calls the query routine once for each string in a multi-string */
+    /* NOEXPAND calls the query routine only once instead of once for each string in a multi-string */
     {
         {{ query_routine, 0, (WCHAR*)L"CapitalsOfEurope" }},
-        STATUS_SUCCESS, 3, SPLIT_MULTI | WINE_TODO_CALLS | WINE_TODO_TYPE | WINE_TODO_SIZE | WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0Madrid\0"
+        STATUS_SUCCESS, 3, SPLIT_MULTI, REG_SZ, L"Brussels\0Paris\0%PATH%\0"
     },
     {
         {{ query_routine, RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope" }},
-        STATUS_SUCCESS, 1, WINE_TODO_SIZE, REG_MULTI_SZ, L"Brussels\0Paris\0Madrid\0", sizeof(L"Brussels\0Paris\0Madrid\0")
+        STATUS_SUCCESS, 1, WINE_TODO_SIZE, REG_MULTI_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0")
     },
     /* The default value is used if the registry value does not exist */
     {
@@ -2733,7 +2733,7 @@ static struct query_reg_values_test query_reg_values_tests[] =
         STATUS_SUCCESS, 1, WINE_TODO_TYPE | WINE_TODO_SIZE, REG_SZ, L"C:"
     },
     {
-        {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0Madrid\0" }},
+        {{ query_routine, 0, (WCHAR*)L"I don't exist", NULL, REG_MULTI_SZ, (WCHAR*)L"Brussels\0Paris\0%PATH%\0" }},
         STATUS_SUCCESS, 3, EXPECT_DEFAULT_DATA | SPLIT_MULTI | WINE_TODO_CALLS | WINE_TODO_TYPE | WINE_TODO_SIZE
     },
     {
@@ -2818,7 +2818,7 @@ static void test_RtlQueryRegistryValues(void)
     ok(status == ERROR_SUCCESS, "Failed to create registry value WindowsDrive: %lu\n", status);

status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest", L"CapitalsOfEurope", REG_MULTI_SZ,
-                             L"Brussels\0Paris\0Madrid", sizeof(L"Brussels\0Paris\0Madrid"));
+                             L"Brussels\0Paris\0%PATH%", sizeof(L"Brussels\0Paris\0%PATH%"));
     ok(status == ERROR_SUCCESS, "Failed to create registry value CapitalsOfEurope: %lu\n", status);

status = RegSetKeyValueW(HKEY_CURRENT_USER, L"WineTest\subkey", L"Color", REG_SZ,

[PATCH 2/2] ntdll: Double-null-terminate multi-strings when using RTL_QUERY_REGISTRY_DIRECT.

[Alex Henrie]

From: Alex Henrie

---
 dlls/ntdll/reg.c       | 3 +++
 dlls/ntdll/tests/reg.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c
index ec4ec41c5fb..41dd1853c17 100644
--- a/dlls/ntdll/reg.c
+++ b/dlls/ntdll/reg.c
@@ -321,13 +321,16 @@ static NTSTATUS RTL_ReportRegistryValue(PKEY_VALUE_FULL_INFORMATION pInfo,
             if (!(pQuery->Flags & RTL_QUERY_REGISTRY_NOEXPAND))
                 return STATUS_INVALID_PARAMETER;

+            len += sizeof(WCHAR);
             if (str->Buffer == NULL)
             {
                 str->Buffer = RtlAllocateHeap(GetProcessHeap(), 0, len);
                 str->MaximumLength = len;
             }
             len = min(len, str->MaximumLength);
+            len -= sizeof(WCHAR);
             memcpy(str->Buffer, ((CHAR*)pInfo) + pInfo->DataOffset, len);
+            str->Buffer[len / sizeof(WCHAR)] = 0;
             str->Length = len;
             break;

diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c
index 50e32cf901a..85bcaf5ba7d 100644
--- a/dlls/ntdll/tests/reg.c
+++ b/dlls/ntdll/tests/reg.c
@@ -2686,7 +2686,7 @@ static struct query_reg_values_test query_reg_values_tests[] =
     {
         {{ NULL, RTL_QUERY_REGISTRY_DIRECT | RTL_QUERY_REGISTRY_NOEXPAND, (WCHAR*)L"CapitalsOfEurope",
            &query_reg_values_direct_str }},
-        STATUS_SUCCESS, 0, WINE_TODO_DATA, REG_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0")
+        STATUS_SUCCESS, 0, 0, REG_SZ, L"Brussels\0Paris\0%PATH%\0", sizeof(L"Brussels\0Paris\0%PATH%\0")
     },
     /* DIRECT with a null buffer crashes on Windows */
     /* {