winex11: Avoid leaking foreign window data if it was already created.

NtUserCreateWindowEx will call apply_window_pos and drivers WindowPosChanging callback, which already creates window data.

winex11: Avoid leaking foreign window data if it was already created.
e2845104 · Rémi Bernon · Alexandre Julliard · 97cb5b9c · e2845104
Commit e2845104 authored May 03, 2024 by Rémi Bernon Committed by Alexandre Julliard May 03, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

window.c dlls/winex11.drv/window.c +2 -5

No files found.
--- a/dlls/winex11.drv/window.c
+++ b/dlls/winex11.drv/window.c
@@ -2229,15 +2229,12 @@ HWND create_foreign_window( Display *display, Window xwin )
    hwnd = NtUserCreateWindowEx( 0, &class_name, &class_name, NULL, style, pos.x, pos.y,
                                 attr.width, attr.height, parent, 0, NULL, NULL, 0, NULL,
                                 0, FALSE );
+    if (!(data = get_win_data( hwnd )))
-    if (!(data = alloc_win_data( display, hwnd )))
    {
        NtUserDestroyWindow( hwnd );
        return 0;
    }
-    SetRect( &data->window_rect, pos.x, pos.y, pos.x + attr.width, pos.y + attr.height );
+    destroy_whole_window( data, FALSE );
-    data->whole_rect = data->client_rect = data->window_rect;
-    data->whole_window = data->client_window = 0;
    data->embedded = TRUE;
    data->mapped = TRUE;