Merge pull request #12 from ZibanPirate/static-crt

link against static crt

Author: ZibanPirate

.cargo/config.toml

@@ -0,0 +1,4 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-Ctarget-feature=+crt-static"]
+[target.aarch64-pc-windows-msvc]
+rustflags = ["-Ctarget-feature=+crt-static"]

README.md

@@ -10,14 +10,19 @@ Cross-platform Widget showing download/upload speed at the corner of your screen
 
 ## Download
 
-| OS      | Processor     | Download                                                                                                                                                                                                                                   |
-| ------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| MacOS   | Apple Silicon | - [Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_aarch64.dmg)<br>- [Standalone](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_aarch64.app.tar.gz)         |
-| MacOS   | Intel         | - [Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_x64.dmg)<br>- [Standalone](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_x64.app.tar.gz)                 |
+| OS      | Processor     | Download                                                                                                                                                                                                                                     |
+| ------- | ------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| MacOS   | Apple Silicon | - [Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_aarch64.dmg)<br>- [Standalone](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_aarch64.app.tar.gz)          |
+| MacOS   | Intel         | - [Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_x64.dmg)<br>- [Standalone](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_x64.app.tar.gz)                  |
 | Windows | Arm           | - [Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_arm64-setup.exe)<br>- [MSI Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_x64_en-US.msi) |
 | Windows | x86           | - [Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_x64-setup.exe)<br>- [MSI Installer](https://github.com/ZibanPirate/sysmon/releases/latest/download/System.Monitor_0.1.14_x64_en-US.msi)   |
-| Linux   | Arm           | N/A                                                                                                                                                                                                                                        |
-| Linux   | x86           | N/A                                                                                                                                                                                                                                        |
+| Linux   | Arm           | N/A                                                                                                                                                                                                                                          |
+| Linux   | x86           | N/A                                                                                                                                                                                                                                          |
+
+### Minimum supported OS version
+
+- **Windows**: Windows 10 and later
+- **macOS**: macOS Catalina (10.15) and later
 
 ## Contributing
 

lib-cpp/cpp/src/screen_info.cc

@@ -9,32 +9,6 @@
 typedef double float64_t;
 #endif
 
-// --- todo-zm: move this to a seperate file
-typedef DPI_AWARENESS_CONTEXT(WINAPI *PFN_SetThreadDpiAwarenessContext)(DPI_AWARENESS_CONTEXT);
-
-static PFN_SetThreadDpiAwarenessContext pSetThreadDpiAwarenessContext = NULL;
-
-static void InitDpiAwarenessFunc(void)
-{
-    if (!pSetThreadDpiAwarenessContext)
-    {
-        HMODULE hUser32 = GetModuleHandleW(L"user32.dll");
-        if (hUser32)
-        {
-            pSetThreadDpiAwarenessContext =
-                (PFN_SetThreadDpiAwarenessContext)
-                    GetProcAddress(hUser32, "SetThreadDpiAwarenessContext");
-        }
-    }
-}
-
-static DPI_AWARENESS_CONTEXT SafeSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT ctx)
-{
-    InitDpiAwarenessFunc();
-    return pSetThreadDpiAwarenessContext ? pSetThreadDpiAwarenessContext(ctx) : NULL;
-}
-// ---
-
 BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMonitor, LPARAM dwData)
 {
     // only when running cargo test, to mimic Tauri's DPI awareness
@@ -46,7 +20,7 @@ BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMoni
     monitorInfo.cbSize = sizeof(MONITORINFOEX);
 
     // temporarily be DPI-unaware
-    DPI_AWARENESS_CONTEXT originalContext = SafeSetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
+    DPI_AWARENESS_CONTEXT originalContext = SetThreadDpiAwarenessContext(DPI_AWARENESS_CONTEXT_UNAWARE);
 
     if (GetMonitorInfo(hMonitor, &monitorInfo))
     {
@@ -74,7 +48,7 @@ BOOL CALLBACK MonitorEnumProc(HMONITOR hMonitor, HDC hdcMonitor, LPRECT lprcMoni
     }
 
     // Restore original DPI awareness context
-    SafeSetThreadDpiAwarenessContext(originalContext);
+    SetThreadDpiAwarenessContext(originalContext);
 
     return TRUE; // Continue enumeration
 }