Skip to content

Commit 981f73c

Browse files
committed
adding format to QueryInterface
1 parent 1e3a0bf commit 981f73c

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

winit-win32/src/drop_handler.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1+
use crate::definitions::{
2+
IDataObject, IDataObjectVtbl, IDropTarget, IDropTargetVtbl, IUnknown, IUnknownVtbl,
3+
};
4+
use dpi::PhysicalPosition;
15
use std::ffi::{OsString, c_void};
26
use std::os::windows::ffi::OsStringExt;
37
use std::path::PathBuf;
48
use std::ptr::{self, null_mut};
59
use std::sync::atomic::{AtomicUsize, Ordering};
6-
use dpi::PhysicalPosition;
710
use tracing::debug;
811
use windows_sys::Win32::Foundation::{DV_E_FORMATETC, E_NOINTERFACE, HWND, POINT, POINTL, S_OK};
912
use windows_sys::Win32::Graphics::Gdi::ScreenToClient;
@@ -12,9 +15,6 @@ use windows_sys::Win32::System::Ole::{CF_HDROP, DROPEFFECT_COPY, DROPEFFECT_NONE
1215
use windows_sys::Win32::UI::Shell::{DragFinish, DragQueryFileW, HDROP};
1316
use windows_sys::core::{GUID, HRESULT};
1417
use winit_core::event::WindowEvent;
15-
use crate::definitions::{
16-
IDataObject, IDataObjectVtbl, IDropTarget, IDropTargetVtbl, IUnknown, IUnknownVtbl,
17-
};
1818

1919
const IID_IUNKNOWN: GUID = GUID {
2020
data1: 0x00000000,
@@ -31,10 +31,7 @@ const IID_IDROP_TARGET: GUID = GUID {
3131
};
3232

3333
fn guid_eq(a: &GUID, b: &GUID) -> bool {
34-
a.data1 == b.data1 &&
35-
a.data2 == b.data2 &&
36-
a.data3 == b.data3 &&
37-
a.data4 == b.data4
34+
a.data1 == b.data1 && a.data2 == b.data2 && a.data3 == b.data3 && a.data4 == b.data4
3835
}
3936

4037
#[repr(C)]
@@ -76,11 +73,11 @@ impl FileDropHandler {
7673
return E_NOINTERFACE;
7774
}
7875

79-
let drop_handler_data =unsafe{ Self::from_interface(this)};
76+
let drop_handler_data = unsafe { Self::from_interface(this) };
8077
let requested = unsafe { &*riid };
8178

8279
if guid_eq(requested, &IID_IUNKNOWN) || guid_eq(requested, &IID_IDROP_TARGET) {
83-
unsafe{*ppvObject =this as *mut c_void};
80+
unsafe { *ppvObject = this as *mut c_void };
8481
drop_handler_data.refcount.fetch_add(1, Ordering::Release);
8582
return S_OK;
8683
}
@@ -277,8 +274,7 @@ mod tests {
277274
use std::ptr::null_mut;
278275
use windows_sys::Win32::Foundation::HWND;
279276
use windows_sys::core::GUID;
280-
281-
277+
282278
#[test]
283279
fn test_file_drop_handler_query_interface() {
284280
let handler = FileDropHandler::new(

0 commit comments

Comments
 (0)