ntdll: Fix SystemRecommendedSharedDataAlignment on ARM.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43961Signed-off-by: André Hentschel <nerv@dawncrow.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Fix SystemRecommendedSharedDataAlignment on ARM.
44274d17 · André Hentschel · Alexandre Julliard · 0fd3f026 · 44274d17 · 44274d17
Commit 44274d17 authored May 17, 2020 by André Hentschel Committed by Alexandre Julliard May 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 1 deletion

nt.c dlls/ntdll/nt.c +8 -1

info.c dlls/ntdll/tests/info.c +4 -0

No files found.
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -3034,7 +3034,14 @@ NTSTATUS WINAPI NtQuerySystemInformation(
            if (Length >= len)
            {
                if (!SystemInformation) ret = STATUS_ACCESS_VIOLATION;
-                else *((DWORD *)SystemInformation) = 64;
+                else
+                {
+#ifdef __arm__
+                    *((DWORD *)SystemInformation) = 32;
+#else
+                    *((DWORD *)SystemInformation) = 64;
+#endif
+                }
            }
            else ret = STATUS_INFO_LENGTH_MISMATCH;
        }

--- a/dlls/ntdll/tests/info.c
+++ b/dlls/ntdll/tests/info.c
@@ -2518,7 +2518,11 @@ static void test_query_data_alignment(void)
    status = pNtQuerySystemInformation(SystemRecommendedSharedDataAlignment, &value, sizeof(value), &ReturnLength);
    ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status);
    ok(sizeof(value) == ReturnLength, "Inconsistent length %u\n", ReturnLength);
+#ifdef __arm__
+    ok(value == 32, "Expected 32, got %u\n", value);
+#else
    ok(value == 64, "Expected 64, got %u\n", value);
+#endif
 }

 static void test_thread_lookup(void)