Fix encoding in recalls

RinatNamazov · Feb 10, 2024 · 543b2b1 · 543b2b1
1 parent 81d204d
commit 543b2b1
Show file tree

Hide file tree

Showing 4 changed files with 168 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,6 +17,7 @@ LegalCopyright = "Copyright © 2023-2024 RINWARES, Rinat Namazov"
 vmt-hook = "0.2.0"
 egui = "0.25.0"
 egui-d3d9 = { version = "0.3.7", git = "https://github.com/RinatNamazov/egui-d3d9" }
+local-encoding = "0.2.0"
 
 [dependencies.windows]
 version = "0.52.0"

diff --git a/rustfmt.toml b/rustfmt.toml
diff --git a/src/gui.rs b/src/gui.rs
@@ -17,6 +17,7 @@ use egui::{
     RichText, Rounding, Sense, TextStyle,
 };
 use std::ffi::CStr;
+use local_encoding::{Encoder, Encoding};
 
 pub struct Ui {
     cmds_height: f32,
@@ -261,7 +262,7 @@ impl Ui {
         ui.indent(ui.id(), |ui| {
             for i in 0..input.total_recall as usize {
                 if let Ok(recall) = CStr::from_bytes_until_nul(&input.recall_buffer[i]) {
-                    if let Ok(text) = recall.to_str() {
+                    if let Ok(text) = Encoding::ANSI.to_string(recall.to_bytes_with_nul()) {
                         let text =
                             if input.current_recall == -1 || i == input.current_recall as usize {
                                 RichText::new(text)