aboutsummaryrefslogtreecommitdiff
path: root/libs/nak
diff options
context:
space:
mode:
authorSulfurNitride <SulfurNitride@users.noreply.github.com>2026-03-12 13:48:25 -0500
committerSulfurNitride <SulfurNitride@users.noreply.github.com>2026-03-12 13:48:25 -0500
commit84a43a2e6afbdfab92c610d47aa75e3876ffacd6 (patch)
treeea624ec287181905441fbf1247c645976bdb8fc9 /libs/nak
parent3ba283d9350783c038cc2844450f4938ad125f08 (diff)
Replace wrestool with native Rust PE icon extraction (pelite)
- Add icons.rs to nak crate: parses PE resource sections, extracts RT_GROUP_ICON/RT_ICON and builds ICO files in memory - Expose nak_extract_exe_icon() FFI for C++ consumption - Update iconForExecutable() to use Rust FFI instead of shelling out to wrestool; reads all ICO entries for correct color depth - Fix BasicGamePlugin::gameIcon() to call iconForExecutable() (was returning empty QIcon, causing placeholder icons for BG3/Cyberpunk) - Move app icon setup: setDesktopFileName + setWindowIcon to MOApplication constructor (fixes Wayland taskbar/decoration icon) - Move data/com.fluorine.* to data/icons/, install to XDG paths at launch for Wayland compositor icon resolution - Remove icoutils dependency from Docker image and build output Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Diffstat (limited to 'libs/nak')
-rw-r--r--libs/nak/Cargo.lock63
-rw-r--r--libs/nak/Cargo.toml1
-rw-r--r--libs/nak/src/icons.rs195
-rw-r--r--libs/nak/src/lib.rs1
4 files changed, 260 insertions, 0 deletions
diff --git a/libs/nak/Cargo.lock b/libs/nak/Cargo.lock
index 5bb63b4..03b8ffd 100644
--- a/libs/nak/Cargo.lock
+++ b/libs/nak/Cargo.lock
@@ -80,6 +80,21 @@ dependencies = [
]
[[package]]
+name = "dataview"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daba87f72c730b508641c9fb6411fc9bba73939eed2cab611c399500511880d0"
+dependencies = [
+ "derive_pod",
+]
+
+[[package]]
+name = "derive_pod"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2ea6706d74fca54e15f1d40b5cf7fe7f764aaec61352a9fcec58fe27e042fc8"
+
+[[package]]
name = "displaydoc"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -307,6 +322,7 @@ name = "nak_rust"
version = "0.1.0"
dependencies = [
"chrono",
+ "pelite",
"serde",
"serde_json",
"ureq",
@@ -314,6 +330,12 @@ dependencies = [
]
[[package]]
+name = "no-std-compat"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
+
+[[package]]
name = "num-traits"
version = "0.2.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -329,6 +351,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
[[package]]
+name = "pelite"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88dccf4bd32294364aeb7bd55d749604450e9db54605887551f21baea7617685"
+dependencies = [
+ "dataview",
+ "libc",
+ "no-std-compat",
+ "pelite-macros",
+ "winapi",
+]
+
+[[package]]
+name = "pelite-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a7cf3f8ecebb0f4895f4892a8be0a0dc81b498f9d56735cb769dc31bf00815b"
+
+[[package]]
name = "percent-encoding"
version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -656,6 +697,22 @@ dependencies = [
]
[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
name = "winapi-util"
version = "0.1.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -665,6 +722,12 @@ dependencies = [
]
[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
name = "windows-core"
version = "0.62.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/libs/nak/Cargo.toml b/libs/nak/Cargo.toml
index 3b3c460..c51a804 100644
--- a/libs/nak/Cargo.toml
+++ b/libs/nak/Cargo.toml
@@ -13,3 +13,4 @@ serde_json = "1"
walkdir = "2"
chrono = "0.4"
ureq = "2"
+pelite = "0.10"
diff --git a/libs/nak/src/icons.rs b/libs/nak/src/icons.rs
new file mode 100644
index 0000000..940d0d1
--- /dev/null
+++ b/libs/nak/src/icons.rs
@@ -0,0 +1,195 @@
+//! Extract icons from Windows PE (.exe/.dll) files using pelite.
+//!
+//! Returns raw ICO file bytes that can be loaded directly by Qt's QIcon/QImage.
+
+use std::path::Path;
+
+use pelite::resources::{Entry, Name, Resources};
+
+/// Extract the best (largest) icon from a PE executable as raw ICO bytes.
+///
+/// Returns `None` if the file can't be read, isn't a valid PE, or has no icons.
+pub fn extract_icon(exe_path: &Path) -> Option<Vec<u8>> {
+ let data = std::fs::read(exe_path).ok()?;
+
+ // Try PE32+ (64-bit) first, fall back to PE32 (32-bit)
+ if let Ok(icon) = extract_from_pe64(&data) {
+ return Some(icon);
+ }
+ if let Ok(icon) = extract_from_pe32(&data) {
+ return Some(icon);
+ }
+
+ None
+}
+
+fn extract_from_pe64(data: &[u8]) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
+ use pelite::pe64::{Pe, PeFile};
+ let pe = PeFile::from_bytes(data)?;
+ let resources = pe.resources()?;
+ build_ico_from_resources(&resources)
+}
+
+fn extract_from_pe32(data: &[u8]) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
+ use pelite::pe32::{Pe, PeFile};
+ let pe = PeFile::from_bytes(data)?;
+ let resources = pe.resources()?;
+ build_ico_from_resources(&resources)
+}
+
+/// Build an ICO file from PE resources, picking the group icon with the
+/// largest total pixel area.
+fn build_ico_from_resources(
+ resources: &Resources,
+) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
+ let root = resources.root()?;
+
+ // Find RT_GROUP_ICON directory (type 14)
+ let group_icon_dir = root
+ .get_dir(Name::Id(14))
+ .map_err(|_| "no RT_GROUP_ICON")?;
+
+ let mut best_group: Option<(i32, Vec<u8>)> = None;
+
+ for dir_entry in group_icon_dir.entries() {
+ // Each entry is a group; get its subdirectory (language variants)
+ let sub_dir = match dir_entry.entry() {
+ Ok(Entry::Directory(d)) => d,
+ _ => continue,
+ };
+
+ // Get the first language variant's data
+ let data_entry = match sub_dir.entries().next() {
+ Some(e) => match e.entry() {
+ Ok(Entry::DataEntry(d)) => d,
+ _ => continue,
+ },
+ None => continue,
+ };
+
+ let grp_data = match data_entry.bytes() {
+ Ok(d) => d,
+ Err(_) => continue,
+ };
+
+ // Parse GRPICONDIR header: reserved(2) + type(2) + count(2) = 6 bytes
+ if grp_data.len() < 6 {
+ continue;
+ }
+ let count = u16::from_le_bytes([grp_data[4], grp_data[5]]) as usize;
+ // Each GRPICONDIRENTRY is 14 bytes
+ if grp_data.len() < 6 + count * 14 {
+ continue;
+ }
+
+ // Calculate total pixel area for ranking
+ let mut total_area: i32 = 0;
+ for i in 0..count {
+ let offset = 6 + i * 14;
+ let w = if grp_data[offset] == 0 {
+ 256i32
+ } else {
+ grp_data[offset] as i32
+ };
+ let h = if grp_data[offset + 1] == 0 {
+ 256i32
+ } else {
+ grp_data[offset + 1] as i32
+ };
+ total_area += w * h;
+ }
+
+ if let Ok(ico_bytes) = build_ico_file(resources, grp_data, count) {
+ if best_group.is_none() || total_area > best_group.as_ref().unwrap().0 {
+ best_group = Some((total_area, ico_bytes));
+ }
+ }
+ }
+
+ best_group
+ .map(|(_, bytes)| bytes)
+ .ok_or_else(|| "no valid icon group found".into())
+}
+
+/// Build a complete ICO file from a GRPICONDIR and the corresponding RT_ICON resources.
+fn build_ico_file(
+ resources: &Resources,
+ grp_data: &[u8],
+ count: usize,
+) -> Result<Vec<u8>, Box<dyn std::error::Error>> {
+ let root = resources.root()?;
+
+ // RT_ICON = type 3
+ let icon_dir = root.get_dir(Name::Id(3)).map_err(|_| "no RT_ICON")?;
+
+ // Collect individual icon image data
+ struct IconEntry<'a> {
+ header: [u8; 8], // first 8 bytes of GRPICONDIRENTRY (w, h, colors, reserved, planes, bpp)
+ data: &'a [u8],
+ }
+ let mut entries: Vec<IconEntry> = Vec::new();
+
+ for i in 0..count {
+ let grp_offset = 6 + i * 14;
+ let icon_id =
+ u16::from_le_bytes([grp_data[grp_offset + 12], grp_data[grp_offset + 13]]) as u32;
+
+ // Find the RT_ICON with this ID
+ let icon_sub = match icon_dir.get_dir(Name::Id(icon_id)) {
+ Ok(d) => d,
+ Err(_) => continue,
+ };
+
+ let data_entry = match icon_sub.entries().next() {
+ Some(e) => match e.entry() {
+ Ok(Entry::DataEntry(d)) => d,
+ _ => continue,
+ },
+ None => continue,
+ };
+
+ let image_data = match data_entry.bytes() {
+ Ok(d) => d,
+ Err(_) => continue,
+ };
+
+ let mut header = [0u8; 8];
+ header.copy_from_slice(&grp_data[grp_offset..grp_offset + 8]);
+
+ entries.push(IconEntry {
+ header,
+ data: image_data,
+ });
+ }
+
+ if entries.is_empty() {
+ return Err("no icon entries found".into());
+ }
+
+ let entry_count = entries.len() as u16;
+ let header_size = 6 + (entry_count as usize) * 16; // ICONDIR + ICONDIRENTRYs
+
+ let mut ico = Vec::new();
+
+ // ICONDIR header
+ ico.extend_from_slice(&0u16.to_le_bytes()); // reserved
+ ico.extend_from_slice(&1u16.to_le_bytes()); // type = ICO
+ ico.extend_from_slice(&entry_count.to_le_bytes());
+
+ // Write ICONDIRENTRY records (16 bytes each)
+ let mut data_offset = header_size as u32;
+ for entry in &entries {
+ ico.extend_from_slice(&entry.header); // width, height, colors, reserved, planes, bpp (8 bytes)
+ let size = entry.data.len() as u32;
+ ico.extend_from_slice(&size.to_le_bytes()); // dwBytesInRes (4 bytes)
+ ico.extend_from_slice(&data_offset.to_le_bytes()); // dwImageOffset (4 bytes)
+ data_offset += size;
+ }
+
+ // Write image data
+ for entry in &entries {
+ ico.extend_from_slice(entry.data);
+ }
+
+ Ok(ico)
+}
diff --git a/libs/nak/src/lib.rs b/libs/nak/src/lib.rs
index 59f41c6..13bc90e 100644
--- a/libs/nak/src/lib.rs
+++ b/libs/nak/src/lib.rs
@@ -13,4 +13,5 @@ pub mod steam;
pub mod utils;
pub mod deps;
+pub mod icons;
pub mod installers;