May 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Move desktop window proc implementation from user32.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 336f033273b6b70e49e8736d1059704947003272 URL: https://source.winehq.org/git/wine.git/?a=commit;h=336f033273b6b70e49e8736d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 14:23:17 2022 +0200 win32u: Move desktop window proc implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/desktop.c | 27 +++++---------------------- dlls/win32u/defwnd.c | 37 +++++++++++++++++++++++++++++++++++++ dlls/win32u/message.c | 2 ++ dlls/win32u/win32u_private.h | 1 + include/ntuser.h | 1 + 5 files changed, 46 insertions(+), 22 deletions(-) diff --git a/dlls/user32/desktop.c b/dlls/user32/desktop.c index 9d1484fdcbb..f2905b0efac 100644 --- a/dlls/user32/desktop.c +++ b/dlls/user32/desktop.c @@ -95,30 +95,13 @@ LRESULT WINAPI DesktopWndProc( HWND hwnd, UINT message, WPARAM wParam, LPARAM lP switch (message) { case WM_NCCREATE: - { - CREATESTRUCTW *cs = (CREATESTRUCTW *)lParam; - const GUID *guid = cs->lpCreateParams; - - if (guid) - { - ATOM atom; - WCHAR buffer[37]; - - if (NtUserGetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ - - swprintf( buffer, ARRAY_SIZE(buffer), L"%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", - guid->Data1, guid->Data2, guid->Data3, - guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], - guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); - atom = GlobalAddAtomW( buffer ); - SetPropW( hwnd, L"__wine_display_device_guid", ULongToHandle( atom ) ); - } - return TRUE; - } case WM_NCCALCSIZE: - return 0; + return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserDesktopWindowProc, FALSE ); + default: - return DefWindowProcW( hwnd, message, wParam, lParam ); + if (message < WM_USER) + return DefWindowProcW( hwnd, message, wParam, lParam ); + return NtUserMessageCall( hwnd, message, wParam, lParam, 0, NtUserDesktopWindowProc, FALSE ); } } diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 27120a96d98..444abd1657f 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -384,3 +384,40 @@ LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, return result; } + +LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + static const WCHAR wine_display_device_guidW[] = + {'_','_','w','i','n','e','_','d','i','s','p','l','a','y','_','d','e','v','i','c','e', + '_','g','u','i','d',0}; + + switch (msg) + { + case WM_NCCREATE: + { + CREATESTRUCTW *cs = (CREATESTRUCTW *)lparam; + const GUID *guid = cs->lpCreateParams; + + if (guid) + { + ATOM atom = 0; + char buffer[37]; + WCHAR bufferW[37]; + + if (NtUserGetAncestor( hwnd, GA_PARENT )) return FALSE; /* refuse to create non-desktop window */ + + sprintf( buffer, "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x", + (unsigned int)guid->Data1, guid->Data2, guid->Data3, + guid->Data4[0], guid->Data4[1], guid->Data4[2], guid->Data4[3], + guid->Data4[4], guid->Data4[5], guid->Data4[6], guid->Data4[7] ); + NtAddAtom( bufferW, asciiz_to_unicode( bufferW, buffer ) - sizeof(WCHAR), &atom ); + NtUserSetProp( hwnd, wine_display_device_guidW, ULongToHandle( atom ) ); + } + return TRUE; + } + case WM_NCCALCSIZE: + return 0; + } + + return default_window_proc( hwnd, msg, wparam, lparam, FALSE ); +} diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index e67f9adcbe7..6bb9aa455f5 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2890,6 +2890,8 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa { switch (type) { + case NtUserDesktopWindowProc: + return desktop_window_proc( hwnd, msg, wparam, lparam ); case NtUserDefWindowProc: return default_window_proc( hwnd, msg, wparam, lparam, ansi ); case NtUserCallWindowProc: diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index c7340018830..2d69cbef78e 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -360,6 +360,7 @@ extern void register_window_surface( struct window_surface *old, /* defwnd.c */ extern LRESULT default_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL ansi ) DECLSPEC_HIDDEN; +extern LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN; extern void fill_rect( HDC dc, const RECT *rect, HBRUSH hbrush ) DECLSPEC_HIDDEN; /* hook.c */ diff --git a/include/ntuser.h b/include/ntuser.h index c7490eaad0a..29de027a334 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -181,6 +181,7 @@ struct render_synthesized_format_params /* NtUserMessageCall codes */ enum { + NtUserDesktopWindowProc = 0x029d, NtUserDefWindowProc = 0x029e, NtUserCallWindowProc = 0x02ab, NtUserSendMessage = 0x02b1,

1 0

Jacek Caban : win32u: Introduce DesktopWindowProc driver entry point.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: dfeb2d2474292b65795f431e2864b7364abcfdfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfeb2d2474292b65795f431e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 14:27:36 2022 +0200 win32u: Introduce DesktopWindowProc driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/defwnd.c | 4 ++++ dlls/win32u/driver.c | 7 +++++++ include/wine/gdi_driver.h | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/dlls/win32u/defwnd.c b/dlls/win32u/defwnd.c index 444abd1657f..9b4edc90eaa 100644 --- a/dlls/win32u/defwnd.c +++ b/dlls/win32u/defwnd.c @@ -417,6 +417,10 @@ LRESULT desktop_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) } case WM_NCCALCSIZE: return 0; + + default: + if (msg >= WM_USER && hwnd == get_desktop_window()) + return user_driver->pDesktopWindowProc( hwnd, msg, wparam, lparam ); } return default_window_proc( hwnd, msg, wparam, lparam, FALSE ); diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index 9185069208a..4dac0760464 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -721,6 +721,11 @@ static SHORT nulldrv_VkKeyScanEx( WCHAR ch, HKL layout ) return -256; /* use default implementation */ } +static LRESULT nulldrv_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) +{ + return default_window_proc( hwnd, msg, wparam, lparam, FALSE ); +} + static void nulldrv_DestroyCursorIcon( HCURSOR cursor ) { } @@ -1175,6 +1180,7 @@ static const struct user_driver_funcs lazy_load_driver = /* windowing functions */ loaderdrv_CreateDesktopWindow, loaderdrv_CreateWindow, + nulldrv_DesktopWindowProc, nulldrv_DestroyWindow, loaderdrv_FlashWindowEx, loaderdrv_GetDC, @@ -1247,6 +1253,7 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v SET_USER_FUNC(UpdateDisplayDevices); SET_USER_FUNC(CreateDesktopWindow); SET_USER_FUNC(CreateWindow); + SET_USER_FUNC(DesktopWindowProc); SET_USER_FUNC(DestroyWindow); SET_USER_FUNC(FlashWindowEx); SET_USER_FUNC(GetDC); diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h index 82bac557c2a..21fff4d4aa2 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h @@ -168,7 +168,7 @@ struct gdi_dc_funcs }; /* increment this when you change the DC function table */ -#define WINE_GDI_DRIVER_VERSION 78 +#define WINE_GDI_DRIVER_VERSION 79 #define GDI_PRIORITY_NULL_DRV 0 /* null driver */ #define GDI_PRIORITY_FONT_DRV 100 /* any font driver */ @@ -299,6 +299,7 @@ struct user_driver_funcs /* windowing functions */ BOOL (*pCreateDesktopWindow)(HWND); BOOL (*pCreateWindow)(HWND); + LRESULT (*pDesktopWindowProc)(HWND,UINT,WPARAM,LPARAM); void (*pDestroyWindow)(HWND); void (*pFlashWindowEx)(FLASHWINFO*); void (*pGetDC)(HDC,HWND,HWND,const RECT *,const RECT *,DWORD);

1 0

Jacek Caban : winex11: Implement DesktopWindowProc driver entry point.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 6a4ff4de66e2cd344396d71f0b063adab990e228 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a4ff4de66e2cd344396d71f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 19 14:48:23 2022 +0200 winex11: Implement DesktopWindowProc driver entry point. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/init.c | 1 + dlls/winex11.drv/window.c | 12 +++++------- dlls/winex11.drv/x11drv.h | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index fc190805401..3bdc05999f1 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -408,6 +408,7 @@ static const struct user_driver_funcs x11drv_funcs = .pUpdateDisplayDevices = X11DRV_UpdateDisplayDevices, .pCreateDesktopWindow = X11DRV_CreateDesktopWindow, .pCreateWindow = X11DRV_CreateWindow, + .pDesktopWindowProc = X11DRV_DesktopWindowProc, .pDestroyWindow = X11DRV_DestroyWindow, .pFlashWindowEx = X11DRV_FlashWindowEx, .pGetDC = X11DRV_GetDC, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 50a848cae86..773fa81f5f3 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1860,13 +1860,14 @@ BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) } -static WNDPROC desktop_orig_wndproc; - #define WM_WINE_NOTIFY_ACTIVITY WM_USER #define WM_WINE_DELETE_TAB (WM_USER + 1) #define WM_WINE_ADD_TAB (WM_USER + 2) -static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) +/********************************************************************** + * DesktopWindowProc (X11DRV.@) + */ +LRESULT X11DRV_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) { switch (msg) { @@ -1891,7 +1892,7 @@ static LRESULT CALLBACK desktop_wndproc_wrapper( HWND hwnd, UINT msg, WPARAM wp, send_notify_message( (HWND)wp, WM_X11DRV_ADD_TAB, 0, 0 ); break; } - return desktop_orig_wndproc( hwnd, msg, wp, lp ); + return NtUserMessageCall( hwnd, msg, wp, lp, 0, NtUserDefWindowProc, FALSE ); } /********************************************************************** @@ -1904,9 +1905,6 @@ BOOL X11DRV_CreateWindow( HWND hwnd ) struct x11drv_thread_data *data = x11drv_init_thread_data(); XSetWindowAttributes attr; - desktop_orig_wndproc = (WNDPROC)NtUserSetWindowLongPtr( hwnd, GWLP_WNDPROC, - (LONG_PTR)desktop_wndproc_wrapper, FALSE ); - /* create the cursor clipping window */ attr.override_redirect = TRUE; attr.event_mask = StructureNotifyMask | FocusChangeMask; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9a775215321..613dc0e05fe 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -218,6 +218,7 @@ extern void X11DRV_UpdateDisplayDevices( const struct gdi_device_manager *device BOOL force, void *param ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateDesktopWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern BOOL X11DRV_CreateWindow( HWND hwnd ) DECLSPEC_HIDDEN; +extern LRESULT X11DRV_DesktopWindowProc( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp ) DECLSPEC_HIDDEN; extern void X11DRV_DestroyWindow( HWND hwnd ) DECLSPEC_HIDDEN; extern void X11DRV_FlashWindowEx( PFLASHWINFO pfinfo ) DECLSPEC_HIDDEN; extern void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,

1 0

Chip Davis : ntdll: Implement idle time query for Mac OS.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: f3d9f00850926b01b0f28e40d3fa0b48028eed4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3d9f00850926b01b0f28e40… Author: Chip Davis <cdavis5x(a)gmail.com> Date: Sun May 8 16:41:49 2022 -0500 ntdll: Implement idle time query for Mac OS. Signed-off-by: Chip Davis <cdavis5x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/system.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 4d5fc282e45..ee91441794e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -1848,6 +1848,22 @@ static void get_performance_info( SYSTEM_PERFORMANCE_INFORMATION *info ) info->IdleTime.QuadPart = (ULONGLONG)ptimes[CP_IDLE] * 10000000 / clockrate.stathz; } } +#elif defined(__APPLE__) + { + host_name_port_t host = mach_host_self(); + struct host_cpu_load_info load_info; + mach_msg_type_number_t count; + + count = HOST_CPU_LOAD_INFO_COUNT; + if (host_statistics(host, HOST_CPU_LOAD_INFO, (host_info_t)&load_info, &count) == KERN_SUCCESS) + { + /* Believe it or not, based on my reading of XNU source, this is + * already in the units we want (100 ns). + */ + info->IdleTime.QuadPart = load_info.cpu_ticks[CPU_STATE_IDLE]; + } + mach_port_deallocate(mach_task_self(), host); + } #else { static ULONGLONG idle;

1 0

Alistair Leslie-Hughes : dwmapi: Clear DWM_TIMING_INFO structure before returning.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 034b7e306e91ef6429168b70fab39e2646a97a4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=034b7e306e91ef6429168b70… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 19 16:53:24 2022 +1000 dwmapi: Clear DWM_TIMING_INFO structure before returning. Clearing the structure passed in, allows Chromium to calculated failback values when refreshing windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53016 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 9defcb14373..6bb086a87d1 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -226,6 +226,9 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) if(!i++) FIXME("(%p %p)\n", hwnd, info); + memset(info, 0, info->cbSize); + info->cbSize = sizeof(DWM_TIMING_INFO); + return S_OK; }

1 0

Rémi Bernon : ntdll: Ignore back pointer when validating free block pattern.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 2815c117bcfefe4889b35701734435d578772af2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2815c117bcfefe4889b35701… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 19 09:13:20 2022 +0200 ntdll: Ignore back pointer when validating free block pattern. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 44c9ad53196..e4a307bd23a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1182,6 +1182,7 @@ static BOOL validate_free_block( const SUBHEAP *subheap, const struct block *blo if (!err && (flags & HEAP_FREE_CHECKING_ENABLED)) { const char *ptr = (char *)(entry + 1), *end = (char *)block + block_get_size( block ); + if (next) end -= sizeof(struct block *); if (end > commit_end) end = commit_end; while (!err && ptr < end) {

1 0

Rémi Bernon : ntdll: Use block helpers in subheap_notify_free_all.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: 9325bfada79b96fb1bd9de23499b33d5e681079d URL: https://source.winehq.org/git/wine.git/?a=commit;h=9325bfada79b96fb1bd9de23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 20:33:32 2022 +0200 ntdll: Use block helpers in subheap_notify_free_all. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index e4a307bd23a..d0f547faee7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -383,29 +383,18 @@ static inline void notify_realloc( void const *ptr, SIZE_T size_old, SIZE_T size #endif } -static void subheap_notify_free_all(SUBHEAP const *subheap) +static void notify_free_all( SUBHEAP *subheap ) { #ifdef VALGRIND_FREELIKE_BLOCK - char const *ptr = (char const *)subheap->base + subheap->headerSize; + struct block *block; if (!RUNNING_ON_VALGRIND) return; if (!check_subheap( subheap )) return; - while (ptr < (char const *)subheap->base + subheap->size) + for (block = first_block( subheap ); block; block = next_block( subheap, block )) { - if (*(const DWORD *)ptr & ARENA_FLAG_FREE) - { - ARENA_FREE const *pArena = (ARENA_FREE const *)ptr; - if (pArena->magic!=ARENA_FREE_MAGIC) ERR("bad free_magic @%p\n", pArena); - ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); - } - else - { - ARENA_INUSE const *pArena = (ARENA_INUSE const *)ptr; - if (pArena->magic == ARENA_INUSE_MAGIC) notify_free(pArena + 1); - else if (pArena->magic != ARENA_PENDING_MAGIC) ERR("bad inuse_magic @%p\n", pArena); - ptr += sizeof(*pArena) + (pArena->size & ARENA_SIZE_MASK); - } + if (block_get_flags( block ) & ARENA_FLAG_FREE) continue; + if (block_get_type( block ) == ARENA_INUSE_MAGIC) notify_free( block + 1 ); } #endif } @@ -1531,13 +1520,13 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) LIST_FOR_EACH_ENTRY_SAFE( subheap, next, &heapPtr->subheap_list, SUBHEAP, entry ) { if (subheap == &heapPtr->subheap) continue; /* do this one last */ - subheap_notify_free_all(subheap); + notify_free_all( subheap ); list_remove( &subheap->entry ); size = 0; addr = subheap->base; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - subheap_notify_free_all(&heapPtr->subheap); + notify_free_all( &heapPtr->subheap ); RtlFreeHeap( GetProcessHeap(), 0, heapPtr->pending_free ); size = 0; addr = heapPtr->subheap.base;

1 0

Rémi Bernon : ntdll: Rename local variables in heap_reallocate.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: a3acd635817f62532dae62bc55dcfd9355c8e16e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3acd635817f62532dae62bc… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 17:30:17 2022 +0200 ntdll: Rename local variables in heap_reallocate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 52 ++++++++++++++++++++++++---------------------------- 1 file changed, 24 insertions(+), 28 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index d0f547faee7..ac994167f22 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1646,17 +1646,16 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *pt static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size, void **ret ) { - struct block *next; - ARENA_INUSE *pArena; + SIZE_T old_data_size, old_size, data_size; + struct block *next, *block; SUBHEAP *subheap; - SIZE_T oldBlockSize, oldActualSize, rounded_size; NTSTATUS status; - rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); - if (rounded_size < size) return STATUS_NO_MEMORY; /* overflow */ - if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; + data_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); + if (data_size < size) return STATUS_NO_MEMORY; /* overflow */ + if (data_size < HEAP_MIN_DATA_SIZE) data_size = HEAP_MIN_DATA_SIZE; - if (!(pArena = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; + if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (!subheap) { if (!(*ret = realloc_large_block( heap, flags, ptr, size ))) return STATUS_NO_MEMORY; @@ -1665,49 +1664,46 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size /* Check if we need to grow the block */ - oldBlockSize = (pArena->size & ARENA_SIZE_MASK); - oldActualSize = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; - if (rounded_size > oldBlockSize) + old_data_size = (block->size & ARENA_SIZE_MASK); + old_size = (block->size & ARENA_SIZE_MASK) - block->unused_bytes; + if (data_size > old_data_size) { - if ((next = next_block( subheap, pArena )) && (block_get_flags( next ) & ARENA_FLAG_FREE) && - rounded_size < HEAP_MIN_LARGE_BLOCK_SIZE && rounded_size <= oldBlockSize + block_get_size( next )) + if ((next = next_block( subheap, block )) && (block_get_flags( next ) & ARENA_FLAG_FREE) && + data_size < HEAP_MIN_LARGE_BLOCK_SIZE && data_size <= old_data_size + block_get_size( next )) { /* The next block is free and large enough */ struct entry *entry = (struct entry *)next; list_remove( &entry->entry ); - pArena->size += block_get_size( next ); - if (!HEAP_Commit( subheap, pArena, rounded_size )) return STATUS_NO_MEMORY; - notify_realloc( pArena + 1, oldActualSize, size ); - shrink_used_block( subheap, pArena, rounded_size, size ); + block->size += block_get_size( next ); + if (!HEAP_Commit( subheap, block, data_size )) return STATUS_NO_MEMORY; + notify_realloc( block + 1, old_size, size ); + shrink_used_block( subheap, block, data_size, size ); } else { if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, size, ret ))) return status; - memcpy( *ret, pArena + 1, oldActualSize ); - if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + oldActualSize, 0, size - oldActualSize ); - notify_free( pArena + 1 ); - HEAP_MakeInUseBlockFree( subheap, pArena ); + memcpy( *ret, block + 1, old_size ); + if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); + notify_free( ptr ); + HEAP_MakeInUseBlockFree( subheap, block ); return STATUS_SUCCESS; } } else { - notify_realloc( pArena + 1, oldActualSize, size ); - shrink_used_block( subheap, pArena, rounded_size, size ); + notify_realloc( block + 1, old_size, size ); + shrink_used_block( subheap, block, data_size, size ); } /* Clear the extra bytes if needed */ - if (size > oldActualSize) - initialize_block( (char *)(pArena + 1) + oldActualSize, size - oldActualSize, - pArena->unused_bytes, flags ); - else - mark_block_tail( (char *)(pArena + 1) + size, pArena->unused_bytes, flags ); + if (size <= old_size) mark_block_tail( (char *)(block + 1) + size, block->unused_bytes, flags ); + else initialize_block( (char *)(block + 1) + old_size, size - old_size, block->unused_bytes, flags ); /* Return the new arena */ - *ret = pArena + 1; + *ret = block + 1; return STATUS_SUCCESS; }

1 0

Rémi Bernon : ntdll: Rename local variables in heap_allocate.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: b20f466628af2fa9aaab46d920a75a9604bb8561 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b20f466628af2fa9aaab46d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 17:44:16 2022 +0200 ntdll: Rename local variables in heap_allocate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ac994167f22..9036d71fa05 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1536,17 +1536,16 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret ) { - ARENA_FREE *pArena; - ARENA_INUSE *pInUse; + struct block *block; + struct entry *entry; + SIZE_T data_size; SUBHEAP *subheap; - SIZE_T rounded_size; - - rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE( flags ); - if (rounded_size < size) return STATUS_NO_MEMORY; /* overflow */ - if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; + data_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); + if (data_size < size) return STATUS_NO_MEMORY; /* overflow */ + if (data_size < HEAP_MIN_DATA_SIZE) data_size = HEAP_MIN_DATA_SIZE; - if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE) + if (data_size >= HEAP_MIN_LARGE_BLOCK_SIZE) { if (!(*ret = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY; return STATUS_SUCCESS; @@ -1554,29 +1553,29 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* Locate a suitable free block */ - if (!(pArena = HEAP_FindFreeBlock( heap, rounded_size, &subheap ))) return STATUS_NO_MEMORY; + if (!(entry = HEAP_FindFreeBlock( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; /* Remove the arena from the free list */ - list_remove( &pArena->entry ); + list_remove( &entry->entry ); /* Build the in-use arena */ - pInUse = (ARENA_INUSE *)pArena; + block = (struct block *)entry; /* in-use arena is smaller than free arena, * so we have to add the difference to the size */ - pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - pInUse->magic = ARENA_INUSE_MAGIC; + block->size = (block->size & ~ARENA_FLAG_FREE) + sizeof(*entry) - sizeof(*block); + block->magic = ARENA_INUSE_MAGIC; /* Shrink the block */ - shrink_used_block( subheap, pInUse, rounded_size, size ); + shrink_used_block( subheap, block, data_size, size ); - notify_alloc( pInUse + 1, size, flags & HEAP_ZERO_MEMORY ); - initialize_block( pInUse + 1, size, pInUse->unused_bytes, flags ); + notify_alloc( block + 1, size, flags & HEAP_ZERO_MEMORY ); + initialize_block( block + 1, size, block->unused_bytes, flags ); - *ret = pInUse + 1; + *ret = block + 1; return STATUS_SUCCESS; }

1 0

Rémi Bernon : ntdll: Rename HEAP_FindFreeBlock size parameter.
by Alexandre Julliard 19 May '22

19 May '22

Module: wine Branch: master Commit: eb931b84211aa034a8ee2f48578ab08c3ec8351e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb931b84211aa034a8ee2f48… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 19:52:22 2022 +0200 ntdll: Rename HEAP_FindFreeBlock size parameter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 9036d71fa05..e3bfc3d37e7 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1065,13 +1065,12 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, * Find a free block at least as large as the requested size, and make sure * the requested size is committed. */ -static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, - SUBHEAP **ppSubHeap ) +static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **ppSubHeap ) { SUBHEAP *subheap; struct list *ptr; SIZE_T total_size; - FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( size + sizeof(ARENA_INUSE) ); + FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( data_size + sizeof(ARENA_INUSE) ); /* Find a suitable free list, and in it find a block large enough */ @@ -1081,10 +1080,10 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, ARENA_FREE *pArena = LIST_ENTRY( ptr, ARENA_FREE, entry ); SIZE_T arena_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - if (arena_size >= size) + if (arena_size >= data_size) { subheap = find_subheap( heap, (struct block *)pArena, FALSE ); - if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, size )) return NULL; + if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, data_size )) return NULL; *ppSubHeap = subheap; return pArena; } @@ -1094,7 +1093,7 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, if (!(heap->flags & HEAP_GROWABLE)) { - WARN("Not enough space in heap %p for %08lx bytes\n", heap, size ); + WARN("Not enough space in heap %p for %08lx bytes\n", heap, data_size ); return NULL; } /* make sure that we have a big enough size *committed* to fit another @@ -1102,8 +1101,8 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T size, * So just one heap struct, one first free arena which will eventually * get used, and a second free arena that might get assigned all remaining * free space in shrink_used_block() */ - total_size = size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); - if (total_size < size) return NULL; /* overflow */ + total_size = data_size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); + if (total_size < data_size) return NULL; /* overflow */ if ((subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, max( heap->grow_size, total_size ) )))

1 0