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

Battery (Windows): tidy

Browse Source
This commit is contained in:
李通洲
2026-04-05 18:44:42 +08:00
parent 85594d2056
commit 44af8b85ad
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/detection/battery/battery_windows.c
+13 -6
View File
@@ -15,8 +15,11 @@
static const char* detectWithCmApi(FFBatteryOptions* options, FFlist* results) {
// https://learn.microsoft.com/en-us/windows-hardware/drivers/install/using-device-interfaces
ULONG cchDeviceInterfaces = 0;
CONFIGRET cr = CM_Get_Device_Interface_List_SizeW(&cchDeviceInterfaces, (LPGUID) &GUID_DEVCLASS_BATTERY, NULL, CM_GET_DEVICE_INTERFACE_LIST_PRESENT);
if (cr != CR_SUCCESS) {
if (CM_Get_Device_Interface_List_SizeW(
&cchDeviceInterfaces,
(LPGUID) &GUID_DEVCLASS_BATTERY,
NULL,
CM_GET_DEVICE_INTERFACE_LIST_PRESENT) != CR_SUCCESS) {
return "CM_Get_Device_Interface_List_SizeW() failed";
}
@@ -25,14 +28,18 @@ static const char* detectWithCmApi(FFBatteryOptions* options, FFlist* results) {
}
wchar_t* FF_AUTO_FREE mszDeviceInterfaces = (wchar_t*) malloc(cchDeviceInterfaces * sizeof(wchar_t));
cr = CM_Get_Device_Interface_ListW((LPGUID) &GUID_DEVCLASS_BATTERY, NULL, mszDeviceInterfaces, cchDeviceInterfaces, CM_GET_DEVICE_INTERFACE_LIST_PRESENT);
if (cr != CR_SUCCESS) {
if (CM_Get_Device_Interface_ListW(
(LPGUID) &GUID_DEVCLASS_BATTERY,
NULL,
mszDeviceInterfaces,
cchDeviceInterfaces,
CM_GET_DEVICE_INTERFACE_LIST_PRESENT) != CR_SUCCESS) {
return "CM_Get_Device_Interface_ListW() failed";
}
for (const wchar_t* pDeviceInterface = mszDeviceInterfaces; *pDeviceInterface; pDeviceInterface += wcslen(pDeviceInterface) + 1) {
for (const wchar_t* p = mszDeviceInterfaces; *p; p += wcslen(p) + 1) {
HANDLE FF_AUTO_CLOSE_FD hBattery =
CreateFileW(pDeviceInterface, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
CreateFileW(p, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (hBattery == INVALID_HANDLE_VALUE) {
continue;