[WIN32K]

- Revert r51139. Fixes incorrect reading of all REG_MULTI_SZ values
See issue #6295 for more details.

svn path=/trunk/; revision=52149

diff --git a/reactos/subsystems/win32/win32k/misc/registry.c b/reactos/subsystems/win32/win32k/misc/registry.c
index 455aa3f..a572b9e 100644 (file)
--- a/reactos/subsystems/win32/win32k/misc/registry.c
+++ b/reactos/subsystems/win32/win32k/misc/registry.c
@@ -84,16 +84,14 @@ RegQueryValue(
 
     cbDataSize = cbInfoSize - FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data);
 
+    /* Note: STATUS_BUFFER_OVERFLOW is not a success */
     if (NT_SUCCESS(Status))
     {
         /* Did we get the right type */
         if (pInfo->Type == ulType)
         {
-            /* Copy the contents to the caller. Make sure strings are null terminated */
-            if (ulType == REG_SZ || ulType == REG_MULTI_SZ || ulType == REG_EXPAND_SZ)
-                RtlStringCbCopyNW((LPWSTR)pvData, *pcbValue, (LPWSTR)pInfo->Data, cbDataSize);
-            else
-                RtlCopyMemory(pvData, pInfo->Data, cbDataSize);
+            /* Copy the contents to the caller */
+            RtlCopyMemory(pvData, pInfo->Data, cbDataSize);
         }
         else
             Status = STATUS_OBJECT_TYPE_MISMATCH;