marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Fix SystemRecommendedSharedDataAlignment on ARM. 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=43961
Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
André Hentschel 2020-05-17 15:54:33 +02:00 committed by Alexandre Julliard
parent 0fd3f0266e
commit 44274d172b
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/ntdll/nt.c
View File

@ -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;
}

4
dlls/ntdll/tests/info.c
View File

@ -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)