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

Gabriel Ivăncescu : mshtml: Implement window.cancelAnimationFrame.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: a139d25189d203e59d7f79f31c60b73ee3d26118 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a139d25189d203e59d7f79f3… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu May 19 21:06:37 2022 +0300 mshtml: Implement window.cancelAnimationFrame. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 15 +++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/mshtml_private_iface.idl | 4 +++- dlls/mshtml/task.c | 23 ++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 + dlls/mshtml/tests/dom.js | 10 +++++++++- 6 files changed, 51 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index ecd530db7e2..235e29a3070 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3152,6 +3152,20 @@ static HRESULT WINAPI window_private_requestAnimationFrame(IWineHTMLWindowPrivat return hres; } +static HRESULT WINAPI window_private_cancelAnimationFrame(IWineHTMLWindowPrivate *iface, VARIANT timer_id) +{ + HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); + HRESULT hres; + + TRACE("iface %p, timer_id %s\n", iface, debugstr_variant(&timer_id)); + + hres = VariantChangeType(&timer_id, &timer_id, 0, VT_I4); + if(SUCCEEDED(hres)) + clear_animation_timer(This->inner_window, V_I4(&timer_id)); + + return S_OK; +} + static HRESULT WINAPI window_private_get_console(IWineHTMLWindowPrivate *iface, IDispatch **console) { HTMLWindow *This = impl_from_IWineHTMLWindowPrivateVtbl(iface); @@ -3176,6 +3190,7 @@ static const IWineHTMLWindowPrivateVtbl WineHTMLWindowPrivateVtbl = { window_private_GetIDsOfNames, window_private_Invoke, window_private_requestAnimationFrame, + window_private_cancelAnimationFrame, window_private_get_console, }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a94f1be1969..930ab3bbe19 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1247,6 +1247,7 @@ enum timer_type { HRESULT set_task_timer(HTMLInnerWindow*,LONG,enum timer_type,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; +HRESULT clear_animation_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; BOOL parse_compat_version(const WCHAR*,compat_mode_t*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mshtml_private_iface.idl b/dlls/mshtml/mshtml_private_iface.idl index b9039c956db..a273e330665 100644 --- a/dlls/mshtml/mshtml_private_iface.idl +++ b/dlls/mshtml/mshtml_private_iface.idl @@ -87,7 +87,9 @@ interface IWineHTMLWindowPrivate : IDispatch { [id(50)] HRESULT requestAnimationFrame([in] VARIANT *expr, [retval, out] VARIANT *timer_id); - [propget, id(51)] + [id(51)] + HRESULT cancelAnimationFrame([in] VARIANT timer_id); + [propget, id(52)] HRESULT console([retval, out] IDispatch **console); } diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 088742e902a..1bb761e1f0f 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -208,7 +208,8 @@ HRESULT clear_task_timer(HTMLInnerWindow *window, DWORD id) LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { if(iter->id == id && iter->window == window) { - release_task_timer(thread_data->thread_hwnd, iter); + if(iter->type != TIMER_ANIMATION_FRAME) + release_task_timer(thread_data->thread_hwnd, iter); return S_OK; } } @@ -217,6 +218,26 @@ HRESULT clear_task_timer(HTMLInnerWindow *window, DWORD id) return S_OK; } +HRESULT clear_animation_timer(HTMLInnerWindow *window, DWORD id) +{ + thread_data_t *thread_data = get_thread_data(FALSE); + task_timer_t *iter; + + if(!thread_data) + return S_OK; + + LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { + if(iter->id == id && iter->window == window) { + if(iter->type == TIMER_ANIMATION_FRAME) + release_task_timer(thread_data->thread_hwnd, iter); + return S_OK; + } + } + + WARN("timer not found\n"); + return S_OK; +} + static const char *debugstr_timer_type(enum timer_type type) { switch(type) { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index eeeb1c88430..5f104475f0d 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -357,6 +357,7 @@ sync_test("window_props", function() { test_exposed("getSelection", v >= 9); test_exposed("onfocusout", v >= 9); test_exposed("getComputedStyle", v >= 9); + test_exposed("cancelAnimationFrame", v >= 10); test_exposed("requestAnimationFrame", v >= 10); test_exposed("Map", v >= 11); test_exposed("Set", v >= 11); diff --git a/dlls/mshtml/tests/dom.js b/dlls/mshtml/tests/dom.js index ed5f72c4376..3939dd95642 100644 --- a/dlls/mshtml/tests/dom.js +++ b/dlls/mshtml/tests/dom.js @@ -494,13 +494,21 @@ sync_test("elem_props", function() { }); async_test("animation_frame", function() { - var id = requestAnimationFrame(function(x) { + var id = requestAnimationFrame(function(x) { ok(false, "request was supposed to be cancelled"); }); + id = cancelAnimationFrame(id); + ok(id === undefined, "cancelAnimationFrame returned " + id); + + id = requestAnimationFrame(function(x) { ok(this === window, "this != window"); ok(typeof(x) === "number", "x = " + x); ok(arguments.length === 1, "arguments.length = " + arguments.length); next_test(); }); + cancelAnimationFrame(0); + clearInterval(id); + clearTimeout(id); ok(typeof(id) === "number", "id = " + id); + ok(id !== 0, "id = 0"); }); sync_test("title", function() {

1 0

Torge Matthies : msvcr120: Add tests for _StructuredTaskCollection.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 821dd844eaeb84658483c4fe878cd7c045a2ffc5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=821dd844eaeb84658483c4fe… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Thu May 19 20:44:04 2022 +0200 msvcr120: Add tests for _StructuredTaskCollection. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr120/tests/msvcr120.c | 269 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 269 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=821dd844eaeb84658483…

1 0

Torge Matthies : ntdll: Calculate buffer sizes from registry structs correctly.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 4e19373c2fc049b7d4f4b215ad10513ee161edfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e19373c2fc049b7d4f4b215… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun May 1 01:57:07 2022 +0200 ntdll: Calculate buffer sizes from registry structs correctly. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 6 +++--- dlls/ntdll/unix/system.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 106ee620cda..283238559d1 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -93,7 +93,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG if (out->MaximumLength) { - dwLen = out->MaximumLength + sizeof(KEY_BASIC_INFORMATION); + dwLen = out->MaximumLength + offsetof(KEY_BASIC_INFORMATION, Name); info = RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) return STATUS_NO_MEMORY; @@ -105,7 +105,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG } ret = NtEnumerateKey( handle, index, KeyBasicInformation, info, dwLen, &dwResultLen ); - dwResultLen -= sizeof(KEY_BASIC_INFORMATION); + dwResultLen -= offsetof(KEY_BASIC_INFORMATION, Name); if (ret == STATUS_BUFFER_OVERFLOW) out->Length = dwResultLen; @@ -138,7 +138,7 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HANDLE handle, ULONG *result_type, PBYTE de UNICODE_STRING name; NTSTATUS ret; DWORD dwResultLen; - DWORD dwLen = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + (result_len ? *result_len : 0); + DWORD dwLen = offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[result_len ? *result_len : 0]); info = RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index ee91441794e..87cc8b9c3a4 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2095,7 +2095,7 @@ static BOOL reg_query_value( HKEY key, LPCWSTR name, DWORD type, void *data, DWO UNICODE_STRING nameW; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buf; - if (count > sizeof(buf) - sizeof(KEY_VALUE_PARTIAL_INFORMATION)) return FALSE; + if (count > sizeof(buf) - offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data)) return FALSE; nameW.Buffer = (WCHAR *)name; nameW.Length = wcslen( name ) * sizeof(WCHAR);

1 0

Rémi Bernon : ntdll: Cleanup HEAP_FindFreeBlock and rename it to find_free_block.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: fd5c680abec09d1dbccb06a7a14b070a27deeca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5c680abec09d1dbccb06a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 00:11:36 2022 +0200 ntdll: Cleanup HEAP_FindFreeBlock and rename it to find_free_block. Returning a struct block pointer directly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 57 +++++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 472f8f11adc..96bb0d0c027 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1058,34 +1058,24 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, } -/*********************************************************************** - * HEAP_FindFreeBlock - * - * 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 data_size, SUBHEAP **ppSubHeap ) +static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **subheap ) { - struct entry *entry = find_free_list( heap, data_size + sizeof(ARENA_INUSE), FALSE ); + struct list *ptr = &find_free_list( heap, data_size + sizeof(ARENA_INUSE), FALSE )->entry; SIZE_T total_size, arena_size; - ARENA_FREE *pArena; - SUBHEAP *subheap; - struct list *ptr; + struct entry *entry; /* Find a suitable free list, and in it find a block large enough */ - ptr = &entry->entry; while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) { - pArena = LIST_ENTRY( ptr, ARENA_FREE, entry ); - arena_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); + entry = LIST_ENTRY( ptr, struct entry, entry ); + arena_size = (entry->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); if (arena_size >= data_size) { - subheap = find_subheap( heap, (struct block *)pArena, FALSE ); - if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, data_size )) return NULL; - *ppSubHeap = subheap; - list_remove( &pArena->entry ); - return pArena; + *subheap = find_subheap( heap, (struct block *)entry, FALSE ); + if (!HEAP_Commit( *subheap, (struct block *)entry, data_size )) return NULL; + list_remove( &entry->entry ); + return (struct block *)entry; } } @@ -1104,26 +1094,24 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **p 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 ) ))) + if ((*subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, + max( heap->grow_size, total_size ) ))) { if (heap->grow_size < 128 * 1024 * 1024) heap->grow_size *= 2; } - else while (!subheap) /* shrink the grow size again if we are running out of space */ + else while (!*subheap) /* shrink the grow size again if we are running out of space */ { if (heap->grow_size <= total_size || heap->grow_size <= 4 * 1024 * 1024) return NULL; heap->grow_size /= 2; - subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, - max( heap->grow_size, total_size ) ); + *subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, + max( heap->grow_size, total_size ) ); } - TRACE("created new sub-heap %p of %08lx bytes for heap %p\n", - subheap, subheap->size, heap ); + TRACE( "created new sub-heap %p of %08lx bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap ); - *ppSubHeap = subheap; - pArena = (ARENA_FREE *)((char *)subheap->base + subheap->headerSize); - list_remove( &pArena->entry ); - return pArena; + entry = first_block( *subheap ); + list_remove( &entry->entry ); + return (struct block *)entry; } @@ -1538,7 +1526,6 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret ) { struct block *block; - struct entry *entry; SIZE_T data_size; SUBHEAP *subheap; @@ -1554,15 +1541,11 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* Locate a suitable free block */ - if (!(entry = HEAP_FindFreeBlock( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; - - /* Build the in-use arena */ - - block = (struct block *)entry; + if (!(block = find_free_block( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; /* 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(*entry) - sizeof(*block); + block->size = (block->size & ~ARENA_FLAG_FREE) + sizeof(struct entry) - sizeof(*block); block->magic = ARENA_INUSE_MAGIC; /* Shrink the block */

1 0

Rémi Bernon : ntdll: Move the main subheap after the free lists.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: f00da96a0112f101f20a5213aa6568bb72c8d7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f00da96a0112f101f20a5213… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 1 17:48:06 2022 +0200 ntdll: Move the main subheap after the free lists. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 89c32fe4fa9..4425b0cd91e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -186,7 +186,6 @@ typedef struct tagHEAP /* end of the Windows 10 compatible struct layout */ BOOL shared; /* System shared heap */ - SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ struct list large_list; /* Large blocks list */ @@ -195,7 +194,8 @@ typedef struct tagHEAP DWORD pending_pos; /* Position in pending free requests ring */ ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ RTL_CRITICAL_SECTION cs; - FREE_LIST_ENTRY *freeList; /* Free lists */ + FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; + SUBHEAP subheap; } HEAP; #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -1008,8 +1008,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Build the free lists */ - heap->freeList = (FREE_LIST_ENTRY *)((char *)heap + subheap->headerSize); - subheap->headerSize += HEAP_NB_FREE_LISTS * sizeof(FREE_LIST_ENTRY); list_init( &heap->freeList[0].arena.entry ); for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) {

1 0

Rémi Bernon : ntdll: Set ARENA_FLAG_FREE flag in HEAP_CreateFreeBlock.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 523da9157f7d202da43fed36424651b1ca37e734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523da9157f7d202da43fed36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 2 14:20:56 2022 +0200 ntdll: Set ARENA_FLAG_FREE flag in HEAP_CreateFreeBlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 8706b0f7774..89c32fe4fa9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -600,7 +600,6 @@ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL la /* insert at head of free list */ list_add_after( &pEntry->arena.entry, &pArena->entry ); } - pArena->size |= ARENA_FLAG_FREE; } @@ -726,7 +725,7 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) /* Last, insert the new block into the free list */ - pFree->size = size - sizeof(*pFree); + pFree->size = (size - sizeof(*pFree)) | ARENA_FLAG_FREE; HEAP_InsertFreeBlock( subheap->heap, pFree, last ); }

1 0

Rémi Bernon : ntdll: Mask block flags when computing HEAP_InsertFreeBlock size.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: ba21d8fd5472e7c304bb65775a954a16771f7442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba21d8fd5472e7c304bb6577… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 18:31:28 2022 +0200 ntdll: Mask block flags when computing HEAP_InsertFreeBlock size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 6e64d0d7dfb..8706b0f7774 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -586,7 +586,8 @@ static HEAP *HEAP_GetPtr( */ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL last ) { - FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( pArena->size + sizeof(*pArena) ); + SIZE_T block_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); + FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( block_size ); if (last) { /* insert at end of free list, i.e. before the next free list entry */

1 0

Zhiyi Zhang : wined3d: Fill fake adapter video memory usage.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 6ebfc35fc43c62ba9b16d158025e66b5b6cb6bf3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ebfc35fc43c62ba9b16d158… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 18 14:49:21 2022 +0800 wined3d: Fill fake adapter video memory usage. 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/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f8a44be0b3e..8c58a346add 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1035,7 +1035,7 @@ HRESULT CDECL wined3d_adapter_get_video_memory_info(const struct wined3d_adapter { case WINED3D_MEMORY_SEGMENT_GROUP_LOCAL: info->budget = adapter_id.video_memory; - info->current_usage = 0; + info->current_usage = adapter->vram_bytes_used; info->available_reservation = adapter_id.video_memory / 2; info->current_reservation = 0; break;

1 0

Zhiyi Zhang : dxgi/tests: Test adapter video memory budget notification.
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 14237e321b30bd3f9eaa441586f82c44c15bc5cf URL: https://source.winehq.org/git/wine.git/?a=commit;h=14237e321b30bd3f9eaa4415… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed May 18 14:49:28 2022 +0800 dxgi/tests: Test adapter video memory budget notification. 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/tests/dxgi.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index a199ba486ba..04bba29e8e5 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -7514,6 +7514,66 @@ static void test_swapchain_present_count(IUnknown *device, BOOL is_d3d12) DestroyWindow(window); } +static void test_video_memory_budget_notification(void) +{ + DXGI_QUERY_VIDEO_MEMORY_INFO memory_info; + IDXGIAdapter3 *adapter3; + IDXGIAdapter *adapter; + IDXGIDevice *device; + DWORD cookie, ret; + ULONG refcount; + HANDLE event; + HRESULT hr; + + if (!(device = create_device(0))) + { + skip("Failed to create device.\n"); + return; + } + + hr = IDXGIDevice_GetAdapter(device, &adapter); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + hr = IDXGIAdapter_QueryInterface(adapter, &IID_IDXGIAdapter3, (void **)&adapter3); + ok(hr == S_OK || hr == E_NOINTERFACE, "Got unexpected hr %#lx.\n", hr); + if (hr == E_NOINTERFACE) + 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); + if (!memory_info.Budget) + { + hr = IDXGIAdapter3_QueryVideoMemoryInfo(adapter3, 0, DXGI_MEMORY_SEGMENT_GROUP_NON_LOCAL, &memory_info); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } + if (memory_info.Budget) + { + ret = WaitForSingleObject(event, 1000); + todo_wine + ok(ret == WAIT_OBJECT_0, "Expected event fired.\n"); + } + + IDXGIAdapter3_UnregisterVideoMemoryBudgetChangeNotification(adapter3, cookie); + IDXGIAdapter3_Release(adapter3); + CloseHandle(event); + +done: + IDXGIAdapter_Release(adapter); + refcount = IDXGIDevice_Release(device); + ok(!refcount, "Device has %lu references left.\n", refcount); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -7613,6 +7673,7 @@ START_TEST(dxgi) queue_test(test_output_desc); queue_test(test_object_wrapping); queue_test(test_factory_check_feature_support); + queue_test(test_video_memory_budget_notification); run_queued_tests();

1 0

Julian Klemann : ws2_32: Add stub for SIO_ENABLE_CIRCULAR_QUEUEING in WSAIoctl().
by Alexandre Julliard May 20, 2022

May 20, 2022

Module: wine Branch: master Commit: 881ee71a5c844d69695789be0edc3f22619847cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=881ee71a5c844d69695789be… Author: Julian Klemann <jklemann(a)codeweavers.com> Date: Wed May 18 14:04:13 2022 -0500 ws2_32: Add stub for SIO_ENABLE_CIRCULAR_QUEUEING in WSAIoctl(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47233 Signed-off-by: Julian Klemann <jklemann(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++++++++ dlls/ws2_32/tests/sock.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3d0c2deca35..88089fa8d74 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2371,6 +2371,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID return ret ? -1 : 0; } + case SIO_ENABLE_CIRCULAR_QUEUEING: + { + NTSTATUS status = STATUS_SUCCESS; + DWORD ret; + + FIXME( "SIO_ENABLE_CIRCULAR_QUEUEING stub\n" ); + ret = server_ioctl_sock( s, IOCTL_AFD_WINE_COMPLETE_ASYNC, &status, sizeof(status), + NULL, 0, ret_size, overlapped, completion ); + SetLastError( ret ); + return ret ? -1 : 0; + } + case SIO_BASE_HANDLE: { NTSTATUS status; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f17ffba7a85..bdb683e6796 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5113,6 +5113,19 @@ static void test_base_handle(void) } } +static void test_circular_queueing(void) +{ + SOCKET s; + DWORD size; + int ret; + + s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + ret = WSAIoctl(s, SIO_ENABLE_CIRCULAR_QUEUEING, NULL, 0, NULL, 0, &size, NULL, NULL); + ok(!ret, "expected 0, got %d\n", ret); + + closesocket(s); +} + static BOOL drain_pause = FALSE; static DWORD WINAPI drain_socket_thread(LPVOID arg) { @@ -12578,6 +12591,7 @@ START_TEST( sock ) test_sioRoutingInterfaceQuery(); test_sioAddressListChange(); test_base_handle(); + test_circular_queueing(); test_unsupported_ioctls(); test_WSASendMsg();

1 0