[PATCH] ntdll: Workaround for requesting thread affinity mask that isn't a subset of the system's mask

[Roger Zoellner]

This patch is related to the game 'Divinity Original Sin 2' which crashes on startup, if the system only
has 4 or less logical cpus.

By Microsoft specification, requesting a thread affinity mask requires it be be a subset of the process affiniy mask.
However the game requests a mask F...FE (-2) which makes wine to return STATUS_INVALID_PARAMETER, which in turn  makes
the game hang.

This patch will make wine to adjust the mask in this case, which makes the game start correctly.


Signed-off-by: Roger Zoellner <zoellner.roger at gmail.com>
---
 dlls/ntdll/thread.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
index 59d64e174d..6beb8c1a3d 100644
--- a/dlls/ntdll/thread.c
+++ b/dlls/ntdll/thread.c
@@ -1290,6 +1290,7 @@ NTSTATUS WINAPI NtSetInformationThread( HANDLE handle, THREADINFOCLASS class,
             if (length != sizeof(ULONG_PTR)) return STATUS_INVALID_PARAMETER;
             req_aff = *(const ULONG_PTR *)data;
             if ((ULONG)req_aff == ~0u) req_aff = affinity_mask;
+            else if ((LONG) req_aff < 0) req_aff = affinity_mask & req_aff;
             else if (req_aff & ~affinity_mask) return STATUS_INVALID_PARAMETER;
             else if (!req_aff) return STATUS_INVALID_PARAMETER;
             SERVER_START_REQ( set_thread_info )
-- 
2.18.0