malhuda/fastfetch
1
0
Fork 0
mirror of https://github.com/fastfetch-cli/fastfetch.git synced 2025-02-20 11:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Memory / Swap (Windows): simplify implementation"

Browse Source 
Doesn't work at all

This reverts commit 0c2edd4064685b4ff6b42884dd92a6f5f96c4a1e.
This commit is contained in:
李通洲 2023-08-05 11:40:23 +08:00
parent 0c2edd4064
commit a971f6d933
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/detection/memory/memory_windows.c
View File

@ -1,19 +1,16 @@
#include "memory.h"
#include <winternl.h>
#include <ntstatus.h>
#include <windows.h>
const char* ffDetectMemory(FFMemoryResult* ram)
{
SYSTEM_INFO sysInfo;
GetNativeSystemInfo(&sysInfo);
SYSTEM_PERFORMANCE_INFORMATION info;
if (!NT_SUCCESS(NtQuerySystemInformation(SystemPerformanceInformation, &info, sizeof(info), NULL)))
return "NtQuerySystemInformation(SystemPerformanceInformation) failed";
ram->bytesUsed = (uint64_t)(info.TotalCommitLimit - info.AvailablePages) * sysInfo.dwPageSize;
ram->bytesTotal = (uint64_t)info.TotalCommitLimit * sysInfo.dwPageSize;
MEMORYSTATUSEX statex = {
.dwLength = sizeof(statex),
};
if (!GlobalMemoryStatusEx(&statex))
return "GlobalMemoryStatusEx() failed";
ram->bytesTotal = statex.ullTotalPhys;
ram->bytesUsed = statex.ullTotalPhys - statex.ullAvailPhys;
return NULL;
}

22
src/detection/swap/swap_windows.c
View File

@ -1,4 +1,5 @@
#include "swap.h"
#include "util/mallocHelper.h"
#include <winternl.h>
#include <ntstatus.h>
@ -9,11 +10,22 @@ const char* ffDetectSwap(FFSwapResult* swap)
SYSTEM_INFO sysInfo;
GetNativeSystemInfo(&sysInfo);
SYSTEM_PAGEFILE_INFORMATION info;
if (!NT_SUCCESS(NtQuerySystemInformation(SystemPagefileInformation, &info, sizeof(info), NULL)))
return "NtQuerySystemInformation(SystemPagefileInformation) failed";
swap->bytesUsed = (uint64_t)info.TotalUsed * sysInfo.dwPageSize;
swap->bytesTotal = (uint64_t)info.CurrentSize * sysInfo.dwPageSize;
ULONG size = sizeof(SYSTEM_PAGEFILE_INFORMATION);
SYSTEM_PAGEFILE_INFORMATION* FF_AUTO_FREE pstart = (SYSTEM_PAGEFILE_INFORMATION*)malloc(size);
while(true)
{
NTSTATUS status = NtQuerySystemInformation(SystemPagefileInformation, pstart, size, &size);
if(status == STATUS_INFO_LENGTH_MISMATCH)
{
if(!(pstart = (SYSTEM_PAGEFILE_INFORMATION*)realloc(pstart, size)))
return "realloc(pstart, size) failed";
}
else if(!NT_SUCCESS(status))
return "NtQuerySystemInformation(SystemPagefileInformation, size) failed";
break;
}
swap->bytesUsed = (uint64_t)pstart->TotalUsed * sysInfo.dwPageSize;
swap->bytesTotal = (uint64_t)pstart->CurrentSize * sysInfo.dwPageSize;
return NULL;
}