system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-09 04:16:08 +00:00
Code Issues Projects Releases Wiki Activity

wow64: Report the correct size for SystemLogicalProcessorInformationEx.

Browse Source 
Spotted by Brendan Shanks.

Signed-off-by: Huw Davies <huw@codeweavers.com>
This commit is contained in:
Huw Davies 2022-06-24 11:06:39 +01:00 committed by Alexandre Julliard
parent f815c2642e
commit 04d07d65e3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1168,7 +1168,7 @@ static void test_query_logicalprocex(void)
{
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *infoex, *infoex_public, *infoex_core, *infoex_numa,
*infoex_cache, *infoex_package, *infoex_group, *ex;
DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_union;
DWORD relationship, len, len_public, len_core, len_numa, len_cache, len_package, len_group, len_union, ret_len;
unsigned int i, j;
NTSTATUS status;
BOOL ret;
@ -1226,8 +1226,9 @@ static void test_query_logicalprocex(void)
infoex_group = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, len_group);
relationship = RelationAll;
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &len);
status = pNtQuerySystemInformationEx(SystemLogicalProcessorInformationEx, &relationship, sizeof(relationship), infoex, len, &ret_len);
ok(status == STATUS_SUCCESS, "got 0x%08lx\n", status);
ok(ret_len == len, "got %08lx expected %08lx\n", ret_len, len);
ret = pGetLogicalProcessorInformationEx(RelationAll, infoex_public, &len_public);
ok(ret, "got %d, error %ld\n", ret, GetLastError());

6
dlls/wow64/system.c
View File

@ -617,7 +617,7 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformationEx( UINT *args )
status = NtQuerySystemInformationEx( class, &handle, sizeof(handle), info, size, &size );
if (!status)
{
for (pos = pos32 = 0; pos < size && pos32 < len; pos += ex->Size, pos32 += size32)
for (pos = pos32 = 0; pos < size; pos += ex->Size, pos32 += size32)
{
ex = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *)((char *)info + pos);
ex32 = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX32 *)((char *)info32 + pos32);
@ -645,8 +645,8 @@ NTSTATUS WINAPI wow64_NtQuerySystemInformationEx( UINT *args )
}
if (pos32 + size32 <= len) put_logical_proc_info_ex( ex32, ex );
}
if (pos < size) status = STATUS_INFO_LENGTH_MISMATCH;
else size = pos32;
if (pos32 > len) status = STATUS_INFO_LENGTH_MISMATCH;
size = pos32;
}
if (retlen) *retlen = size;
return status;