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

Update clipboard-win to v5 and replace winapi with windows-sys #123

Merged
merged 14 commits into from
Dec 4, 2023
Merged

Update clipboard-win to v5 and replace winapi with windows-sys #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0cfb920
Replace winapi with windows-rs
rhysd Nov 24, 2023
c6b25f8
Update clipboard-win to v5.0.0
rhysd Nov 24, 2023
c19bb16
Check device context handle returned from `GetDC()`
rhysd Nov 24, 2023
6cfde9c
Replace windows-rs with windows-sys
rhysd Nov 28, 2023
a833222
Refactor creating`Error::Unknown` variant with helper funciton
rhysd Nov 28, 2023
ec5e1d8
Separate module for `image_data` feature within platform/windows.rs a…
rhysd Nov 28, 2023
ba5575b
Wrap Win32 APIs to return `Result` idiomatically
rhysd Nov 28, 2023
ba9e7e8
Move ARGB and RGBA conversion tests to `image_data` module
rhysd Nov 28, 2023
2a514e1
Hide `Error::unknown` helper function
rhysd Nov 28, 2023
5a54623
Downgrade windows-sys from 0.52 to 0.48
rhysd Dec 1, 2023
d9768fc
Prefer `io::Error::last_os_error` to unsafe `GetLastError`
rhysd Dec 1, 2023
39664c5
Fix checking result of `GlobalUnlock`
rhysd Dec 1, 2023
83425ba
Revert `set_clipboard_data` and make `get_screen_device_context` safe
rhysd Dec 1, 2023
d478bce
Fix error handling on `GlobalUnlock` call
rhysd Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 5 additions & 17 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 8 additions & 6 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rust-version = "1.61"

[features]
default = ["image-data"]
image-data = ["core-graphics", "image", "winapi/minwindef", "winapi/wingdi", "winapi/winnt"]
image-data = ["core-graphics", "image", "windows-sys"]
wayland-data-control = ["wl-clipboard-rs"]

[dependencies]
Expand All @@ -22,12 +22,14 @@ thiserror = "1.0"
env_logger = "0.9.0"

[target.'cfg(windows)'.dependencies]
winapi = { version = "0.3.9", optional = true, features = [
"basetsd",
"winuser",
"winbase",
windows-sys = { version = "0.48.0", optional = true, features = [
"Win32_Foundation",
"Win32_Graphics_Gdi",
"Win32_System_DataExchange",
"Win32_System_Memory",
"Win32_System_Ole",
]}
clipboard-win = "4.4.2"
clipboard-win = "5.0.0"
log = "0.4"

[target.'cfg(target_os = "macos")'.dependencies]
Expand Down
7 changes: 7 additions & 0 deletions src/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@ impl std::fmt::Debug for Error {
}
}

impl Error {
#[cfg(windows)]
pub(crate) fn unknown<M: Into<String>>(message: M) -> Self {
Error::Unknown { description: message.into() }
}
}

/// Stores pixel data of an image.
///
/// Each element in `bytes` stores the value of a channel of a single pixel.
Expand Down
Loading
Loading