feat: 可选头部已经解析

src-tauri/src/services/file.rs

@@ -1,9 +1,9 @@
 use memmap2::*;
 use serde::Serialize;
 
-use crate::{app_error::AppError, pe_parse::{header::{ImageDosHeader, ImageFileHeader, ImageNTHeaders32}, pe::PE}};
+use crate::{app_error::AppError, pe_parse::{header::{ImageDosHeader, ImageFileHeader, ImageNTHeaders, ImageNTHeaders32, ImageOptionalHeader}, pe::PE}};
 
-use super::GLOBAL_FILE_DATA;
+use super::{GLOBAL_FILE_DATA, GLOBAL_IS_64_BIT};
 
 // TODO: 打开文件，并将文件映射到内存
 pub fn mmap_mut_file(file_path: &str) -> Result<Mmap, std::io::Error> {
@@ -25,20 +25,22 @@ pub struct ResponseDOSHeaderData {
 
 #[derive(Serialize)]
 pub struct ResponseNTHeaderData {
-    fields: ImageNTHeaders32,
+    fields: ImageNTHeaders,
     base_offset: usize,
 }
 
-pub fn get_nt_headers_data() -> Result<ResponseNTHeaderData, AppError> {
-    let binding = GLOBAL_FILE_DATA.lock().unwrap();
-    let file_data = binding.as_ref().unwrap();
-    let nt_header = file_data.get_nt_headers()?;
-    let nt_offset = file_data.get_nt_headers_offset()?;
-    let result = ResponseNTHeaderData {
-        fields: nt_header.clone(),
-        base_offset: nt_offset,
-    };
-    Ok(result)
+pub fn get_nt_headers_data<'a>() -> Result<ResponseNTHeaderData, AppError> {
+        // pub static GLOBAL_FILE_DATA: Mutex<Option<PeData>> = Mutex::new(None);
+        let binding = GLOBAL_FILE_DATA.lock().unwrap();
+        // `binding` does not live long enough borrowed value does not live long enough
+        let file_data = binding.as_ref().unwrap();
+        let nt_header_enmu= file_data.get_nt_headers()?;
+        let nt_offset = file_data.get_nt_headers_offset()?;
+        let result = ResponseNTHeaderData {
+            fields: nt_header_enmu,
+            base_offset: nt_offset,
+        };
+        Ok(result)
 }
 
 // 获取文件头数据
@@ -58,4 +60,23 @@ pub fn get_file_header_data() -> Result<ResponseFileHeaderData, AppError> {
         base_offset: file_header_offset,
     };
     Ok(result)
+}
+// 获取可选头数据
+#[derive(Serialize)]
+pub struct ResponseOptionalHeaderData {
+    pub fields: ImageOptionalHeader,
+    pub base_offset: usize,
+}
+
+
+pub fn get_optional_header_data() -> Result<ResponseOptionalHeaderData, AppError> {
+    let binding = GLOBAL_FILE_DATA.lock().unwrap();
+    let file_data = binding.as_ref().unwrap();
+    let optional_header = file_data.get_optional_header()?;
+    let optional_header_offset = file_data.get_optional_header_offset()?;
+    let result = ResponseOptionalHeaderData {
+        fields: optional_header.clone(),
+        base_offset: optional_header_offset,
+    };
+    Ok(result)
 }