fastfetch-cli/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2026-11-02 19:31:10 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

CPU (Windows): use ThreadCount if GetLogicalProcessorInformationEx() fails

Browse Source
This commit is contained in:
李通洲
2024-01-06 16:20:07 +08:00
parent 48bb82c8fb
commit d8297d296e
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/cpu/cpu_windows.c
+22 -15
View File
@@ -82,25 +82,32 @@ static const char* detectBySmbios(FFCPUResult* cpu)
{
DWORD length = 0;
GetLogicalProcessorInformationEx(RelationGroup, NULL, &length);
if (length == 0)
return "GetLogicalProcessorInformationEx(RelationGroup, NULL, &length) failed";
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* FF_AUTO_FREE
pProcessorInfo = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)malloc(length);
if (pProcessorInfo && GetLogicalProcessorInformationEx(RelationGroup, pProcessorInfo, &length))
if (length > 0)
{
for(
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* ptr = pProcessorInfo;
(uint8_t*)ptr < ((uint8_t*)pProcessorInfo) + length;
ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
)
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* FF_AUTO_FREE
pProcessorInfo = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)malloc(length);
if (pProcessorInfo && GetLogicalProcessorInformationEx(RelationGroup, pProcessorInfo, &length))
{
assert(ptr->Relationship == RelationGroup);
cpu->coresOnline += ptr->Group.GroupInfo->ActiveProcessorCount;
cpu->coresLogical += ptr->Group.GroupInfo->MaximumProcessorCount;
for(
SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX* ptr = pProcessorInfo;
(uint8_t*)ptr < ((uint8_t*)pProcessorInfo) + length;
ptr = (SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX*)(((uint8_t*)ptr) + ptr->Size)
)
{
assert(ptr->Relationship == RelationGroup);
cpu->coresOnline += ptr->Group.GroupInfo->ActiveProcessorCount;
cpu->coresLogical += ptr->Group.GroupInfo->MaximumProcessorCount;
}
}
}
if (cpu->coresOnline == 0 || cpu->coresLogical == 0)
{
if (data->Header.Length > offsetof(FFSmbiosProcessorInfo, ThreadCount2))
cpu->coresOnline = cpu->coresLogical = data->ThreadCount2;
else
cpu->coresOnline = cpu->coresLogical = data->ThreadCount;
}
}
return NULL;