diff --git a/libs/clipboard/src/windows/wf_cliprdr.c b/libs/clipboard/src/windows/wf_cliprdr.c index 407316d0..82b97216 100644 --- a/libs/clipboard/src/windows/wf_cliprdr.c +++ b/libs/clipboard/src/windows/wf_cliprdr.c @@ -1497,9 +1497,13 @@ UINT wait_response_event(wfClipboard *clipboard, HANDLE event, void **data) msg.details = NULL; clipboard->context->NotifyClipboardMsg(&msg); rc = ERROR_INTERNAL_ERROR; - } - if ((*data) != NULL) + if (!ResetEvent(event)) + { + // NOTE: critical error here, crash may be better + } + } + else if ((*data) != NULL) { if (!ResetEvent(event)) { diff --git a/src/flutter.rs b/src/flutter.rs index 0a547aca..972374f2 100644 --- a/src/flutter.rs +++ b/src/flutter.rs @@ -1102,6 +1102,7 @@ fn msgbox_clipboard_(channel: &str, r#type: u32, msg: &str, details: &str) -> u3 ); let text = format!("{} {}", msg, details); if let Ok(event) = serde_json::ser::to_string(&HashMap::from([ + ("name", "msgbox"), ("type", &msgtype as &str), ("title", "clipboard"), ("text", &text), diff --git a/src/lang/ca.rs b/src/lang/ca.rs index 11f7a877..b5163f68 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 2fe55a6b..7fc27f68 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "折叠工具栏"), ("Accept and Elevate", "接受并提权"), ("accept_and_elevate_btn_tooltip", "接受连接并提升 UAC 权限"), + ("clipboard_wait_response_timeout_tip", "等待拷贝响应超时"), ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index cad262be..5f279c7b 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index 229cd566..aaa5acf0 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index fede1f3a..1325aac4 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "Symbolleiste einklappen"), ("Accept and Elevate", "Akzeptieren und Rechte erhöhen"), ("accept_and_elevate_btn_tooltip", "Akzeptieren Sie die Verbindung und erhöhen Sie die UAC-Berechtigungen."), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/el.rs b/src/lang/el.rs index 06d52f10..6eacba00 100644 --- a/src/lang/el.rs +++ b/src/lang/el.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/en.rs b/src/lang/en.rs index c8e4f3f9..9d759ada 100644 --- a/src/lang/en.rs +++ b/src/lang/en.rs @@ -70,5 +70,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("resolution_fit_local_tip", "Fit local resolution"), ("resolution_custom_tip", "Custom resolution"), ("accept_and_elevate_btn_tooltip", "Accept the connection and elevate UAC permissions."), + ("clipboard_wait_response_timeout_tip", "Timed out waiting for copy response."), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 28160110..e232cb58 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index 57023178..28d8832f 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "Contraer barra de herramientas"), ("Accept and Elevate", "Aceptar y Elevar"), ("accept_and_elevate_btn_tooltip", "Aceptar la conexión y elevar permisos UAC."), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 3da21726..10b49ee9 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "جمع کردن نوار ابزار"), ("Accept and Elevate", "بپذیرید و افزایش دهید"), ("accept_and_elevate_btn_tooltip", "را افزایش دهید UAC اتصال را بپذیرید و مجوزهای."), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index 483ea8f4..e782e8dc 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 46bf48dd..d9b95eeb 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index c88faaba..27cdcf1f 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index 173bb843..edc2eb9a 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "Comprimi barra strumenti"), ("Accept and Elevate", "Accetta ed eleva"), ("accept_and_elevate_btn_tooltip", "Accetta la connessione ed eleva le autorizzazioni UAC."), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index b02cca14..5def2cfc 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 4a052e84..90040b96 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index efdb9718..6bb1c7a9 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/lt.rs b/src/lang/lt.rs index 247a8151..d2402c7f 100644 --- a/src/lang/lt.rs +++ b/src/lang/lt.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index 14763515..2e0de490 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "Werkbalk samenvouwen"), ("Accept and Elevate", "Accepteren en Verheffen"), ("accept_and_elevate_btn_tooltip", "Accepteer de verbinding en verhoog de UAC-machtigingen."), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index 09d62b38..dfa6834c 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "Zwiń pasek narzędzi"), ("Accept and Elevate", "Akceptuj i Podnieś uprawnienia"), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index aa91a974..743154d5 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 594a57cc..3bcc10e6 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 18e21e29..b75d5950 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index 2e0128cd..d7e70798 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "Свернуть панель инструментов"), ("Accept and Elevate", "Принять и повысить"), ("accept_and_elevate_btn_tooltip", "Разрешить подключение и повысить права UAC."), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index ca308a7b..c9933009 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 691c7796..99e3f280 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 5b2e34e2..04735b4b 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index e9c8178e..9a9e251d 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index 0e17e1a2..73eb138b 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 1cd755c5..e5fa47fd 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index 3f112793..78aa94c6 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index 64c97fcf..bc9cd694 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index 123a259e..5f513613 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 4b3d8701..135b3b35 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", ""), ("Accept and Elevate", ""), ("accept_and_elevate_btn_tooltip", ""), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); } diff --git a/src/lang/vn.rs b/src/lang/vn.rs index 04d9abcc..05689843 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -511,5 +511,6 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("Collapse toolbar", "Thu nhỏ thanh công cụ"), ("Accept and Elevate", "Chấp nhận và Cấp Quyền"), ("accept_and_elevate_btn_tooltip", "Chấp nhận kết nối và cấp các quyền UAC."), + ("clipboard_wait_response_timeout_tip", ""), ].iter().cloned().collect(); }