fix bad error handling

R2NorthstarTools · Feb 7, 2024 · 22a619a · 22a619a
1 parent 79086cd
commit 22a619a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/errors.rs b/src/errors.rs
@@ -142,6 +142,10 @@ pub enum InterfaceGetterError<'a> {
     #[error(transparent)]
     InvalidFunctionCString(#[from] NulError),
 
+    /// when the dll doesn't have a create iterface
+    #[error("dll {0} doesn't have a create interface function")]
+    NullCreateInterface(usize),
+
     /// an error from the win api yay
     #[error(transparent)]
     WinApiError(#[from] windows::core::Error),

diff --git a/src/interfaces/external.rs b/src/interfaces/external.rs
@@ -110,10 +110,7 @@ pub trait SourceInterface<Rtrn = Self> {
         unsafe {
             let create_interface = std::mem::transmute::<_, CreateInterface>(
                 GetProcAddress(dll_ptr, PCSTR("CreateInterface\0".as_ptr())).ok_or(
-                    windows::core::Error::new(
-                        windows::core::HRESULT(0x0000271E),
-                        "A required pointer is null.".into(),
-                    ),
+                    InterfaceGetterError::NullCreateInterface(dll_ptr.0 as usize),
                 )?,
             );
 
@@ -143,10 +140,7 @@ pub trait SourceInterface<Rtrn = Self> {
                     GetModuleHandleA(PCSTR(dll_name.as_ptr() as *const u8))?,
                     PCSTR("CreateInterface\0".as_ptr()),
                 )
-                .ok_or(windows::core::Error::new(
-                    windows::core::HRESULT(0x0000271E),
-                    "A required pointer is null.".into(),
-                ))?,
+                .ok_or(InterfaceGetterError::NullCreateInterface(0x0))?,
             );
 
             let cstring_interface_name = try_cstring(interface_name)?;