Destroy windows only for now

Author: jf908

src/lib.rs

@@ -76,6 +76,12 @@ pub fn prepare(identifier: &str) {
     platform_impl::prepare(identifier)
 }
 
+/// TODO: Windows-only for now
+#[cfg(target_os = "windows")]
+pub fn destroy() {
+    platform_impl::destroy()
+}
+
 /// Helper to get current exe path
 pub(crate) fn current_exe() -> std::io::Result<PathBuf> {
     let path = std::env::current_exe()?;

src/windows.rs

@@ -51,3 +51,7 @@ pub fn prepare(identifier: &str) {
     ID.set(identifier.to_string())
         .expect("prepare() called more than once with different identifiers.");
 }
+
+pub fn destroy() {
+    windows_single::destroy();
+}

src/windows_single.rs

@@ -76,25 +76,25 @@ pub fn init(f: Box<SingleInstanceCallback>) {
     }
 }
 
-// pub fn destroy() {
-//     if let Some(hmutex) = MUTEX_HANDLE.get() {
-//         unsafe {
-//             ReleaseMutex(hmutex.0 as _);
-//             CloseHandle(hmutex.0 as _);
-//         }
-//     }
-//     if let Some(hwnd) = TARGET_WINDOW_HANDLE.get() {
-//         unsafe { DestroyWindow(hwnd.0 as _) };
-//     }
-// }
+pub fn destroy() {
+    if let Some(hmutex) = MUTEX_HANDLE.get() {
+        unsafe {
+            ReleaseMutex(hmutex.0 as _);
+            CloseHandle(hmutex.0 as _);
+        }
+    }
+    if let Some(hwnd) = TARGET_WINDOW_HANDLE.get() {
+        unsafe { DestroyWindow(hwnd.0 as _) };
+    }
+}
 
 unsafe extern "system" fn single_instance_window_proc(
     hwnd: HWND,
     msg: u32,
     wparam: WPARAM,
     lparam: LPARAM,
 ) -> LRESULT {
-    let data_ptr = GetWindowLongPtrW(hwnd, GWL_USERDATA) as *mut (Box<SingleInstanceCallback>);
+    let data_ptr = GetWindowLongPtrW(hwnd, GWL_USERDATA) as *mut Box<SingleInstanceCallback>;
     let callback = &mut *data_ptr;
 
     match msg {