[ros-diffs] [reactos] 01/01: [KERNEL32] Fix reading SafeDllSearchMode

[Mark Jansen]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8ea46b53e3ddfc4120c16…

commit 8ea46b53e3ddfc4120c16f3781adf453616fddee
Author:     Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Fri Apr 8 00:22:54 2022 +0200
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Wed May 25 22:43:47 2022 +0200

    [KERNEL32] Fix reading SafeDllSearchMode
---
 dll/win32/kernel32/client/path.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/dll/win32/kernel32/client/path.c b/dll/win32/kernel32/client/path.c
index 1db908212f7..1fa09d530c8 100644
--- a/dll/win32/kernel32/client/path.c
+++ b/dll/win32/kernel32/client/path.c
@@ -424,7 +424,7 @@ BaseComputeProcessDllPath(IN LPWSTR FullPath,
     UNICODE_STRING KeyName =
RTL_CONSTANT_STRING(L"\\Registry\\MACHINE\\System\\CurrentControlSet\\Control\\Session
Manager");
     UNICODE_STRING ValueName = RTL_CONSTANT_STRING(L"SafeDllSearchMode");
     OBJECT_ATTRIBUTES ObjectAttributes = RTL_CONSTANT_OBJECT_ATTRIBUTES(&KeyName,
OBJ_CASE_INSENSITIVE);
-    KEY_VALUE_PARTIAL_INFORMATION PartialInfo;
+    CHAR PartialInfoBuffer[FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) +
sizeof(ULONG)];
     HANDLE KeyHandle;
     NTSTATUS Status;
     ULONG ResultLength;
@@ -461,15 +461,16 @@ BaseComputeProcessDllPath(IN LPWSTR FullPath,
             Status = NtQueryValueKey(KeyHandle,
                                      &ValueName,
                                      KeyValuePartialInformation,
-                                     &PartialInfo,
-                                     sizeof(PartialInfo),
+                                     PartialInfoBuffer,
+                                     sizeof(PartialInfoBuffer),
                                      &ResultLength);
             if (NT_SUCCESS(Status))
             {
                 /* Read the value if the size is OK */
-                if (ResultLength == sizeof(PartialInfo))
+                if (ResultLength == sizeof(PartialInfoBuffer))
                 {
-                    CurrentDirPlacement = *(PULONG)PartialInfo.Data;
+                    PKEY_VALUE_PARTIAL_INFORMATION PartialInfo =
(PKEY_VALUE_PARTIAL_INFORMATION)PartialInfoBuffer;
+                    CurrentDirPlacement = *(PULONG)PartialInfo->Data;
                 }
             }