Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: process didn't exit successfully #11

Merged
merged 4 commits into from Mar 11, 2023
Merged

fix: process didn't exit successfully #11

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93df296
fix: process didn't exit successfully
tangdaoyuan Mar 7, 2023
6907188
perf: drop interface manually
tangdaoyuan Mar 8, 2023
c0cc671
style: fix
tangdaoyuan Mar 8, 2023
b82e496
style: remove unnecessary `unsafe`
tangdaoyuan Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/lib.rs
View file
Open in desktop
@@ -1,5 +1,6 @@
use std::{
ffi::OsString,
mem::ManuallyDrop,
os::windows::prelude::{OsStrExt, OsStringExt},
path::{Path, PathBuf},
};
Expand Down Expand Up @@ -51,7 +52,7 @@ pub struct Monitor {

#[derive(Debug)]
pub struct DesktopWallpaper {
interface: IDesktopWallpaper,
interface: ManuallyDrop<IDesktopWallpaper>,
}

impl DesktopWallpaper {
Expand All @@ -61,7 +62,9 @@ impl DesktopWallpaper {
CoCreateInstance(&DesktopWallpaper, None, CLSCTX_LOCAL_SERVER)?
};

Ok(Self { interface })
Ok(Self {
interface: ManuallyDrop::new(interface),
})
}

pub fn get_monitors(&self) -> Result<Vec<Monitor>> {
Expand Down Expand Up @@ -137,6 +140,9 @@ impl DesktopWallpaper {

impl Drop for DesktopWallpaper {
fn drop(&mut self) {
unsafe {
ManuallyDrop::drop(&mut self.interface); // ensure to release of COM pointers before the CoUninitialize call
}
tangdaoyuan marked this conversation as resolved.
Show resolved Hide resolved
unsafe {
CoFreeUnusedLibraries();
CoUninitialize();
Expand Down