vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-06-16 16:33:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add missing free() calls for xcb

Browse Source
This commit is contained in:
Robbert van der Helm
2020-10-08 17:03:03 +02:00
parent 60c4e64b9b
commit 36d39bfca9
1 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wine-host/editor.cpp
+45 -6
View File
@@ -234,17 +234,21 @@ void Editor::fix_local_coordinates() const {
// window created by the plugin itself. In this case it doesn't matter that // window created by the plugin itself. In this case it doesn't matter that
// the Win32 window is larger than the part of the client area the plugin // the Win32 window is larger than the part of the client area the plugin
// draws to since any excess will be clipped off by the parent window. // draws to since any excess will be clipped off by the parent window.
const auto query_cookie = const xcb_query_tree_cookie_t query_cookie =
xcb_query_tree(x11_connection.get(), parent_window); xcb_query_tree(x11_connection.get(), parent_window);
xcb_window_t root = xcb_query_tree_reply_t* query_reply =
xcb_query_tree_reply(x11_connection.get(), query_cookie, &error)->root; xcb_query_tree_reply(x11_connection.get(), query_cookie, &error);
assert(!error); assert(!error);
xcb_window_t root = query_reply->root;
free(query_reply);
// We can't directly use the `event.x` and `event.y` coordinates because the // We can't directly use the `event.x` and `event.y` coordinates because the
// parent window may also be embedded inside another window. // parent window may also be embedded inside another window.
const auto translate_cookie = xcb_translate_coordinates( const xcb_translate_coordinates_cookie_t translate_cookie =
x11_connection.get(), parent_window, root, 0, 0); xcb_translate_coordinates(x11_connection.get(), parent_window, root, 0,
const xcb_translate_coordinates_reply_t* translated_coordinates = 0);
xcb_translate_coordinates_reply_t* translated_coordinates =
xcb_translate_coordinates_reply(x11_connection.get(), translate_cookie, xcb_translate_coordinates_reply(x11_connection.get(), translate_cookie,
&error); &error);
assert(!error); assert(!error);
@@ -261,6 +265,7 @@ void Editor::fix_local_coordinates() const {
translated_event.height = client_area.height; translated_event.height = client_area.height;
translated_event.x = translated_coordinates->dst_x; translated_event.x = translated_coordinates->dst_x;
translated_event.y = translated_coordinates->dst_y; translated_event.y = translated_coordinates->dst_y;
free(translated_coordinates);
xcb_send_event( xcb_send_event(
x11_connection.get(), false, wine_window, x11_connection.get(), false, wine_window,
@@ -366,15 +371,49 @@ xcb_window_t find_topmost_window(xcb_connection_t& x11_connection,
while (query_reply->parent != root) { while (query_reply->parent != root) {
current_window = query_reply->parent; current_window = query_reply->parent;
free(query_reply);
query_cookie = xcb_query_tree(&x11_connection, current_window); query_cookie = xcb_query_tree(&x11_connection, current_window);
query_reply = query_reply =
xcb_query_tree_reply(&x11_connection, query_cookie, &error); xcb_query_tree_reply(&x11_connection, query_cookie, &error);
assert(!error); assert(!error);
} }
free(query_reply);
return current_window; return current_window;
} }
bool is_child_window_or_same(xcb_connection_t& x11_connection,
xcb_window_t child,
xcb_window_t parent) {
xcb_generic_error_t* error;
xcb_window_t current_window = child;
xcb_query_tree_cookie_t query_cookie =
xcb_query_tree(&x11_connection, child);
xcb_query_tree_reply_t* query_reply =
xcb_query_tree_reply(&x11_connection, query_cookie, &error);
assert(!error);
while (query_reply->parent != XCB_NONE) {
if (current_window == parent) {
free(query_reply);
return true;
}
current_window = query_reply->parent;
free(query_reply);
query_cookie = xcb_query_tree(&x11_connection, current_window);
query_reply =
xcb_query_tree_reply(&x11_connection, query_cookie, &error);
assert(!error);
}
free(query_reply);
return false;
}
Size get_maximum_screen_dimensions(xcb_connection_t& x11_connection) { Size get_maximum_screen_dimensions(xcb_connection_t& x11_connection) {
xcb_screen_iterator_t iter = xcb_screen_iterator_t iter =
xcb_setup_roots_iterator(xcb_get_setup(&x11_connection)); xcb_setup_roots_iterator(xcb_get_setup(&x11_connection));