wine-commits May 2022

wine-commits@winehq.org

2 participants
907 discussions

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

23 May '22

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

Nikolay Sivov : d3drm/tests: Use test context for test ran in a loop.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 54c27f69f6c6bd7b8273c43cfc6ad97ff19942b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54c27f69f6c6bd7b8273c43c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 23 09:32:00 2022 +0300 d3drm/tests: Use test context for test ran in a loop. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 184 +++++++++++++++++++++++++---------------------- 1 file changed, 100 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=54c27f69f6c6bd7b8273…

1 0

Nikolay Sivov : vbscript: Handle negative argument in Space().
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: c56d09722ee394658a635c37994fff60b8899598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56d09722ee394658a635c37… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 23 09:10:30 2022 +0300 vbscript: Handle negative argument in Space(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 11 +++++++---- dlls/vbscript/tests/api.vbs | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 15c0bb0958e..80348a5288f 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1586,14 +1586,17 @@ static HRESULT Global_Space(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); + assert(args_cnt == 1); + + if(V_VT(arg) == VT_NULL) + return MAKE_VBSERROR(VBSE_ILLEGAL_NULL_USE); + hres = to_int(arg, &n); if(FAILED(hres)) return hres; - if(n < 0) { - FIXME("n = %d\n", n); - return E_NOTIMPL; - } + if(n < 0) + return MAKE_VBSERROR(VBSE_ILLEGAL_FUNC_CALL); if(!res) return S_OK; diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 3b67e920c3d..617589053c6 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -747,6 +747,21 @@ Call ok(Space(4.5) = " ", "Space(4.5) = " & Space(4.5) & """") Call ok(Space(0.5) = "", "Space(0.5) = " & Space(0.5) & """") Call ok(Space(1.5) = " ", "Space(1.5) = " & Space(1.5) & """") Call ok(Space("1") = " ", "Space(""1"") = " & Space("1") & """") +Call ok(Space(Empty) = "", "Space(Empty) = " & Space(Empty) & """") + +sub testSpaceError() + on error resume next + call Err.clear() + call Space(-1) + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space("-1") + call ok(Err.number = 5, "Err.number = " & Err.number) + call Err.clear() + call Space(Null) + call ok(Err.number = 94, "Err.number = " & Err.number) +end sub +call testSpaceError() sub test_string(cnt, char, exp) call ok(String(cnt, char) = exp, "String(" & cnt & ", """ & char & """ = """ & _

1 0

Nikolay Sivov : vbscript: Fix a typo in sizeof() (Coverity).
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 132539b0531445dee2fd5f5cb33eb7d222b880e5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=132539b0531445dee2fd5f5c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat May 21 19:00:49 2022 +0300 vbscript: Fix a typo in sizeof() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/global.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9a24657c848..15c0bb0958e 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -2028,7 +2028,7 @@ static HRESULT Global_Weekday(BuiltinDisp *This, VARIANT *args, unsigned args_cn { /* vbUseSystemDayOfWeek */ GetLocaleInfoW(This->ctx->lcid, LOCALE_RETURN_NUMBER | LOCALE_IFIRSTDAYOFWEEK, (LPWSTR)&first_day, - sizeof(&first_day) / sizeof(WCHAR)); + sizeof(first_day) / sizeof(WCHAR)); first_day = (first_day + 1) % 7; } else if (first_day >= 1 && first_day <= 7)

1 0

Rémi Bernon : kernelbase: Workaround Local(Alloc|Free) invalid access warnings.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 1e110562565bca8fc1c5d351b96f3cd9a148d030 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1e110562565bca8fc1c5d351… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 22:54:03 2022 +0200 kernelbase: Workaround Local(Alloc|Free) invalid access warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernelbase/memory.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 416d7b52a16..b89ab04a38f 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -712,7 +712,7 @@ static struct kernelbase_global_data global_data = {0}; static inline struct mem_entry *unsafe_mem_from_HLOCAL( HLOCAL handle ) { - struct mem_entry *mem = CONTAINING_RECORD( handle, struct mem_entry, ptr ); + struct mem_entry *mem = CONTAINING_RECORD( *(volatile HANDLE *)&handle, struct mem_entry, ptr ); struct kernelbase_global_data *data = &global_data; if (((UINT_PTR)handle & ((sizeof(void *) << 1) - 1)) != sizeof(void *)) return NULL; if (mem < data->mem_entries || mem >= data->mem_entries_end) return NULL; @@ -831,7 +831,7 @@ HLOCAL WINAPI DECLSPEC_HOTPATCH LocalAlloc( UINT flags, SIZE_T size ) return handle; failed: - if (mem) LocalFree( handle ); + if (mem) LocalFree( *(volatile HANDLE *)&handle ); SetLastError( ERROR_NOT_ENOUGH_MEMORY ); return 0; }

1 0

Rémi Bernon : kernel32/tests: Workaround (Local|Global|Heap)Free warnings.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: f7a4ca4446f12a6a717f4b2ad05da337bfc06602 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7a4ca4446f12a6a717f4b2a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 22:54:03 2022 +0200 kernel32/tests: Workaround (Local|Global|Heap)Free warnings. Using function pointers to remove the malloc attributes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/kernel32/tests/heap.c | 50 +++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 21 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f7a4ca4446f12a6a717f…

1 0

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

23 May '22

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

Rémi Bernon : include: Add missing __WINE_DEALLOC attribute to RtlReAllocateHeap.
by Alexandre Julliard 23 May '22

23 May '22

Module: wine Branch: master Commit: 085d3be56e4b686c33a254797f58ac7de3475444 URL: https://source.winehq.org/git/wine.git/?a=commit;h=085d3be56e4b686c33a25479… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 12:52:54 2022 +0200 include: Add missing __WINE_DEALLOC attribute to RtlReAllocateHeap. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/winternl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winternl.h b/include/winternl.h index ca265cf074c..bfb211128a8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -4458,7 +4458,7 @@ NTSYSAPI NTSTATUS WINAPI RtlQueueWorkItem(PRTL_WORK_ITEM_ROUTINE,PVOID,ULONG); NTSYSAPI void WINAPI RtlRaiseException(PEXCEPTION_RECORD); NTSYSAPI void WINAPI RtlRaiseStatus(NTSTATUS); NTSYSAPI ULONG WINAPI RtlRandom(PULONG); -NTSYSAPI PVOID WINAPI RtlReAllocateHeap(HANDLE,ULONG,PVOID,SIZE_T) __WINE_ALLOC_SIZE(4); +NTSYSAPI PVOID WINAPI RtlReAllocateHeap(HANDLE,ULONG,PVOID,SIZE_T) __WINE_ALLOC_SIZE(4) __WINE_DEALLOC(RtlFreeHeap,3); NTSYSAPI NTSTATUS WINAPI RtlRegisterWait(PHANDLE,HANDLE,RTL_WAITORTIMERCALLBACKFUNC,PVOID,ULONG,ULONG); NTSYSAPI void WINAPI RtlReleaseActivationContext(HANDLE); NTSYSAPI void WINAPI RtlReleasePath(PWSTR);

1 0

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

23 May '22

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 : ntdll: Use block helpers in create_free_block.
by Alexandre Julliard 23 May '22

23 May '22

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

← Newer
1
...
24
25
26
27
28
29
30
...
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