wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

Jacek Caban : winex11: Move foreign_window_proc to systray.c.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 7256519102368ae47ec60c95026b18f79421c008 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7256519102368ae47ec60c95… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 01:24:03 2022 +0200 winex11: Move foreign_window_proc to systray.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 25 ++++++++++++++++++++++++- dlls/winex11.drv/window.c | 23 ----------------------- dlls/winex11.drv/x11drv.h | 3 ++- 3 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index ae1c5738f8e..1c6616e0d9c 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -142,7 +142,7 @@ static void create_tooltip(struct tray_icon *icon) } } -void update_systray_balloon_position(void) +static void update_systray_balloon_position(void) { RECT rect; POINT pos; @@ -783,3 +783,26 @@ int CDECL wine_notify_icon( DWORD msg, NOTIFYICONDATAW *data ) } return ret; } + + +/* window procedure for foreign windows */ +LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + switch(msg) + { + case WM_WINDOWPOSCHANGED: + update_systray_balloon_position(); + break; + case WM_PARENTNOTIFY: + if (LOWORD(wparam) == WM_DESTROY) + { + TRACE( "%p: got parent notify destroy for win %lx\n", hwnd, lparam ); + PostMessageW( hwnd, WM_CLOSE, 0, 0 ); /* so that we come back here once the child is gone */ + } + return 0; + case WM_CLOSE: + if (GetWindow( hwnd, GW_CHILD )) return 0; /* refuse to die if we still have children */ + break; + } + return DefWindowProcW( hwnd, msg, wparam, lparam ); +} diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f006150fb7c..7726ba78db0 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1987,29 +1987,6 @@ static struct x11drv_win_data *X11DRV_create_win_data( HWND hwnd, const RECT *wi } -/* window procedure for foreign windows */ -static LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) -{ - switch(msg) - { - case WM_WINDOWPOSCHANGED: - update_systray_balloon_position(); - break; - case WM_PARENTNOTIFY: - if (LOWORD(wparam) == WM_DESTROY) - { - TRACE( "%p: got parent notify destroy for win %lx\n", hwnd, lparam ); - NtUserPostMessage( hwnd, WM_CLOSE, 0, 0 ); /* so that we come back here once the child is gone */ - } - return 0; - case WM_CLOSE: - if (NtUserGetWindowRelative( hwnd, GW_CHILD )) return 0; /* refuse to die if we still have children */ - break; - } - return DefWindowProcW( hwnd, msg, wparam, lparam ); -} - - /*********************************************************************** * create_foreign_window * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index d3db49b86b6..42d9e39b082 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -642,7 +642,6 @@ extern Window create_dummy_client_window(void) DECLSPEC_HIDDEN; extern Window create_client_window( HWND hwnd, const XVisualInfo *visual ) DECLSPEC_HIDDEN; extern void set_window_visual( struct x11drv_win_data *data, const XVisualInfo *vis, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void change_systray_owner( Display *display, Window systray_window ) DECLSPEC_HIDDEN; -extern void update_systray_balloon_position(void) DECLSPEC_HIDDEN; extern HWND create_foreign_window( Display *display, Window window ) DECLSPEC_HIDDEN; extern BOOL update_clipboard( HWND hwnd ) DECLSPEC_HIDDEN; extern void init_win_context(void) DECLSPEC_HIDDEN; @@ -853,6 +852,8 @@ extern NTSTATUS x11drv_ime_set_cursor_pos( UINT pos ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_ime_set_open_status( UINT open ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN; +extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam, + LPARAM lparam ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_client_func( enum x11drv_client_funcs func, const void *params, ULONG size ) DECLSPEC_HIDDEN;

1 0

Jacek Caban : winex11: Use unixlib interface for systray docking.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 21d269f2fc9795188e08bae45adb6bd2a2ebb311 URL: https://source.winehq.org/git/wine.git/?a=commit;h=21d269f2fc9795188e08bae4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 00:10:36 2022 +0200 winex11: Use unixlib interface for systray docking. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 1 + dlls/winex11.drv/event.c | 10 +++- dlls/winex11.drv/systray.c | 117 ++++++++--------------------------------- dlls/winex11.drv/unixlib.h | 16 ++++++ dlls/winex11.drv/window.c | 114 +++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 2 + 7 files changed, 165 insertions(+), 97 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21d269f2fc9795188e08…

1 0

Jacek Caban : winex11: Use unixlib interface for X11 calls from systray.c.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: e41630612ba2cb2f64ef3f3de7c712aafe7a2288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41630612ba2cb2f64ef3f3d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 4 23:39:17 2022 +0200 winex11: Use unixlib interface for X11 calls from systray.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/systray.c | 33 +++++++----------------------- dlls/winex11.drv/unixlib.h | 3 +++ dlls/winex11.drv/window.c | 46 ++++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/x11drv.h | 3 +++ dlls/winex11.drv/x11drv_main.c | 3 +++ 5 files changed, 62 insertions(+), 26 deletions(-) diff --git a/dlls/winex11.drv/systray.c b/dlls/winex11.drv/systray.c index 45ad0617246..bb2e5d563dd 100644 --- a/dlls/winex11.drv/systray.c +++ b/dlls/winex11.drv/systray.c @@ -587,10 +587,13 @@ static BOOL init_systray(void) { static BOOL init_done; WNDCLASSEXW class; - Display *display; - if (is_virtual_desktop()) return FALSE; if (init_done) return TRUE; + if (!X11DRV_CALL( systray_init, NULL )) + { + init_done = TRUE; + return FALSE; + } icon_cx = GetSystemMetrics( SM_CXSMICON ) + 2 * ICON_BORDER; icon_cy = GetSystemMetrics( SM_CYSMICON ) + 2 * ICON_BORDER; @@ -620,17 +623,6 @@ static BOOL init_systray(void) return FALSE; } - display = thread_init_display(); - if (DefaultScreen( display ) == 0) - systray_atom = x11drv_atom(_NET_SYSTEM_TRAY_S0); - else - { - char systray_buffer[29]; /* strlen(_NET_SYSTEM_TRAY_S4294967295)+1 */ - sprintf( systray_buffer, "_NET_SYSTEM_TRAY_S%u", DefaultScreen( display ) ); - systray_atom = XInternAtom( display, systray_buffer, False ); - } - XSelectInput( display, root_window, StructureNotifyMask ); - init_done = TRUE; return TRUE; } @@ -700,18 +692,11 @@ void change_systray_owner( Display *display, Window systray_window ) /* hide a tray icon */ static BOOL hide_icon( struct tray_icon *icon ) { - struct x11drv_win_data *data; - TRACE( "id=0x%x, hwnd=%p\n", icon->id, icon->owner ); if (!icon->window) return TRUE; /* already hidden */ - /* make sure we don't try to unmap it, it confuses some systray docks */ - if ((data = get_win_data( icon->window ))) - { - if (data->embedded) data->mapped = FALSE; - release_win_data( data ); - } + X11DRV_CALL( systray_hide, &icon->window ); DestroyWindow(icon->window); DestroyWindow(icon->tooltip); icon->window = 0; @@ -759,11 +744,7 @@ static BOOL modify_icon( struct tray_icon *icon, NOTIFYICONDATAW *nid ) { if (icon->display != -1) InvalidateRect( icon->window, NULL, TRUE ); else if (icon->layered) repaint_tray_icon( icon ); - else - { - Window win = X11DRV_get_whole_window( icon->window ); - if (win) XClearArea( gdi_display, win, 0, 0, 0, 0, True ); - } + else X11DRV_CALL( systray_clear, &icon->window ); } } diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h index fe3b430dc87..ce89f7d4d39 100644 --- a/dlls/winex11.drv/unixlib.h +++ b/dlls/winex11.drv/unixlib.h @@ -24,6 +24,9 @@ enum x11drv_funcs unix_clipboard_message, unix_create_desktop, unix_init, + unix_systray_clear, + unix_systray_hide, + unix_systray_init, unix_tablet_attach_queue, unix_tablet_get_packet, unix_tablet_info, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7ccec4ee4ec..4ae1d3f11a3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2092,6 +2092,52 @@ HWND create_foreign_window( Display *display, Window xwin ) } +NTSTATUS x11drv_systray_init( void *arg ) +{ + Display *display; + + if (is_virtual_desktop()) return FALSE; + + display = thread_init_display(); + if (DefaultScreen( display ) == 0) + systray_atom = x11drv_atom(_NET_SYSTEM_TRAY_S0); + else + { + char systray_buffer[29]; /* strlen(_NET_SYSTEM_TRAY_S4294967295)+1 */ + sprintf( systray_buffer, "_NET_SYSTEM_TRAY_S%u", DefaultScreen( display ) ); + systray_atom = XInternAtom( display, systray_buffer, False ); + } + XSelectInput( display, root_window, StructureNotifyMask ); + + return TRUE; +} + + +NTSTATUS x11drv_systray_clear( void *arg ) +{ + HWND hwnd = *(HWND*)arg; + Window win = X11DRV_get_whole_window( hwnd ); + if (win) XClearArea( gdi_display, win, 0, 0, 0, 0, True ); + return 0; +} + + +NTSTATUS x11drv_systray_hide( void *arg ) +{ + HWND hwnd = *(HWND*)arg; + struct x11drv_win_data *data; + + /* make sure we don't try to unmap it, it confuses some systray docks */ + if ((data = get_win_data( hwnd ))) + { + if (data->embedded) data->mapped = FALSE; + release_win_data( data ); + } + + return 0; +} + + /*********************************************************************** * X11DRV_get_whole_window * diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 3986733782a..ec72d8a550e 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -827,6 +827,9 @@ static inline BOOL is_window_rect_mapped( const RECT *rect ) extern NTSTATUS x11drv_clipboard_message( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_create_desktop( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_systray_clear( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_systray_hide( void *arg ) DECLSPEC_HIDDEN; +extern NTSTATUS x11drv_systray_init( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_attach_queue( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_get_packet( void *arg ) DECLSPEC_HIDDEN; extern NTSTATUS x11drv_tablet_load_info( void *arg ) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index 749fe2f761b..2d65f2a03d6 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -977,6 +977,9 @@ const unixlib_entry_t __wine_unix_call_funcs[] = x11drv_clipboard_message, x11drv_create_desktop, x11drv_init, + x11drv_systray_clear, + x11drv_systray_hide, + x11drv_systray_init, x11drv_tablet_attach_queue, x11drv_tablet_get_packet, x11drv_tablet_info,

1 0

Jacek Caban : winex11: Use unixlib interface for IME calls.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 6290d0599d1a9f28c99970127ffb233b5abd1bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6290d0599d1a9f28c9997012… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 23:10:15 2022 +0200 winex11: Use unixlib interface for IME calls. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 7 ++++++ dlls/winex11.drv/ime.c | 58 ++++++++++++++++++++++++++-------------------- dlls/winex11.drv/unixlib.h | 7 ++++++ dlls/winex11.drv/x11drv.h | 19 ++++++--------- dlls/winex11.drv/xim.c | 27 ++++++++++----------- 5 files changed, 66 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6290d0599d1a9f28c999…

1 0

Jacek Caban : winex11: Introduce x11drv_client_call.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 040d1f9bbd20c9d507279ea5585188db15ff3a6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=040d1f9bbd20c9d507279ea5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 3 01:07:17 2022 +0200 winex11: Introduce x11drv_client_call. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/dllmain.c | 38 ++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/event.c | 15 +++++---------- dlls/winex11.drv/unixlib.h | 42 +++++++++++++++++++++++++++--------------- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 16 +++++++++++----- dlls/winex11.drv/x11drv_main.c | 15 +++++++++++++++ dlls/winex11.drv/xdnd.c | 41 ++++++++++++----------------------------- include/ntuser.h | 3 +++ 8 files changed, 110 insertions(+), 62 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=040d1f9bbd20c9d50727…

1 0

Rémi Bernon : kernel32/tests: Add some RtlWalkHeap and more HeapWalk tests.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: d823e344c80067c2059d6c70472e9385447e635c URL: https://source.winehq.org/git/wine.git/?a=commit;h=d823e344c80067c2059d6c70… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 1 10:42:27 2022 +0200 kernel32/tests: Add some RtlWalkHeap and more HeapWalk tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 262 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 259 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d823e344c80067c2059d…

1 0

Rémi Bernon : kernel32/tests: Add more block layout tests with alloc flags.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: dac05029bd83c5fb6fbca69138e071233eb3d8a9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dac05029bd83c5fb6fbca691… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 10:32:43 2022 +0200 kernel32/tests: Add more block layout tests with alloc flags. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 5b7b0aacfc0..83705b2b288 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -1957,7 +1957,7 @@ static void test_LocalAlloc(void) } } -static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ) +static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags, DWORD alloc_flags ) { DWORD padd_flags = HEAP_VALIDATE | HEAP_VALIDATE_ALL | HEAP_VALIDATE_PARAMS; SIZE_T expect_size, diff, alloc_size, extra_size, tail_size = 0; @@ -1975,7 +1975,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags return; } - if (!global_flags) extra_size = 8; + if (!global_flags && !alloc_flags) extra_size = 8; else extra_size = 2 * sizeof(void *); if (heap_flags & HEAP_TAIL_CHECKING_ENABLED) extra_size += 2 * sizeof(void *); if (heap_flags & padd_flags) extra_size += 2 * sizeof(void *); @@ -1988,11 +1988,11 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags { winetest_push_context( "size %#Ix", alloc_size ); - ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ptr0 = pHeapAlloc( heap, alloc_flags|HEAP_ZERO_MEMORY, alloc_size ); ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); - ptr1 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ptr1 = pHeapAlloc( heap, alloc_flags|HEAP_ZERO_MEMORY, alloc_size ); ok( !!ptr1, "HeapAlloc failed, error %lu\n", GetLastError() ); - ptr2 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ptr2 = pHeapAlloc( heap, alloc_flags|HEAP_ZERO_MEMORY, alloc_size ); ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); align = (UINT_PTR)ptr0 | (UINT_PTR)ptr1 | (UINT_PTR)ptr2; @@ -2034,7 +2034,7 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags alloc_size = 0x20000 * sizeof(void *) - 0x2000; winetest_push_context( "size %#Ix", alloc_size ); - ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ptr0 = pHeapAlloc( heap, alloc_flags|HEAP_ZERO_MEMORY, alloc_size ); ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); ok( !((UINT_PTR)ptr0 & (2 * sizeof(void *) - 1)), "got unexpected ptr align\n" ); @@ -2050,11 +2050,11 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags { winetest_push_context( "size %#Ix", alloc_size ); - ptr0 = pHeapAlloc( heap, HEAP_ZERO_MEMORY, alloc_size ); + ptr0 = pHeapAlloc( heap, alloc_flags|HEAP_ZERO_MEMORY, alloc_size ); ok( !!ptr0, "HeapAlloc failed, error %lu\n", GetLastError() ); - ptr1 = pHeapAlloc( heap, 0, alloc_size ); + ptr1 = pHeapAlloc( heap, alloc_flags, alloc_size ); ok( !!ptr1, "HeapAlloc failed, error %lu\n", GetLastError() ); - ptr2 = pHeapAlloc( heap, 0, alloc_size ); + ptr2 = pHeapAlloc( heap, alloc_flags, alloc_size ); ok( !!ptr2, "HeapAlloc failed, error %lu\n", GetLastError() ); align = (UINT_PTR)ptr0 | (UINT_PTR)ptr1 | (UINT_PTR)ptr2; @@ -2504,7 +2504,7 @@ static void test_child_heap( const char *arg ) heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); ok( heap != GetProcessHeap(), "got unexpected heap\n" ); test_heap_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); - test_block_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); + test_block_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE, 0 ); ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); @@ -2514,6 +2514,13 @@ static void test_child_heap( const char *arg ) ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 ); + ok( heap != GetProcessHeap(), "got unexpected heap\n" ); + test_block_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE, + HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED ); + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + heap = HeapCreate( 0, 0x1000, 0x10000 ); ok( heap != GetProcessHeap(), "got unexpected heap\n" ); test_heap_layout( heap, global_flags, heap_flags|HEAP_PRIVATE );

1 0

Rémi Bernon : ntdll: Ignore HEAP_(TAIL|FREE)_CHECKING_ENABLED flags in RtlCreateHeap.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 00c64fcb014c850ad6a22ec949564a12d4cdeef0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=00c64fcb014c850ad6a22ec9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 22:40:27 2022 +0200 ntdll: Ignore HEAP_(TAIL|FREE)_CHECKING_ENABLED flags in RtlCreateHeap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 -- dlls/ntdll/heap.c | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index f437a13a63e..5b7b0aacfc0 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2435,9 +2435,7 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags if (global_flag & FLG_HEAP_ENABLE_TAGGING) heap_flags |= HEAP_SHARED; if (!(global_flag & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); - todo_wine_if( (heap->force_flags & ~heap_flags) & (HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED) ) ok( heap->force_flags == force_flags, "got force_flags %#x\n", heap->force_flags ); - todo_wine_if( (heap->flags & ~heap_flags) & (HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED) ) ok( heap->flags == heap_flags, "got flags %#x\n", heap->flags ); if (heap->flags & HEAP_PAGE_ALLOCS) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1aa064723a8..d7ac44a4247 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1570,6 +1570,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, PVOID addr, SIZE_T totalSize, SIZE_T c /* Allocate the heap block */ + flags &= ~(HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED); if (processHeap) flags |= HEAP_PRIVATE; if (!processHeap || !totalSize || (flags & HEAP_SHARED)) flags |= HEAP_GROWABLE; if (!totalSize) totalSize = HEAP_DEF_SIZE;

1 0

Rémi Bernon : kernel32/tests: Check that HeapCreate should ignore checking flags.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: a21c93cde6015792c888e6a8a69c98c7183fc9c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a21c93cde6015792c888e6a8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 5 10:32:43 2022 +0200 kernel32/tests: Check that HeapCreate should ignore checking flags. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 4f808c8c7e6..f437a13a63e 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -2435,7 +2435,9 @@ static void test_heap_layout( HANDLE handle, DWORD global_flag, DWORD heap_flags if (global_flag & FLG_HEAP_ENABLE_TAGGING) heap_flags |= HEAP_SHARED; if (!(global_flag & FLG_HEAP_PAGE_ALLOCS)) force_flags &= ~(HEAP_GROWABLE|HEAP_PRIVATE); + todo_wine_if( (heap->force_flags & ~heap_flags) & (HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED) ) ok( heap->force_flags == force_flags, "got force_flags %#x\n", heap->force_flags ); + todo_wine_if( (heap->flags & ~heap_flags) & (HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED) ) ok( heap->flags == heap_flags, "got flags %#x\n", heap->flags ); if (heap->flags & HEAP_PAGE_ALLOCS) @@ -2508,6 +2510,12 @@ static void test_child_heap( const char *arg ) ret = HeapDestroy( heap ); ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + heap = HeapCreate( HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED|HEAP_NO_SERIALIZE, 0, 0 ); + ok( heap != GetProcessHeap(), "got unexpected heap\n" ); + test_heap_layout( heap, global_flags, heap_flags|HEAP_NO_SERIALIZE|HEAP_GROWABLE|HEAP_PRIVATE ); + ret = HeapDestroy( heap ); + ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); + heap = HeapCreate( 0, 0x1000, 0x10000 ); ok( heap != GetProcessHeap(), "got unexpected heap\n" ); test_heap_layout( heap, global_flags, heap_flags|HEAP_PRIVATE );

1 0

Rémi Bernon : ntdll: Respect HEAP_NO_SERIALIZE flag in HeapLock / HeapUnlock.
by Alexandre Julliard 05 May '22

05 May '22

Module: wine Branch: master Commit: 1f490ec1a5e6ec6b104724d859b46bc5f3f209ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f490ec1a5e6ec6b104724d8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 15:13:24 2022 +0200 ntdll: Respect HEAP_NO_SERIALIZE flag in HeapLock / HeapUnlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 2 -- dlls/ntdll/heap.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index d40549e999b..4f808c8c7e6 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -952,11 +952,9 @@ static void test_HeapCreate(void) thread_params.flags = 0; SetEvent( thread_params.start_event ); res = WaitForSingleObject( thread_params.ready_event, 100 ); - todo_wine ok( !res, "WaitForSingleObject returned %#lx, error %lu\n", res, GetLastError() ); ret = HeapUnlock( heap ); ok( ret, "HeapUnlock failed, error %lu\n", GetLastError() ); - if (res) WaitForSingleObject( thread_params.ready_event, 100 ); ret = HeapLock( heap ); ok( ret, "HeapLock failed, error %lu\n", GetLastError() ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 89f59440edf..1aa064723a8 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1992,7 +1992,7 @@ BOOLEAN WINAPI RtlLockHeap( HANDLE heap ) { HEAP *heapPtr = HEAP_GetPtr( heap ); if (!heapPtr) return FALSE; - RtlEnterCriticalSection( &heapPtr->cs ); + heap_lock( heapPtr, 0 ); return TRUE; } @@ -2013,7 +2013,7 @@ BOOLEAN WINAPI RtlUnlockHeap( HANDLE heap ) { HEAP *heapPtr = HEAP_GetPtr( heap ); if (!heapPtr) return FALSE; - RtlLeaveCriticalSection( &heapPtr->cs ); + heap_unlock( heapPtr, 0 ); return TRUE; }

1 0

← Newer
1
...
67
68
69
70
71
72
73
...
91
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2022