фиксы windows 7

This commit is contained in:
2026-06-25 16:31:44 +03:00
parent 1160477945
commit 8e32e31121
3 changed files with 37 additions and 13 deletions
+1 -1
View File
@@ -53,7 +53,7 @@ public class SetTimeOption : IOption
for (var i = 0; i < 3; i++) for (var i = 0; i < 3; i++)
{ {
// FIXME: вызывает падение на windows 7 // FIXME: вызывает падение на windows 7
var dt = DateTime.Now; var dt = WindowsTimeUtils.Now();
DeviceWriters.SetTime(device, dt); DeviceWriters.SetTime(device, dt);
} }
} }
+6 -1
View File
@@ -7,12 +7,17 @@
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<PublishAot>true</PublishAot> <PublishAot>true</PublishAot>
<TrimMode>link</TrimMode>
<TrimmerSingleWarn>false</TrimmerSingleWarn>
<InvariantGlobalization>true</InvariantGlobalization> <InvariantGlobalization>true</InvariantGlobalization>
<RootNamespace>RTCSync</RootNamespace> <RootNamespace>RTCSync</RootNamespace>
<IlcOptimizationPreference>Size</IlcOptimizationPreference>
<IlcDisableReflection>true</IlcDisableReflection>
<OptimizationPreference>Speed</OptimizationPreference>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="LibUsbDotNet" Version="3.0.224" /> <PackageReference Include="LibUsbDotNet" Version="3.0.224"/>
</ItemGroup> </ItemGroup>
</Project> </Project>
+30 -11
View File
@@ -7,20 +7,39 @@ public abstract class WindowsTimeUtils
// c# datetime set // c# datetime set
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
public static extern bool SetSystemTime(ref SystemTime time); public static extern bool SetSystemTime(ref SystemTime time);
[DllImport("kernel32.dll")] [DllImport("kernel32.dll")]
public static extern void GetSystemTime(ref SystemTime time); public static extern void GetSystemTime(ref SystemTime time);
[StructLayout(LayoutKind.Sequential)] [StructLayout(LayoutKind.Sequential)]
public struct SystemTime(DateTime dt) public struct SystemTime
{ {
public ushort Year = (ushort)dt.Year; public ushort Year, Month, DayOfWeek, Day;
public ushort Month = (ushort)dt.Month; public ushort Hour, Minute, Second, Milliseconds;
public ushort DayOfWeek = (ushort)dt.DayOfWeek;
public ushort Day = (ushort)dt.Day; public SystemTime() { }
public ushort Hour = (ushort)dt.Hour;
public ushort Minute = (ushort)dt.Minute; public SystemTime(DateTime dt)
public ushort Second = (ushort)dt.Second; {
public ushort Milliseconds = (ushort)dt.Millisecond; Year = (ushort)dt.Year;
Month = (ushort)dt.Month;
DayOfWeek = (ushort)dt.DayOfWeek;
Day = (ushort)dt.Day;
Hour = (ushort)dt.Hour;
Minute = (ushort)dt.Minute;
Second = (ushort)dt.Second;
Milliseconds = (ushort)dt.Millisecond;
}
}
// Фикс для Windows 7 SP1 без обновлений
// DataTime.Now использует слишком новый API
public static DateTime Now()
{
var st = new SystemTime();
GetSystemTime(ref st);
return new DateTime(st.Year, st.Month, st.Day,
st.Hour, st.Minute, st.Second, st.Milliseconds,
DateTimeKind.Utc).ToLocalTime();
} }
} }