ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel32: Fix GetLogicalProcessorInformationEx() usage. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-05-26 21:19:42 +02:00
parent a71cb210f1
commit 171de0a7f6
2 changed files with 24 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dlls/kernel32/process.c
View File

@ -604,24 +604,34 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
return S_OK; return S_OK;
} }
static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *get_logical_processor_info(void)
{
DWORD size = 0;
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info;
GetLogicalProcessorInformationEx( RelationGroup, NULL, &size );
if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) return NULL;
if (!(info = HeapAlloc( GetProcessHeap(), 0, size ))) return NULL;
if (!GetLogicalProcessorInformationEx( RelationGroup, info, &size ))
{
HeapFree( GetProcessHeap(), 0, info );
return NULL;
}
return info;
}
/*********************************************************************** /***********************************************************************
* GetActiveProcessorGroupCount (KERNEL32.@) * GetActiveProcessorGroupCount (KERNEL32.@)
*/ */
WORD WINAPI GetActiveProcessorGroupCount(void) WORD WINAPI GetActiveProcessorGroupCount(void)
{ {
WORD groups; WORD groups;
DWORD size = 0;
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info;
TRACE("()\n"); TRACE("()\n");
if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; if (!(info = get_logical_processor_info())) return 0;
if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0;
if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size))
{
HeapFree(GetProcessHeap(), 0, info);
return 0;
}
groups = info->Group.ActiveGroupCount; groups = info->Group.ActiveGroupCount;
@ -635,18 +645,11 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
DWORD WINAPI GetActiveProcessorCount(WORD group) DWORD WINAPI GetActiveProcessorCount(WORD group)
{ {
DWORD cpus = 0; DWORD cpus = 0;
DWORD size = 0;
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info;
TRACE("(0x%x)\n", group); TRACE("(0x%x)\n", group);
if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; if (!(info = get_logical_processor_info())) return 0;
if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0;
if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size))
{
HeapFree(GetProcessHeap(), 0, info);
return 0;
}
if (group == ALL_PROCESSOR_GROUPS) if (group == ALL_PROCESSOR_GROUPS)
{ {
@ -669,27 +672,20 @@ DWORD WINAPI GetActiveProcessorCount(WORD group)
DWORD WINAPI GetMaximumProcessorCount(WORD group) DWORD WINAPI GetMaximumProcessorCount(WORD group)
{ {
DWORD cpus = 0; DWORD cpus = 0;
DWORD size = 0;
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info;
TRACE("(0x%x)\n", group); TRACE("(0x%x)\n", group);
if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; if (!(info = get_logical_processor_info())) return 0;
if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0;
if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size))
{
HeapFree(GetProcessHeap(), 0, info);
return 0;
}
if (group == ALL_PROCESSOR_GROUPS) if (group == ALL_PROCESSOR_GROUPS)
{ {
for (group = 0; group < info->Group.ActiveGroupCount; group++) for (group = 0; group < info->Group.MaximumGroupCount; group++)
cpus += info->Group.GroupInfo[group].MaximumProcessorCount; cpus += info->Group.GroupInfo[group].MaximumProcessorCount;
} }
else else
{ {
if (group < info->Group.ActiveGroupCount) if (group < info->Group.MaximumGroupCount)
cpus = info->Group.GroupInfo[group].MaximumProcessorCount; cpus = info->Group.GroupInfo[group].MaximumProcessorCount;
} }
@ -703,18 +699,11 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
WORD WINAPI GetMaximumProcessorGroupCount(void) WORD WINAPI GetMaximumProcessorGroupCount(void)
{ {
WORD groups; WORD groups;
DWORD size = 0;
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info; SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *info;
TRACE("()\n"); TRACE("()\n");
if (!GetLogicalProcessorInformationEx(RelationGroup, NULL, &size)) return 0; if (!(info = get_logical_processor_info())) return 0;
if (!(info = HeapAlloc(GetProcessHeap(), 0, size))) return 0;
if (!GetLogicalProcessorInformationEx(RelationGroup, info, &size))
{
HeapFree(GetProcessHeap(), 0, info);
return 0;
}
groups = info->Group.MaximumGroupCount; groups = info->Group.MaximumGroupCount;

2
dlls/ntoskrnl.exe/tests/driver.c
View File

@ -1832,7 +1832,7 @@ static void test_affinity(void)
ok(!!pKeRevertToUserAffinityThreadEx, "KeRevertToUserAffinityThreadEx is not available.\n"); ok(!!pKeRevertToUserAffinityThreadEx, "KeRevertToUserAffinityThreadEx is not available.\n");
count = pKeQueryActiveProcessorCountEx(1); count = pKeQueryActiveProcessorCountEx(1);
todo_wine ok(!count, "Got unexpected count %u.\n", count); ok(!count, "Got unexpected count %u.\n", count);
cpu_count = pKeQueryActiveProcessorCountEx(0); cpu_count = pKeQueryActiveProcessorCountEx(0);
ok(cpu_count, "Got unexpected cpu_count %u.\n", cpu_count); ok(cpu_count, "Got unexpected cpu_count %u.\n", cpu_count);