xlib/x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

const blocks for lazy import

Browse Source
This commit is contained in:
Jessi
2024-07-04 23:32:20 -04:00
parent f5f3343c1a
commit 52d7280628
4 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/win32/importer.rs
View File

@@ -22,8 +22,8 @@ macro_rules! lazy_import {
extern "C" fn __initial($($pname: $ptype),*) $(-> $rtype)? { extern "C" fn __initial($($pname: $ptype),*) $(-> $rtype)? {
unsafe { unsafe {
let import = $crate::win32::importer::find_import_hashed( let import = $crate::win32::importer::find_import_hashed(
$crate::hash_utf8($module.as_bytes()), const { $crate::hash_utf8($module.as_bytes()) },
$crate::hash_utf8(stringify!($name).as_bytes()) const { $crate::hash_utf8(stringify!($name).as_bytes()) }
).unwrap_or(0); ).unwrap_or(0);
FUNC = core::mem::transmute(import); FUNC = core::mem::transmute(import);
FUNC($($pname),*) FUNC($($pname),*)
@@ -48,8 +48,8 @@ macro_rules! lazy_import {
Some(function) => function, Some(function) => function,
None => unsafe { None => unsafe {
let import = core::mem::transmute($crate::win32::importer::find_import_hashed( let import = core::mem::transmute($crate::win32::importer::find_import_hashed(
x::hash_utf8($module.as_bytes()), const { x::hash_utf8($module.as_bytes()) },
x::hash_utf8(stringify!($name).as_bytes()) const { x::hash_utf8(stringify!($name).as_bytes()) }
).unwrap_or(0)); ).unwrap_or(0));
FUNC = Some(import); FUNC = Some(import);
import import

22
src/win32/pe_image.rs
View File

@@ -130,17 +130,17 @@ pub struct ImageBaseRelocation {
#[repr(C)] #[repr(C)]
pub struct ImageExportDirectory { pub struct ImageExportDirectory {
pub export_flags: u32, /* 0x00 */pub export_flags: u32,
pub timestamp: u32, /* 0x04 */pub timestamp: u32,
pub major_version: u16, /* 0x06 */pub major_version: u16,
pub minor_version: u16, /* 0x08 */pub minor_version: u16,
pub name_rva: u32, /* 0x0C */pub name_rva: u32,
pub ordinal_base: u32, /* 0x10 */pub ordinal_base: u32,
pub address_table_entries: u32, /* 0x14 */pub address_table_entries: u32,
pub number_of_name_pointers: u32, /* 0x18 */pub number_of_name_pointers: u32,
pub export_address_table_rva: u32, /* 0x1C */pub export_address_table_rva: u32,
pub name_pointer_rva: u32, /* 0x20 */pub name_pointer_rva: u32,
pub ordinal_table_rva: u32, /* 0x24 */pub ordinal_table_rva: u32,
} }
#[repr(C)] #[repr(C)]

5
tests/test_data.rs
View File

@@ -1,3 +1,6 @@
use std::mem::offset_of;
use x::win32::ImageOptionalHeader64;
#[test] #[test]
pub fn test_distance() { pub fn test_distance() {
let _ = x::dur![ 5 days 4 hours 7 minutes 2 seconds 2 minutes ]; let _ = x::dur![ 5 days 4 hours 7 minutes 2 seconds 2 minutes ];
@@ -24,4 +27,4 @@ pub fn test_distance() {
x::iterate(b).cloned().take_while(|&c| c != 0)) x::iterate(b).cloned().take_while(|&c| c != 0))
.filter_map(|_r| _r.ok()).collect(); .filter_map(|_r| _r.ok()).collect();
assert_eq!("Hello World", hello_world); assert_eq!("Hello World", hello_world);
} }

2
tests/test_lazy_import.rs
View File

@@ -11,5 +11,5 @@ x::lazy_import! { "kernel32.dll"
#[cfg(feature = "win32")] #[cfg(feature = "win32")]
pub fn test_exports() { pub fn test_exports() {
let a = LoadLibraryA(x::cstr!("user32.dll")); let a = LoadLibraryA(x::cstr!("user32.dll"));
println!("{} -> {}",a.into_usize(), unsafe { a.nt_header().optional_header.size_of_image }); println!("{:X} -> {:X}",a.into_usize(), unsafe { a.nt_header().optional_header.size_of_image });
} }