leyoda/winit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make drag and drop optional (fixes OleInitialize failure #1255) (#1524)

Browse source 
Co-authored-by: Osspial <osspial@gmail.com>
This commit is contained in:
Jurgis 2020-06-29 01:17:27 +03:00 • committed by GitHub
parent 2191e9ecd5
commit b1e22aa559
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 40 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/platform_impl/windows/window.rs
View file

@ -70,8 +70,9 @@ impl Window {
//
// done. you owe me -- ossi
unsafe {
let drag_and_drop = pl_attr.drag_and_drop;
init(w_attr, pl_attr, event_loop).map(|win| {
let file_drop_handler = {
let file_drop_handler = if drag_and_drop {
use winapi::shared::winerror::{OLE_E_WRONGCOMPOBJ, RPC_E_CHANGED_MODE, S_OK};
let ole_init_result = ole2::OleInitialize(ptr::null_mut());
@ -80,7 +81,11 @@ impl Window {
if ole_init_result == OLE_E_WRONGCOMPOBJ {
panic!("OleInitialize failed! Result was: `OLE_E_WRONGCOMPOBJ`");
} else if ole_init_result == RPC_E_CHANGED_MODE {
panic!("OleInitialize failed! Result was: `RPC_E_CHANGED_MODE`");
panic!(
"OleInitialize failed! Result was: `RPC_E_CHANGED_MODE`. \
Make sure other crates are not using multithreaded COM library \
on the same thread or disable drag and drop support."
);
}
let file_drop_runner = event_loop.runner_shared.clone();
@ -99,7 +104,9 @@ impl Window {
ole2::RegisterDragDrop(win.window.0, handler_interface_ptr),
S_OK
);
file_drop_handler
Some(file_drop_handler)
} else {
None
};
let subclass_input = event_loop::SubclassInput {