5.0.0: Ditch winapi (#28)

* 5.0.0: Ditch winapi

* Ditch str_buf

.github/workflows/rust.yml

@@ -37,3 +37,10 @@ jobs:
       run: cargo test
       env:
         RUST_TEST_THREADS: 1
+
+    - name: Test x86
+      run: |
+        rustup target add i686-pc-windows-msvc
+        cargo test --target i686-pc-windows-msvc
+      env:
+        RUST_TEST_THREADS: 1

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "clipboard-win"
-version = "4.5.0"
+version = "5.0.0"
 authors = ["Douman <douman@gmx.se>"]
 description = "Provides simple way to interact with Windows clipboard."
 license = "BSL-1.0"
@@ -24,22 +24,7 @@ include = [
 default-target = "x86_64-pc-windows-msvc"
 
 [target.'cfg(windows)'.dependencies]
-error-code = "2.1"
-str-buf = "1"
+error-code = "3"
 
 [features]
 std = ["error-code/std"]
-
-[target.'cfg(windows)'.dependencies.winapi]
-version = "0.3"
-default-features = false
-features = [
-    "basetsd",
-    "shellapi",
-    "winbase",
-    "winuser",
-    "winerror",
-    "stringapiset",
-    "errhandlingapi",
-    "synchapi"
-]

build.rs

@@ -0,0 +1,14 @@
+fn main() {
+    const KIND: &str = "dylib";
+
+    let libs = [
+        "kernel32", //Rust includes it by default already, but just in case link anyway
+        "gdi32",
+        "shell32",
+        "user32",
+    ];
+
+    for lib in libs {
+        println!("cargo:rustc-link-lib={KIND}={lib}");
+    }
+}

src/formats.rs

@@ -6,79 +6,78 @@
 //! Description is taken from [Standard Clipboard Formats](https://msdn.microsoft.com/en-us/library/windows/desktop/ff729168%28v=vs.85%29.aspx)
 
 use crate::{SysResult, Getter, Setter};
-
-use winapi::um::winuser;
+use crate::types::c_uint;
 
 ///A handle to a bitmap (HBITMAP).
-pub const CF_BITMAP: u32 = winuser::CF_BITMAP;
+pub const CF_BITMAP: c_uint = 2;
 ///A memory object containing a <b>BITMAPINFO</b> structure followed by the bitmap bits.
-pub const CF_DIB: u32 = winuser::CF_DIB;
+pub const CF_DIB: c_uint = 8;
 ///A memory object containing a <b>BITMAPV5HEADER</b> structure followed by the bitmap color space
 ///information and the bitmap bits.
-pub const CF_DIBV5: u32 = winuser::CF_DIBV5;
+pub const CF_DIBV5: c_uint = 17;
 ///Software Arts' Data Interchange Format.
-pub const CF_DIF: u32 = winuser::CF_DIF;
+pub const CF_DIF: c_uint = 5;
 ///Bitmap display format associated with a private format. The hMem parameter must be a handle to
 ///data that can be displayed in bitmap format in lieu of the privately formatted data.
-pub const CF_DSPBITMAP: u32 = winuser::CF_DSPBITMAP;
+pub const CF_DSPBITMAP: c_uint = 0x0082;
 ///Enhanced metafile display format associated with a private format. The *hMem* parameter must be a
 ///handle to data that can be displayed in enhanced metafile format in lieu of the privately
 ///formatted data.
-pub const CF_DSPENHMETAFILE: u32 = winuser::CF_DSPENHMETAFILE;
+pub const CF_DSPENHMETAFILE: c_uint = 0x008E;
 ///Metafile-picture display format associated with a private format. The hMem parameter must be a
 ///handle to data that can be displayed in metafile-picture format in lieu of the privately
 ///formatted data.
-pub const CF_DSPMETAFILEPICT: u32 = winuser::CF_DSPMETAFILEPICT;
+pub const CF_DSPMETAFILEPICT: c_uint = 0x0083;
 ///Text display format associated with a private format. The *hMem* parameter must be a handle to
 ///data that can be displayed in text format in lieu of the privately formatted data.
-pub const CF_DSPTEXT: u32 = winuser::CF_DSPTEXT;
+pub const CF_DSPTEXT: c_uint = 0x0081;
 ///A handle to an enhanced metafile (<b>HENHMETAFILE</b>).
-pub const CF_ENHMETAFILE: u32 = winuser::CF_ENHMETAFILE;
+pub const CF_ENHMETAFILE: c_uint = 14;
 ///Start of a range of integer values for application-defined GDI object clipboard formats.
-pub const CF_GDIOBJFIRST: u32 = winuser::CF_GDIOBJFIRST;
+pub const CF_GDIOBJFIRST: c_uint = 0x0300;
 ///End of a range of integer values for application-defined GDI object clipboard formats.
-pub const CF_GDIOBJLAST: u32 = winuser::CF_GDIOBJLAST;
+pub const CF_GDIOBJLAST: c_uint = 0x03FF;
 ///A handle to type <b>HDROP</b> that identifies a list of files.
-pub const CF_HDROP: u32 = winuser::CF_HDROP;
+pub const CF_HDROP: c_uint = 15;
 ///The data is a handle to the locale identifier associated with text in the clipboard.
 ///
 ///For details see [Standart Clipboard Formats](https://msdn.microsoft.com/en-us/library/windows/desktop/ff729168%28v=vs.85%29.aspx)
-pub const CF_LOCALE: u32 = winuser::CF_LOCALE;
+pub const CF_LOCALE: c_uint = 16;
 ///Handle to a metafile picture format as defined by the <b>METAFILEPICT</b> structure.
-pub const CF_METAFILEPICT: u32 = winuser::CF_METAFILEPICT;
+pub const CF_METAFILEPICT: c_uint = 3;
 ///Text format containing characters in the OEM character set.
-pub const CF_OEMTEXT: u32 = winuser::CF_OEMTEXT;
+pub const CF_OEMTEXT: c_uint = 7;
 ///Owner-display format.
 ///
 ///For details see [Standart Clipboard Formats](https://msdn.microsoft.com/en-us/library/windows/desktop/ff729168%28v=vs.85%29.aspx)
-pub const CF_OWNERDISPLAY: u32 = winuser::CF_OWNERDISPLAY;
+pub const CF_OWNERDISPLAY: c_uint = 0x0080;
 ///Handle to a color palette.
 ///
 ///For details see [Standart Clipboard Formats](https://msdn.microsoft.com/en-us/library/windows/desktop/ff729168%28v=vs.85%29.aspx)
-pub const CF_PALETTE: u32 = winuser::CF_PALETTE;
+pub const CF_PALETTE: c_uint = 9;
 ///Data for the pen extensions to the Microsoft Windows for Pen Computing.
-pub const CF_PENDATA: u32 = winuser::CF_PENDATA;
+pub const CF_PENDATA: c_uint = 10;
 ///Start of a range of integer values for private clipboard formats.
-pub const CF_PRIVATEFIRST: u32 = winuser::CF_PRIVATEFIRST;
+pub const CF_PRIVATEFIRST: c_uint = 0x0200;
 ///End of a range of integer values for private clipboard formats.
-pub const CF_PRIVATELAST: u32 = winuser::CF_PRIVATELAST;
+pub const CF_PRIVATELAST: c_uint = 0x02FF;
 ///Represents audio data more complex than can be represented in a ```CF_WAVE``` standard wave format.
-pub const CF_RIFF: u32 = winuser::CF_RIFF;
+pub const CF_RIFF: c_uint = 11;
 ///Microsoft Symbolic Link (SYLK) format.
-pub const CF_SYLK: u32 = winuser::CF_SYLK;
+pub const CF_SYLK: c_uint = 4;
 ///ANSI text format.
-pub const CF_TEXT: u32 = winuser::CF_TEXT;
+pub const CF_TEXT: c_uint = 1;
 ///Tagged-image file format.
-pub const CF_TIFF: u32 = winuser::CF_TIFF;
+pub const CF_TIFF: c_uint = 6;
 ///UTF16 text format.
-pub const CF_UNICODETEXT: u32 = winuser::CF_UNICODETEXT;
+pub const CF_UNICODETEXT: c_uint = 13;
 ///Represents audio data in one of the standard wave formats.
-pub const CF_WAVE: u32 = winuser::CF_WAVE;
+pub const CF_WAVE: c_uint = 12;
 
 ///Format to write/read from clipboard as raw bytes
 ///
 ///Has to be initialized with format `id`
-pub struct RawData(pub u32);
+pub struct RawData(pub c_uint);
 
 impl<T: AsRef<[u8]>> Setter<T> for RawData {
     #[inline(always)]

src/lib.rs

@@ -87,16 +87,18 @@ extern crate std;
 
 extern crate alloc;
 
+mod sys;
+pub mod types;
 pub mod formats;
 pub mod raw;
 pub(crate) mod utils;
 
 pub use raw::{get_owner, empty, seq_num, size, is_format_avail, register_format, count_formats, EnumFormats};
 pub use formats::Unicode;
 
-pub use error_code::SystemError;
+pub use error_code::ErrorCode;
 ///Alias to result used by this crate
-pub type SysResult<T> = Result<T, error_code::SystemError>;
+pub type SysResult<T> = Result<T, ErrorCode>;
 
 ///Clipboard instance, which allows to perform clipboard ops.
 ///
@@ -123,7 +125,7 @@ impl Clipboard {
 
     #[inline(always)]
     ///Attempts to open clipboard, associating it with specified `owner` and returning clipboard instance on success.
-    pub fn new_for(owner: winapi::shared::windef::HWND) -> SysResult<Self> {
+    pub fn new_for(owner: types::HWND) -> SysResult<Self> {
         raw::open_for(owner).map(|_| Self { _dummy: () })
     }
 
@@ -135,7 +137,7 @@ impl Clipboard {
 
     #[inline]
     ///Attempts to open clipboard, giving it `num` retries in case of failure.
-    pub fn new_attempts_for(owner: winapi::shared::windef::HWND, mut num: usize) -> SysResult<Self> {
+    pub fn new_attempts_for(owner: types::HWND, mut num: usize) -> SysResult<Self> {
         loop {
             match Self::new_for(owner) {
                 Ok(this) => break Ok(this),
@@ -146,7 +148,7 @@ impl Clipboard {
             }
 
             //0 causes to yield remaining time in scheduler, but remain to be scheduled once again.
-            unsafe { winapi::um::synchapi::Sleep(0) };
+            unsafe { sys::Sleep(0) };
         }
     }
 }