Add support for newer versions of powerbattery.dll

reagcz · Nov 17, 2022 · e03fbfd · e03fbfd
1 parent 5781e0e
commit e03fbfd
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/IdeapadToolkit/Services/LenovoPowerSettingsService.cs b/IdeapadToolkit/Services/LenovoPowerSettingsService.cs
@@ -32,10 +32,13 @@ public class LenovoPowerSettingsService : ILenovoPowerSettingsService
         [DllImport("PowerBattery.dll", EntryPoint = "?GetChargingMode@CChargingMode@PowerBattery@@QEBAHXZ", CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
         internal static extern int GetChargingMode(ref CChargingMode var1);
 
-
         [DllImport("PowerBattery.dll", EntryPoint = "?SetChargingMode@CChargingMode@PowerBattery@@QEBAHH@Z", CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
         internal static extern int SetChargingMode(ref CChargingMode var1, int var2);
 
+        [DllImport("PowerBattery.dll", EntryPoint = "?SetChargingMode@CChargingMode@PowerBattery@@QEBAHH_N@Z", CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
+        // I don't know what the newly added boolean does, but it doesn't seem to matter
+        internal static extern int SetChargingModeFallBack(ref CChargingMode var1, int var2, bool var3);
+
         [DllImport("PowerBattery.dll", EntryPoint = "??0CUSBCharger@PowerBattery@@QEAA@XZ", CallingConvention = CallingConvention.Cdecl, SetLastError = true)]
         internal static extern CUSBCharger CUSBCharger(ref CUSBCharger var1);
 
@@ -90,7 +93,14 @@ public void SetChargingMode(ChargingMode chargingMode)
         {
             CChargingMode instance = new();
             instance = CChargingMode(ref instance);
-            _ = SetChargingMode(ref instance, (int)chargingMode);
+            try
+            {
+                _ = SetChargingMode(ref instance, (int)chargingMode);
+            }
+            catch (SystemException)
+            {
+                _ = SetChargingModeFallBack(ref instance, (int)chargingMode, false);
+            }
         }
 
         public bool IsAlwaysOnUsbEnabled()