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

Rémi Bernon : ntdll: Ignore free list headers in HEAP_FindFreeBlock.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: a436cc6485a29beb7728528d005a6a30cd3934f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a436cc6485a29beb7728528d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 18:19:36 2022 +0200 ntdll: Ignore free list headers in HEAP_FindFreeBlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 96bb0d0c027..658a8bc1ab0 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1069,6 +1069,7 @@ static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **su while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) { entry = LIST_ENTRY( ptr, struct entry, entry ); + if (entry->size == (0 | ARENA_FLAG_FREE)) continue; arena_size = (entry->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); if (arena_size >= data_size) {

1 0

Zhiyi Zhang : dxgi: Implement adapter video memory budget change notification.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: fd6e137dfe16700e0a0a7ebb23b413019bc18193 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd6e137dfe16700e0a0a7ebb… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon May 23 11:21:16 2022 +0800 dxgi: Implement adapter video memory budget change notification. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51665 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 13 ++++- dlls/dxgi/tests/dxgi.c | 4 -- dlls/wined3d/directx.c | 139 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 + include/wine/wined3d.h | 3 + 5 files changed, 154 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/adapter.c b/dlls/dxgi/adapter.c index 20c017eba08..b178376341b 100644 --- a/dlls/dxgi/adapter.c +++ b/dlls/dxgi/adapter.c @@ -333,15 +333,22 @@ static HRESULT STDMETHODCALLTYPE dxgi_adapter_SetVideoMemoryReservation(IWineDXG static HRESULT STDMETHODCALLTYPE dxgi_adapter_RegisterVideoMemoryBudgetChangeNotificationEvent( IWineDXGIAdapter *iface, HANDLE event, DWORD *cookie) { - FIXME("iface %p, event %p, cookie %p stub!\n", iface, event, cookie); + struct dxgi_adapter *adapter = impl_from_IWineDXGIAdapter(iface); - return E_NOTIMPL; + TRACE("iface %p, event %p, cookie %p.\n", iface, event, cookie); + + if (!event || !cookie) + return DXGI_ERROR_INVALID_CALL; + + return wined3d_adapter_register_budget_change_notification(adapter->wined3d_adapter, event, cookie); } static void STDMETHODCALLTYPE dxgi_adapter_UnregisterVideoMemoryBudgetChangeNotification( IWineDXGIAdapter *iface, DWORD cookie) { - FIXME("iface %p, cookie %#lx stub!\n", iface, cookie); + TRACE("iface %p, cookie %#lx.\n", iface, cookie); + + wined3d_adapter_unregister_budget_change_notification(cookie); } static HRESULT STDMETHODCALLTYPE dxgi_adapter_GetDesc3(IWineDXGIAdapter *iface, DXGI_ADAPTER_DESC3 *desc) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 04bba29e8e5..33e9ead31ad 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7539,16 +7539,13 @@ static void test_video_memory_budget_notification(void) goto done; hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, NULL, &cookie); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); event = CreateEventW(NULL, FALSE, FALSE, NULL); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, NULL); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_RegisterVideoMemoryBudgetChangeNotificationEvent(adapter3, event, &cookie); - todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_LOCAL, &memory_info); ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); @@ -7560,7 +7557,6 @@ static void test_video_memory_budget_notification(void) if (memory_info.Budget) { ret = WaitForSingleObject(event, 1000); - todo_wine ok(ret == WAIT_OBJECT_0, "Expected event fired.\n"); } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8c58a346add..fb588b88098 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -23,6 +23,7 @@ #include "wined3d_private.h" #include "winternl.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); @@ -38,6 +39,19 @@ enum wined3d_driver_model DRIVER_MODEL_NT6X }; +struct wined3d_adapter_budget_change_notification +{ + const struct wined3d_adapter *adapter; + HANDLE event; + DWORD cookie; + UINT64 last_local_budget; + UINT64 last_non_local_budget; + struct list entry; +}; + +static struct list adapter_budget_change_notifications = LIST_INIT( adapter_budget_change_notifications ); +static HANDLE notification_thread, notification_thread_stop_event; + /* The d3d device ID */ static const GUID IID_D3DDEVICE_D3DUID = { 0xaeb2cdd4, 0x6e41, 0x43ea, { 0x94,0x1c,0x83,0x61,0xcc,0x76,0x07,0x81 } }; @@ -1046,6 +1060,131 @@ HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter return WINED3D_OK; } +static DWORD CALLBACK notification_thread_func(void *stop_event) +{ + struct wined3d_adapter_budget_change_notification *notification; + struct wined3d_video_memory_info info; + HRESULT hr; + + while (TRUE) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_local_budget) + { + notification->last_local_budget = info.budget; + SetEvent(notification->event); + continue; + } + + hr = wined3d_adapter_get_video_memory_info(notification->adapter, 0, + WINED3D_MEMORY_SEGMENT_GROUP_NON_LOCAL, &info); + if (SUCCEEDED(hr) && info.budget != notification->last_non_local_budget) + { + notification->last_non_local_budget = info.budget; + SetEvent(notification->event); + } + } + wined3d_mutex_unlock(); + + if (WaitForSingleObject(stop_event, 1000) == WAIT_OBJECT_0) + break; + } + + return TRUE; +} + +HRESULT CDECL wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie) +{ + static DWORD cookie_counter; + static BOOL wrapped; + struct wined3d_adapter_budget_change_notification *notification, *new_notification; + BOOL found = FALSE; + + new_notification = heap_alloc_zero(sizeof(*new_notification)); + if (!new_notification) + return E_OUTOFMEMORY; + + wined3d_mutex_lock(); + new_notification->adapter = adapter; + new_notification->event = event; + new_notification->cookie = cookie_counter++; + if (cookie_counter < new_notification->cookie) + wrapped = TRUE; + if (wrapped) + { + while (TRUE) + { + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == new_notification->cookie) + { + found = TRUE; + break; + } + } + + if (!found) + break; + + new_notification->cookie = cookie_counter++; + } + } + + *cookie = new_notification->cookie; + list_add_head(&adapter_budget_change_notifications, &new_notification->entry); + + if (!notification_thread) + { + notification_thread_stop_event = CreateEventW(0, FALSE, FALSE, NULL); + notification_thread = CreateThread(NULL, 0, notification_thread_func, + notification_thread_stop_event, 0, NULL); + } + wined3d_mutex_unlock(); + return WINED3D_OK; +} + +HRESULT CDECL wined3d_adapter_unregister_budget_change_notification(DWORD cookie) +{ + struct wined3d_adapter_budget_change_notification *notification; + HANDLE thread, thread_stop_event; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(notification, &adapter_budget_change_notifications, + struct wined3d_adapter_budget_change_notification, entry) + { + if (notification->cookie == cookie) + { + list_remove(&notification->entry); + heap_free(notification); + break; + } + } + + if (!list_empty(&adapter_budget_change_notifications)) + { + wined3d_mutex_unlock(); + return WINED3D_OK; + } + + thread = notification_thread; + thread_stop_event = notification_thread_stop_event; + notification_thread = NULL; + notification_thread_stop_event = NULL; + wined3d_mutex_unlock(); + SetEvent(thread_stop_event); + WaitForSingleObject(thread, INFINITE); + CloseHandle(thread); + CloseHandle(thread_stop_event); + return WINED3D_OK; +} + HRESULT CDECL wined3d_register_software_device(struct wined3d *wined3d, void *init_function) { FIXME("wined3d %p, init_function %p stub!\n", wined3d, init_function); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 845ca0fb170..63220e1222c 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -22,6 +22,8 @@ @ cdecl wined3d_adapter_get_output(ptr long) @ cdecl wined3d_adapter_get_output_count(ptr) @ cdecl wined3d_adapter_get_video_memory_info(ptr long long ptr) +@ cdecl wined3d_adapter_register_budget_change_notification(ptr ptr ptr) +@ cdecl wined3d_adapter_unregister_budget_change_notification(long) @ cdecl wined3d_blend_state_create(ptr ptr ptr ptr ptr) @ cdecl wined3d_blend_state_decref(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2b7a626f751..116aea82348 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2364,6 +2364,9 @@ unsigned int __cdecl wined3d_adapter_get_output_count(const struct wined3d_adapt HRESULT __cdecl wined3d_adapter_get_video_memory_info(const struct wined3d_adapter *adapter, unsigned int node_idx, enum wined3d_memory_segment_group group, struct wined3d_video_memory_info *info); +HRESULT __cdecl wined3d_adapter_register_budget_change_notification(const struct wined3d_adapter *adapter, + HANDLE event, DWORD *cookie); +HRESULT __cdecl wined3d_adapter_unregister_budget_change_notification(DWORD cookie); HRESULT __cdecl wined3d_buffer_create(struct wined3d_device *device, const struct wined3d_buffer_desc *desc, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops,

1 0

Hugh McMaster : conhost: Split first font code path from font update code path.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 7a32bc9e32cf47688b9719418228999c623074e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a32bc9e32cf47688b971941… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed May 18 23:31:17 2022 +1000 conhost: Split first font code path from font update code path. This change prevents calls to update_console_font() setting any defaults. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/conhost/window.c | 120 ++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 63 deletions(-) diff --git a/programs/conhost/window.c b/programs/conhost/window.c index c115e42a282..582badf43b5 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -736,6 +736,8 @@ struct font_chooser { struct console *console; int pass; + unsigned int font_height; + unsigned int font_width; BOOL done; }; @@ -791,93 +793,82 @@ static BOOL validate_font( struct console *console, const LOGFONTW *lf, int pass return TRUE; } -/* helper functions to get a decent font for the renderer */ -static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam) +static int CALLBACK enum_first_font_proc( const LOGFONTW *lf, const TEXTMETRICW *tm, + DWORD font_type, LPARAM lparam ) { struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW mlf; + + if (font_type != TRUETYPE_FONTTYPE) return 1; + + TRACE( "%s\n", debugstr_logfont( lf, font_type )); + + if (!validate_font( fc->console, lf, fc->pass )) + return 1; TRACE( "%s\n", debugstr_textmetric( tm, font_type )); - if (validate_font_metric( fc->console, tm, font_type, fc->pass )) - { - LOGFONTW mlf = *lf; + if (!validate_font_metric( fc->console, tm, font_type, fc->pass )) + return 1; - /* Use the default sizes for the font (this is needed, especially for - * TrueType fonts, so that we get a decent size, not the max size) - */ - mlf.lfWidth = fc->console->active->font.width; - mlf.lfHeight = fc->console->active->font.height; - if (!mlf.lfHeight) - mlf.lfHeight = MulDiv( 16, GetDpiForSystem(), USER_DEFAULT_SCREEN_DPI ); + /* set default font size */ + mlf = *lf; + mlf.lfHeight = fc->font_height; + mlf.lfWidth = fc->font_width; - if (set_console_font( fc->console, &mlf )) - { - struct console_config config; + if (!set_console_font( fc->console, &mlf )) + return 1; - fc->done = 1; + fc->done = TRUE; - /* since we've modified the current config with new font information, - * set this information as the new default. - */ - load_config( fc->console->window->config_key, &config ); - config.cell_width = fc->console->active->font.width; - config.cell_height = fc->console->active->font.height; - config.font_pitch_family = fc->console->active->font.pitch_family; - memcpy( config.face_name, fc->console->active->font.face_name, - fc->console->active->font.face_len * sizeof(WCHAR) ); - config.face_name[fc->console->active->font.face_len] = 0; - - /* Force also its writing back to the registry so that we can get it - * the next time. - */ - save_config( fc->console->window->config_key, &config ); - return 0; - } - } - return 1; + return 0; } -static int WINAPI get_first_font_enum( const LOGFONTW *lf, const TEXTMETRICW *tm, - DWORD font_type, LPARAM lparam ) +static void set_first_font( struct console *console, struct console_config *config ) { - struct font_chooser *fc = (struct font_chooser *)lparam; + LOGFONTW lf; + struct font_chooser fc; - TRACE("%s\n", debugstr_logfont( lf, font_type )); + TRACE("Looking for a suitable console font\n"); - if (validate_font( fc->console, lf, fc->pass )) + memset( &lf, 0, sizeof(lf) ); + lf.lfCharSet = DEFAULT_CHARSET; + lf.lfPitchAndFamily = FIXED_PITCH | FF_MODERN; + + fc.console = console; + fc.font_height = config->cell_height; + fc.font_width = config->cell_width; + fc.done = FALSE; + + for (fc.pass = 0; fc.pass <= 5; fc.pass++) { - EnumFontFamiliesW( fc->console->window->mem_dc, lf->lfFaceName, - get_first_font_sub_enum, lparam ); - return !fc->done; /* we just need the first matching one... */ + EnumFontFamiliesExW( console->window->mem_dc, &lf, enum_first_font_proc, (LPARAM)&fc, 0); + if (fc.done) break; } - return 1; -} + if (fc.pass > 5) + ERR("Unable to find a valid console font\n"); + + /* Save font configuration to the registry */ + config->cell_width = console->active->font.width; + config->cell_height = console->active->font.height; + config->font_pitch_family = console->active->font.pitch_family; + memcpy( config->face_name, console->active->font.face_name, + console->active->font.face_len * sizeof(WCHAR) ); + config->face_name[console->active->font.face_len] = 0; + + save_config( console->window->config_key, config ); +} -/* sets logfont as the new font for the console */ +/* Sets the font specified in the LOGFONT as the new console font */ void update_console_font( struct console *console, const WCHAR *face_name, size_t face_name_size, unsigned int height, unsigned int weight ) { - struct font_chooser fc; LOGFONTW lf; - if (face_name[0] && height && weight) - { - fill_logfont( &lf, face_name, face_name_size, height, weight ); - if (set_console_font( console, &lf )) return; - } + fill_logfont( &lf, face_name, face_name_size, height, weight ); - /* try to find an acceptable font */ - WARN( "Couldn't match the font from registry, trying to find one\n" ); - fc.console = console; - fc.done = FALSE; - for (fc.pass = 0; fc.pass <= 5; fc.pass++) - { - EnumFontFamiliesW( console->window->mem_dc, NULL, get_first_font_enum, (LPARAM)&fc ); - if (fc.done) return; - } - ERR( "Couldn't find a decent font\n" ); + set_console_font( console, &lf ); } /* get a cell from a relative coordinate in window (takes into account the scrolling) */ @@ -2440,6 +2431,9 @@ BOOL init_window( struct console *console ) 0, 0, 0, 0, wndclass.hInstance, console )) return FALSE; + if (!config.face_name[0]) + set_first_font( console, &config ); + apply_config( console, &config ); return TRUE; }

1 0

Rémi Bernon : ntdll: Use block helpers in find_free_block.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 43ac858e2748d72c28021b9378cff3af36ae7d80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43ac858e2748d72c28021b93… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 19:55:36 2022 +0200 ntdll: Use block helpers in find_free_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 658a8bc1ab0..302e6cc75ee 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1061,8 +1061,9 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **subheap ) { struct list *ptr = &find_free_list( heap, data_size + sizeof(ARENA_INUSE), FALSE )->entry; - SIZE_T total_size, arena_size; struct entry *entry; + struct block *block; + SIZE_T total_size; /* Find a suitable free list, and in it find a block large enough */ @@ -1070,13 +1071,13 @@ static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **su { entry = LIST_ENTRY( ptr, struct entry, entry ); if (entry->size == (0 | ARENA_FLAG_FREE)) continue; - arena_size = (entry->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - if (arena_size >= data_size) + block = (struct block *)entry; + if (block_get_size( block ) - sizeof(*block) >= data_size) { - *subheap = find_subheap( heap, (struct block *)entry, FALSE ); - if (!HEAP_Commit( *subheap, (struct block *)entry, data_size )) return NULL; + *subheap = find_subheap( heap, block, FALSE ); + if (!HEAP_Commit( *subheap, block, data_size )) return NULL; list_remove( &entry->entry ); - return (struct block *)entry; + return block; } }

1 0

Brandon Moore : msadpm: Stop decoding instead of crashing for invalid adpcm data.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 63f9a08240a076c1382fc8298a7236a0d7134a78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63f9a08240a076c1382fc829… Author: Brandon Moore <moore.3071(a)osu.edu> Date: Fri Apr 29 16:50:55 2022 -0700 msadpm: Stop decoding instead of crashing for invalid adpcm data. Apply the same patch from 72528be84fdc for adpcm data sent to mono destinations in addition to stereo destinations. Signed-off-by: Brandon Moore <moore.3071(a)osu.edu> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msadp32.acm/msadp32.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/msadp32.acm/msadp32.c b/dlls/msadp32.acm/msadp32.c index 2dc11b9239a..b31f6371a7a 100644 --- a/dlls/msadp32.acm/msadp32.c +++ b/dlls/msadp32.acm/msadp32.c @@ -319,7 +319,14 @@ static void cvtMMms16K(const ACMDRVSTREAMINSTANCE *adsi, { const unsigned char* in_src = src; - assert(*src <= 6); + /* Catch a problem from Lord of the Rings War of the Ring where it + * passes invalid data. */ + if (*src > 6) + { + *ndst -= nblock * nsamp_blk * adsi->pwfxDst->nBlockAlign; + WARN("Invalid ADPCM data, stopping conversion\n"); + break; + } coeff = MSADPCM_CoeffSet[*src++]; idelta = R16(src); src += 2;

1 0

Rémi Bernon : ntdll: Use block helpers in create_free_block.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: f2a6c16956cf974ae864717384dbd1fd2b4ff8f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2a6c16956cf974ae8647173… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 08:54:03 2022 +0200 ntdll: Use block helpers in create_free_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index a22f5ec7f1e..767a010d93e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -691,45 +691,40 @@ static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T block_size ) { + const char *end = (char *)block + block_size, *commit_end = subheap_commit_end( subheap ); struct entry *entry = (struct entry *)block; HEAP *heap = subheap->heap; DWORD flags = heap->flags; - char *end; - BOOL last; + struct block *next; mark_block_uninitialized( block, sizeof(*entry) ); block_set_type( block, ARENA_FREE_MAGIC ); + block_set_size( block, ARENA_FLAG_FREE, block_size ); /* If debugging, erase the freed block content */ - end = (char *)block + block_size; - if (end > (char *)subheap->base + subheap->commitSize) - end = (char *)subheap->base + subheap->commitSize; + if (end > commit_end) end = commit_end; if (end > (char *)(entry + 1)) mark_block_free( entry + 1, end - (char *)(entry + 1), flags ); - if (((char *)block + block_size < (char *)subheap->base + subheap->size) && - (*(DWORD *)((char *)block + block_size) & ARENA_FLAG_FREE)) + if ((next = next_block( subheap, block )) && (block_get_flags( next ) & ARENA_FLAG_FREE)) { /* merge with the next block if it is free */ - struct entry *next_entry = (struct entry *)((char *)block + block_size); + struct entry *next_entry = (struct entry *)next; list_remove( &next_entry->entry ); - block_size += (next_entry->size & ARENA_SIZE_MASK) + sizeof(*next_entry); - mark_block_free( next_entry, sizeof(struct entry), flags ); + block_size += block_get_size( next ); + block_set_size( block, ARENA_FLAG_FREE, block_size ); + mark_block_free( next_entry, sizeof(*next_entry), flags ); } - - last = ((char *)block + block_size >= (char *)subheap->base + subheap->size); - if (!last) + if ((next = next_block( subheap, block ))) { /* set the next block PREV_FREE flag and back pointer */ - DWORD *next = (DWORD *)((char *)block + block_size); - *next |= ARENA_FLAG_PREV_FREE; + block_set_size( next, ARENA_FLAG_PREV_FREE, block_get_size( next ) ); mark_block_initialized( (struct block **)next - 1, sizeof(struct block *) ); *((struct block **)next - 1) = block; } - entry->size = (block_size - sizeof(*entry)) | ARENA_FLAG_FREE; - HEAP_InsertFreeBlock( subheap->heap, entry, last ); + HEAP_InsertFreeBlock( heap, entry, !next ); }

1 0

Rémi Bernon : ntdll: Introduce new helper to update block type.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 8c8e1638c95f3f519359009e4a5b0e3df2cc894e URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c8e1638c95f3f519359009e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 10:53:44 2022 +0200 ntdll: Introduce new helper to update block type. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 0983dc9d2b4..7e21593cd56 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -231,6 +231,12 @@ static inline UINT block_get_type( const struct block *block ) return block->magic; } +static inline void block_set_type( struct block *block, UINT type ) +{ + if (type >> 24) block->unused_bytes = type >> 24; + block->magic = type; +} + static inline UINT block_get_overhead( const struct block *block ) { if (block_get_flags( block ) & ARENA_FLAG_FREE) return sizeof(struct entry); @@ -685,7 +691,7 @@ static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T blo BOOL last; mark_block_uninitialized( block, sizeof(*entry) ); - entry->magic = ARENA_FREE_MAGIC; + block_set_type( block, ARENA_FREE_MAGIC ); /* If debugging, erase the freed block content */ @@ -737,7 +743,7 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) ARENA_INUSE *prev = heap->pending_free[heap->pending_pos]; heap->pending_free[heap->pending_pos] = pArena; heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; - pArena->magic = ARENA_PENDING_MAGIC; + block_set_type( pArena, ARENA_PENDING_MAGIC ); mark_block_free( pArena + 1, pArena->size & ARENA_SIZE_MASK, heap->flags ); if (!prev) return; pArena = prev; @@ -1536,7 +1542,7 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* in-use arena is smaller than free arena, * so we have to add the difference to the size */ block->size = (block->size & ~ARENA_FLAG_FREE) + sizeof(struct entry) - sizeof(*block); - block->magic = ARENA_INUSE_MAGIC; + block_set_type( block, ARENA_INUSE_MAGIC ); /* Shrink the block */

1 0

Jacek Caban : winemac: Directly use win32u for user functions in window.c.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: a566df118fc4e2935cac8f3fd3df3fa764ec4a69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a566df118fc4e2935cac8f3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 20 21:29:29 2022 +0200 winemac: Directly use win32u for user functions in window.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/winemac.drv/macdrv.h | 26 ++++ dlls/winemac.drv/window.c | 362 ++++++++++++++++++++++++---------------------- 2 files changed, 214 insertions(+), 174 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a566df118fc4e2935cac…

1 0

Rémi Bernon : include: Add missing __WINE_DEALLOC(HeapFree) attribute size index.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: 42ccb842d5ee31e36fdfa3d939db4cf869e0a486 URL: https://source.winehq.org/git/wine.git/?a=commit;h=42ccb842d5ee31e36fdfa3d9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 12:52:54 2022 +0200 include: Add missing __WINE_DEALLOC(HeapFree) attribute size index. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/winbase.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winbase.h b/include/winbase.h index f853392cced..a400816c4d3 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2379,7 +2379,7 @@ WINBASEAPI SIZE_T WINAPI HeapCompact(HANDLE,DWORD); WINBASEAPI HANDLE WINAPI HeapCreate(DWORD,SIZE_T,SIZE_T); WINBASEAPI BOOL WINAPI HeapDestroy(HANDLE); WINBASEAPI BOOL WINAPI HeapLock(HANDLE); -WINBASEAPI LPVOID WINAPI HeapReAlloc(HANDLE,DWORD,LPVOID,SIZE_T) __WINE_ALLOC_SIZE(4) __WINE_DEALLOC(HeapFree); +WINBASEAPI LPVOID WINAPI HeapReAlloc(HANDLE,DWORD,LPVOID,SIZE_T) __WINE_ALLOC_SIZE(4) __WINE_DEALLOC(HeapFree,3); WINBASEAPI BOOL WINAPI HeapQueryInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T,PSIZE_T); WINBASEAPI BOOL WINAPI HeapSetInformation(HANDLE,HEAP_INFORMATION_CLASS,PVOID,SIZE_T); WINBASEAPI SIZE_T WINAPI HeapSize(HANDLE,DWORD,LPCVOID);

1 0

Rémi Bernon : wineoss: Add missing parentheses for GetProcessHeap call.
by Alexandre Julliard May 23, 2022

May 23, 2022

Module: wine Branch: master Commit: e64726d12c4363fa5970d8d59ad69c2e446d9ee9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e64726d12c4363fa5970d8d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 22:59:27 2022 +0200 wineoss: Add missing parentheses for GetProcessHeap call. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 26ff60aeb2a..dbd9c5a0490 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -399,7 +399,7 @@ HRESULT WINAPI AUDDRV_GetEndpointIDs(EDataFlow flow, WCHAR ***ids_out, GUID **gu ids[i] = HeapAlloc(GetProcessHeap(), 0, name_size); oss_dev = HeapAlloc(GetProcessHeap(), 0, offsetof(OSSDevice, devnode[dev_size])); if(!ids[i] || !oss_dev){ - HeapFree(GetProcessHeap, 0, oss_dev); + HeapFree(GetProcessHeap(), 0, oss_dev); params.result = E_OUTOFMEMORY; goto end; }

1 0