[fontique] use windows-rs for dwrite backend (#85)

Swaps out winapi, wio and dwrote for windows-core and windows. --------- Co-authored-by: Aaron Muir Hamilton <[email protected]>
linebender · Sep 30, 2024 · 41821d4 · 41821d4
1 parent 5cd5ea5
commit 41821d4
Show file tree

Hide file tree

Showing 4 changed files with 339 additions and 168 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ This release has an [MSRV] of 1.70.
 #### Fontique
 
 - Removed unsafe code from fontconfig cache ([#78] by [@waywardmonkeys])
+- Switched to `windows-rs` for `dwrite` backend ([#85] by [@dfrg])
 
 ### Fixed
 
@@ -69,6 +70,7 @@ This release has an [MSRV] of 1.70.
 [#78]: https://github.com/linebender/parley/pull/78
 [#71]: https://github.com/linebender/parley/pull/71
 [#72]: https://github.com/linebender/parley/pull/72
+[#85]: https://github.com/linebender/parley/pull/85
 
 [Unreleased]: https://github.com/linebender/parley/compare/v0.1.0...HEAD
 [0.1.0]: https://github.com/linebender/parley/releases/tag/v0.1.0
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fontique/Cargo.toml b/fontique/Cargo.toml
@@ -36,9 +36,8 @@ icu_locid = "1.5.0"
 hashbrown = "0.14.5"
 
 [target.'cfg(target_family="windows")'.dependencies]
-dwrote = "0.11.0"
-winapi = { version = "0.3.9", features = ["dwrite", "dwrite_1", "dwrite_3", "winnt", "unknwnbase", "libloaderapi", "winnls"] }
-wio = "0.2.2"
+windows = { version = "0.58.0", features = ["implement", "Win32_Graphics_DirectWrite"] }
+windows-core = { version = "0.58" }
 
 [target.'cfg(target_vendor="apple")'.dependencies]
 core-text = "20.1.0"