Update dependencies and adjust formatting

Author: Systemcluster

Cargo.toml

@@ -1,23 +1,24 @@
 [package]
 
+name = "wrappe"
+description = "Packer for creating self-contained single-binary applications from executables and directories"
+version = "1.0.3"
+license = "BSD-2-Clause"
 authors = ["Christian Sdunek <[email protected]>"]
-build = "build.rs"
 categories = ["compression", "filesystem", "command-line-utilities"]
 keywords = ["compression", "binary", "executable", "packer", "filesystem"]
-description = "Packer for creating self-contained single-binary applications from executables and directories"
 edition = "2021"
+rust-version = "1.77.2"
 include = [
   "Cargo.toml",
   "src/**/*",
   "startpe.tar",
   "build.rs",
   "LICENSE",
 ]
-license = "BSD-2-Clause"
-name = "wrappe"
+build = "build.rs"
 readme = "README.md"
 repository = "https://github.com/Systemcluster/wrappe"
-version = "1.0.3"
 
 [[bin]]
 
@@ -49,25 +50,25 @@ opt-level = 0
 
 [dependencies]
 
-staticfilemap = { version = "0.7.0", default-features = false, features = ["zstd", "multithread"] }
-editpe = { version = "0.1.0", default-features = false }
+staticfilemap = { version = "0.8.0", default-features = false, features = ["zstd", "multithread"] }
+editpe = { version = "0.2.1", default-features = false, features = ["std"] }
 
-clap = { version = "4.5.13", features = ["std", "color", "suggestions", "derive", "unicode", "wrap_help"] }
+clap = { version = "4.5.21", features = ["std", "color", "suggestions", "derive", "unicode", "wrap_help"] }
 color-backtrace = "0.6.1"
 console = "0.15.8"
-indicatif = "0.17.8"
+indicatif = "0.17.9"
 jwalk = "0.8.1"
 num_cpus = "1.16.0"
 path-slash = "0.2.1"
 rand = "0.8.5"
 rayon = "1.10.0"
-sysinfo = "0.31.2"
+sysinfo = "0.32.0"
 twox-hash = { version = "1.6.3", default-features = false }
-zerocopy = "0.7.35"
+zerocopy = "0.8.10"
 zstd = { version = "0.13.2", default-features = false, features = ["zstdmt", "zdict_builder"] }
 
 [build-dependencies]
 
 jwalk = "0.8.1"
-which = "6.0.2"
-tar = "0.4.41"
+which = "7.0.0"
+tar = "0.4.43"

build.rs

@@ -1,6 +1,6 @@
 use std::{
     env::{var, vars},
-    fs::{create_dir_all, File},
+    fs::{File, create_dir_all},
     ops::Deref,
     path::{Path, PathBuf},
     process::Command,

src/compress.rs

@@ -1,12 +1,12 @@
 use std::{
     env::temp_dir,
-    fs::{read_link, remove_file, symlink_metadata, File},
+    fs::{File, read_link, remove_file, symlink_metadata},
     hash::Hasher,
-    io::{copy, BufReader, Cursor, Read, Result, Seek, Write},
+    io::{BufReader, Cursor, Read, Result, Seek, Write, copy},
     path::Path,
     sync::{
-        atomic::{AtomicU64, Ordering},
         Arc, Mutex,
+        atomic::{AtomicU64, Ordering},
     },
     time::SystemTime,
 };
@@ -20,7 +20,7 @@ use rand::{
 use rayon::prelude::*;
 use sysinfo::System;
 use twox_hash::XxHash64;
-use zstd::{dict::EncoderDictionary, Encoder};
+use zstd::{Encoder, dict::EncoderDictionary};
 
 use crate::types::*;
 

src/main.rs

@@ -137,9 +137,7 @@ fn main() {
             style(&args.versioning).yellow().bold(),
             style("without option").yellow().dim(),
             style("once").yellow().bold(),
-            style("can cause unpacking to fail while the application is already running")
-                .yellow()
-                .dim(),
+            style("can cause unpacking to fail while the application is already running").dim(),
         );
     }
     if versioning == 2 && verification != 0 {
@@ -152,14 +150,15 @@ fn main() {
             style("versioning").yellow().dim(),
         );
     }
-    if once == 1 && (!runner_name.contains("windows") || !runner_name.contains("linux")) {
+    if once == 1 && !(runner_name.contains("windows") || runner_name.contains("linux")) {
         println!(
-            "{} {} {}",
+            "{} {} {} {}",
             style("note: option").yellow().dim(),
             style("once").yellow().bold(),
             style("is only supported for Windows and Linux runners")
                 .yellow()
                 .dim(),
+            style(format!("(target: {})", runner_name)).yellow().dim(),
         );
     }
     if show_console != 2 && !runner_name.contains("windows") {

src/types.rs

@@ -1,12 +1,12 @@
-pub use zerocopy::AsBytes;
+pub use zerocopy::{Immutable, IntoBytes, KnownLayout};
 
 pub const WRAPPE_FORMAT: u8 = 204;
 pub const WRAPPE_SIGNATURE: [u8; 8] = [0x50, 0x45, 0x33, 0x44, 0x41, 0x54, 0x41, 0x00];
 pub const NAME_SIZE: usize = 128;
 pub const ARGS_SIZE: usize = 512;
 
 #[repr(C, packed)]
-#[derive(AsBytes)]
+#[derive(IntoBytes, Immutable, KnownLayout)]
 pub struct StarterInfo {
     pub signature:        [u8; 8],
     pub show_console:     u8,
@@ -25,7 +25,7 @@ pub struct StarterInfo {
 }
 
 #[repr(C, packed)]
-#[derive(AsBytes)]
+#[derive(IntoBytes, Immutable, KnownLayout)]
 pub struct PayloadHeader {
     pub directory_sections: u64,
     pub file_sections:      u64,
@@ -42,13 +42,13 @@ impl PayloadHeader {
     }
 }
 #[repr(C, packed)]
-#[derive(AsBytes)]
+#[derive(IntoBytes, Immutable, KnownLayout)]
 pub struct DirectorySection {
     pub name:   [u8; NAME_SIZE],
     pub parent: u32,
 }
 #[repr(C, packed)]
-#[derive(AsBytes)]
+#[derive(IntoBytes, Immutable, KnownLayout)]
 pub struct FileSectionHeader {
     pub position:              u64,
     pub size:                  u64,
@@ -64,7 +64,7 @@ pub struct FileSectionHeader {
     pub readonly:              u8,
 }
 #[repr(C, packed)]
-#[derive(AsBytes)]
+#[derive(IntoBytes, Immutable, KnownLayout)]
 pub struct SymlinkSection {
     pub name:                  [u8; NAME_SIZE],
     pub parent:                u32,

startpe/Cargo.toml

@@ -1,13 +1,14 @@
 [package]
 
-authors = ["Christian Sdunek <[email protected]>"]
+name = "startpe"
 description = "Runner for Packed Executables"
-edition = "2021"
+version = "1.0.3"
 license = "BSD-2-Clause"
-name = "startpe"
+authors = ["Christian Sdunek <[email protected]>"]
+edition = "2021"
+rust-version = "1.77.2"
 publish = false
 repository = "https://github.com/Systemcluster/wrappe"
-version = "1.0.3"
 
 [[bin]]
 
@@ -34,28 +35,19 @@ strip = "symbols"
 [dependencies]
 
 dirs = "5.0.1"
-filetime = "0.2.23"
-fslock-guard = "0.1.4"
+filetime = "0.2.25"
+fslock-guard = "0.2.0"
 memchr = "2.7.4"
-memmap2 = "0.9.4"
+memmap2 = "0.9.5"
 rayon = "1.10.0"
 twox-hash = { version = "1.6.3", default-features = false }
-zerocopy = { version = "0.7.35", features = ["derive"] }
+zerocopy = { version = "0.8.10", features = ["derive"] }
 zstd = { version = "0.13.2", default-features = false, features = [] }
 
 [target.'cfg(windows)'.dependencies]
 
-windows-sys = { version = "0.52.0", features = [
-  "Win32_Foundation",
-  "Win32_System_Console",
-  "Win32_System_LibraryLoader",
-  "Win32_System_Threading",
-  "Win32_System_Diagnostics",
-  "Win32_System_Diagnostics_ToolHelp",
-  "Win32_System_ProcessStatus",
-  "Win32_UI_WindowsAndMessaging",
-] }
+windows-sys = { version = "0.59.0", features = ["Win32_Foundation", "Win32_System_Console", "Win32_System_LibraryLoader", "Win32_System_Threading", "Win32_System_Diagnostics", "Win32_System_Diagnostics_ToolHelp", "Win32_System_ProcessStatus", "Win32_UI_WindowsAndMessaging"] }
 
 [target.'cfg(target_os = "linux")'.dependencies]
 
-procfs = { version = "0.16.0", default-features = false, optional = true }
+procfs = { version = "0.17.0", default-features = false, optional = true }

startpe/src/decompress.rs

@@ -1,7 +1,7 @@
 use std::{
-    fs::{create_dir_all, read_link, remove_dir, remove_file, File},
+    fs::{File, create_dir_all, read_link, remove_dir, remove_file},
     hash::Hasher,
-    io::{copy, sink, BufReader, BufWriter, Read, Result},
+    io::{BufReader, BufWriter, Read, Result, copy, sink},
     mem::size_of,
     path::{Path, PathBuf},
     thread::sleep,
@@ -11,11 +11,11 @@ use std::{
 #[cfg(windows)]
 use std::os::windows::fs::OpenOptionsExt;
 
-use filetime::{set_file_times, set_symlink_file_times, FileTime};
-use rayon::prelude::*;
+use filetime::{FileTime, set_file_times, set_symlink_file_times};
+use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
 use twox_hash::XxHash64;
 use zerocopy::Ref;
-use zstd::{dict::DecoderDictionary, zstd_safe::DCtx, Decoder};
+use zstd::{Decoder, dict::DecoderDictionary, zstd_safe::DCtx};
 
 use crate::{types::*, versioning::*};
 
@@ -56,9 +56,10 @@ pub fn decompress(
 ) -> bool {
     // read payload header sections
     let payload_header_start = mmap.len() - size_of::<PayloadHeader>();
-    let payload_header = Ref::<_, PayloadHeader>::new(&mmap[payload_header_start..])
-        .expect("couldn't read payload header")
-        .into_ref();
+    let payload_header = Ref::into_ref(
+        Ref::<_, PayloadHeader>::from_bytes(&mmap[payload_header_start..])
+            .expect("couldn't read payload header"),
+    );
 
     let directory_sections = payload_header.directory_sections as usize;
     let file_sections = payload_header.file_sections as usize;
@@ -117,12 +118,12 @@ pub fn decompress(
             |mut directories, (i, section)| {
                 let section_start = directory_sections_start + i * size_of::<DirectorySection>();
                 section_hasher.write(section);
-                let section = Ref::<_, DirectorySection>::new(
-                    &sections[section_start..section_start + size_of::<DirectorySection>()],
-                )
-                .expect("couldn't read payload header")
-                .into_ref();
-
+                let section = Ref::into_ref(
+                    Ref::<_, DirectorySection>::from_bytes(
+                        &sections[section_start..section_start + size_of::<DirectorySection>()],
+                    )
+                    .expect("couldn't read payload header"),
+                );
                 directories.push(
                     directories[section.parent as usize].join(
                         std::str::from_utf8(
@@ -144,11 +145,12 @@ pub fn decompress(
         .map(|(i, section)| {
             let section_start = file_sections_start + i * size_of::<FileSectionHeader>();
             section_hasher.write(section);
-            let section = Ref::<_, FileSectionHeader>::new(
-                &sections[section_start..section_start + size_of::<FileSectionHeader>()],
-            )
-            .expect("couldn't read payload header")
-            .into_ref();
+            let section = Ref::into_ref(
+                Ref::<_, FileSectionHeader>::from_bytes(
+                    &sections[section_start..section_start + size_of::<FileSectionHeader>()],
+                )
+                .expect("couldn't read payload header"),
+            );
             (
                 section,
                 std::str::from_utf8(
@@ -168,11 +170,12 @@ pub fn decompress(
         .map(|(i, section)| {
             let section_start = symlink_sections_start + i * size_of::<SymlinkSection>();
             section_hasher.write(section);
-            let section = Ref::<_, SymlinkSection>::new(
-                &sections[section_start..section_start + size_of::<SymlinkSection>()],
-            )
-            .expect("couldn't read payload header")
-            .into_ref();
+            let section = Ref::into_ref(
+                Ref::<_, SymlinkSection>::from_bytes(
+                    &sections[section_start..section_start + size_of::<SymlinkSection>()],
+                )
+                .expect("couldn't read payload header"),
+            );
             (
                 section,
                 std::str::from_utf8(
@@ -389,7 +392,7 @@ pub fn decompress(
             #[cfg(any(unix, target_os = "redox"))]
             {
                 use ::std::{
-                    fs::{set_permissions, Permissions},
+                    fs::{Permissions, set_permissions},
                     os::unix::prelude::*,
                 };
                 let mode = file.mode;

startpe/src/main.rs

@@ -120,9 +120,10 @@ fn main() {
             size_of::<StarterInfo>()
         )
     }
-    let info = Ref::<_, StarterInfo>::new(&mmap[info_start..info_start + size_of::<StarterInfo>()])
-        .expect("couldn't read starter info")
-        .into_ref();
+    let info = Ref::into_ref(
+        Ref::<_, StarterInfo>::from_bytes(&mmap[info_start..info_start + size_of::<StarterInfo>()])
+            .expect("couldn't read starter info"),
+    );
     if info.signature != signature[..] {
         panic!("file signature is invalid")
     }

startpe/src/once.rs

@@ -2,23 +2,24 @@ use std::path::Path;
 
 #[cfg(windows)]
 pub fn check_instance(run_path: &Path) -> Result<bool, std::io::Error> {
+    use core::ffi::c_void;
     use std::{ffi::OsString, os::windows::ffi::OsStringExt};
     use windows_sys::Win32::{
         System::{
             Diagnostics::ToolHelp::{
-                CreateToolhelp32Snapshot, Process32FirstW, Process32NextW, PROCESSENTRY32W,
+                CreateToolhelp32Snapshot, PROCESSENTRY32W, Process32FirstW, Process32NextW,
                 TH32CS_SNAPPROCESS,
             },
             Threading::{
-                OpenProcess, QueryFullProcessImageNameW, PROCESS_QUERY_LIMITED_INFORMATION,
+                OpenProcess, PROCESS_QUERY_LIMITED_INFORMATION, QueryFullProcessImageNameW,
             },
         },
         UI::WindowsAndMessaging::EnumWindows,
     };
 
-    unsafe extern "system" fn enum_windows_proc(hwnd: isize, lparam: isize) -> i32 {
+    unsafe extern "system" fn enum_windows_proc(hwnd: *mut c_void, lparam: isize) -> i32 {
         use windows_sys::Win32::UI::WindowsAndMessaging::{
-            GetWindowThreadProcessId, SetForegroundWindow, ShowWindow, SW_SHOW,
+            GetWindowThreadProcessId, SW_SHOW, SetForegroundWindow, ShowWindow,
         };
         let mut process_id = 0;
         unsafe {
@@ -37,7 +38,7 @@ pub fn check_instance(run_path: &Path) -> Result<bool, std::io::Error> {
     }
 
     let snapshot = unsafe { CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0) };
-    if snapshot == 0 {
+    if snapshot.is_null() {
         return Err(std::io::Error::last_os_error());
     }
     let mut entry = unsafe { std::mem::zeroed::<PROCESSENTRY32W>() };

startpe/src/permissions.rs

@@ -3,7 +3,7 @@ use std::path::Path;
 #[cfg(any(unix, target_os = "redox"))]
 pub fn set_executable_permissions(path: &Path) {
     use ::std::{
-        fs::{metadata, set_permissions, Permissions},
+        fs::{Permissions, metadata, set_permissions},
         os::unix::prelude::*,
     };
     let meta = metadata(path);