Code cleanup

Code cleanup

Author: luadebug

egui-opengl-internal/Cargo.toml

@@ -14,6 +14,7 @@ default-target = "x86_64-pc-windows-msvc"
 targets = ["i686-pc-windows-msvc", "x86_64-pc-windows-msvc"]
 
 [dependencies]
+#egui = "0.27.2"
 egui = "0.28.1"
 gl = "0.14.0"
 spin = { version = "0.9.8", optional = true, features = ["lock_api"] }

egui-opengl-internal/src/app.rs

@@ -41,6 +41,14 @@ pub struct OpenGLApp<T = ()> {
     hwnd: OnceCell<HWND>,
 }
 
+impl<T> Default for OpenGLApp<T> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+
+
 impl<T> OpenGLApp<T> {
     /// Creates new [`OpenGLApp`] in const context. You are supposed to create a single static item to store the application state.
     pub const fn new() -> Self {
@@ -155,7 +163,7 @@ impl<T: Default> OpenGLApp<T> {
 
 impl<T> OpenGLApp<T> {
     /// Present call. Should be called once per original present call, before or inside of hook.
-    #[allow(clippy::cast_ref_to_mut)]
+    #[allow(invalid_reference_casting)]
     pub fn render(&self, hdc: HDC) {
         unsafe {
             let this = &mut *self.lock_data();

egui-opengl-internal/src/input.rs

@@ -350,9 +350,9 @@ fn get_key_modifiers(msg: u32) -> Modifiers {
 
 fn get_key(wparam: usize) -> Option<Key> {
     match wparam {
-        0x30..=0x39 => unsafe { Some(std::mem::transmute::<_, Key>(wparam as u8 - 0x10)) }, // 0-9
-        0x41..=0x5A => unsafe { Some(std::mem::transmute::<_, Key>(wparam as u8 - 0x17)) }, // A-Z
-        0x70..=0x83 => unsafe { Some(std::mem::transmute::<_, Key>(wparam as u8 - 0x2C)) }, // F1-F20
+        0x30..=0x39 => unsafe { Some(std::mem::transmute::<u8, Key>(wparam as u8 - 0x10)) }, // 0-9
+        0x41..=0x5A => unsafe { Some(std::mem::transmute::<u8, Key>(wparam as u8 - 0x17)) }, // A-Z
+        0x70..=0x83 => unsafe { Some(std::mem::transmute::<u8, Key>(wparam as u8 - 0x2C)) }, // F1-F20
         _ => match VIRTUAL_KEY(wparam as u16) {
             VK_DOWN => Some(Key::ArrowDown),
             VK_LEFT => Some(Key::ArrowLeft),

egui-opengl-internal/src/utils.rs

@@ -41,7 +41,7 @@ pub fn get_module(module_name: &str) -> HMODULE {
             module
         } else {
             // this also shouldn't silently error
-            HMODULE(0 as *mut c_void)
+            HMODULE(std::ptr::null_mut::<c_void>())
         }
     }
 }

example-wnd/src/lib.rs

@@ -47,7 +47,10 @@ extern "system" fn DllMain(hinst: usize, reason: u32, _reserved: *mut c_void) ->
         unsafe {
             WglSwapBuffersHook.disable().unwrap();
             let wnd_proc = OLD_WND_PROC.unwrap().unwrap();
-            let _: Option<WNDPROC> = Some(transmute(SetWindowLongPtrA(
+            let _: Option<WNDPROC> = Some(transmute::<i32,
+                                    Option<unsafe extern "system"
+                                    fn(HWND, u32, WPARAM, LPARAM) -> LRESULT>>(
+                                    SetWindowLongPtrA(
                 APP.get_window(),
                 GWLP_WNDPROC,
                 wnd_proc as usize as _,
@@ -80,7 +83,9 @@ fn hk_wgl_swap_buffers(hdc: HDC) -> HRESULT {
 
             APP.init_default(hdc, window, ui);
 
-            OLD_WND_PROC = Some(transmute(SetWindowLongPtrA(
+            OLD_WND_PROC = Some(transmute::<i32, Option<unsafe extern "system"
+                    fn(HWND, u32, WPARAM, LPARAM) -> LRESULT>>(
+                    SetWindowLongPtrA(
                 window,
                 GWLP_WNDPROC,
                 hk_wnd_proc as usize as _,