From 2ea853b1e685218b254c2d31a0f4d8591de12b87 Mon Sep 17 00:00:00 2001 From: Nadahar Date: Thu, 21 Mar 2024 03:12:17 +0100 Subject: [PATCH] Fixed CPU performance montor on non-English Windows (#7446) Signed-off-by: Nadahar --- libs/hbb_common/src/platform/windows.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/hbb_common/src/platform/windows.rs b/libs/hbb_common/src/platform/windows.rs index ae3e33839..c36c384d3 100644 --- a/libs/hbb_common/src/platform/windows.rs +++ b/libs/hbb_common/src/platform/windows.rs @@ -9,7 +9,7 @@ use winapi::{ um::{ handleapi::CloseHandle, pdh::{ - PdhAddCounterA, PdhCloseQuery, PdhCollectQueryData, PdhCollectQueryDataEx, + PdhAddEnglishCounterA, PdhCloseQuery, PdhCollectQueryData, PdhCollectQueryDataEx, PdhGetFormattedCounterValue, PdhOpenQueryA, PDH_FMT_COUNTERVALUE, PDH_FMT_DOUBLE, PDH_HCOUNTER, PDH_HQUERY, }, @@ -71,9 +71,9 @@ pub fn start_cpu_performance_monitor() { } let _query = RAIIPDHQuery(query); let mut counter: PDH_HCOUNTER = std::mem::zeroed(); - ret = PdhAddCounterA(query, COUNTER_PATH.as_ptr() as _, 0, &mut counter); + ret = PdhAddEnglishCounterA(query, COUNTER_PATH.as_ptr() as _, 0, &mut counter); if ret != 0 { - log::error!("PdhAddCounterA failed: 0x{:X}", ret); + log::error!("PdhAddEnglishCounterA failed: 0x{:X}", ret); return; } ret = PdhCollectQueryData(query);