November 2022 - Wine-commits

Rémi Bernon : ntdll: Move large block alloc out of heap_allocate.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 523d4cc416fc991c739a15b586cf47e1fbd5c7f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/523d4cc416fc991c739a15b586cf47… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 15:17:50 2022 +0100 ntdll: Move large block alloc out of heap_allocate. --- dlls/ntdll/heap.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 31650433aa5..69ffc3cd0ac 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -819,23 +819,21 @@ static inline void shrink_used_block( struct heap *heap, ULONG flags, struct blo } -/*********************************************************************** - * allocate_large_block - */ -static struct block *allocate_large_block( struct heap *heap, DWORD flags, SIZE_T size ) +static NTSTATUS heap_allocate_large( struct heap *heap, ULONG flags, SIZE_T block_size, + SIZE_T size, void **ret ) { ARENA_LARGE *arena; SIZE_T total_size = ROUND_SIZE( sizeof(*arena) + size, REGION_ALIGN - 1 ); LPVOID address = NULL; struct block *block; - if (!(flags & HEAP_GROWABLE)) return NULL; - if (total_size < size) return NULL; /* overflow */ + if (!(flags & HEAP_GROWABLE)) return STATUS_NO_MEMORY; + if (total_size < size) return STATUS_NO_MEMORY; /* overflow */ if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &total_size, MEM_COMMIT, get_protection_type( heap->flags ) )) { WARN( "Could not allocate block for %#Ix bytes\n", size ); - return NULL; + return STATUS_NO_MEMORY; } arena = address; @@ -847,11 +845,16 @@ static struct block *allocate_large_block( struct heap *heap, DWORD flags, SIZE_ block_set_base( block, arena ); block_set_flags( block, ~0, BLOCK_FLAG_LARGE | BLOCK_USER_FLAGS( flags ) ); block_set_size( block, 0 ); + + heap_lock( heap, flags ); list_add_tail( &heap->large_list, &arena->entry ); + heap_unlock( heap, flags ); + valgrind_make_noaccess( (char *)block + sizeof(*block) + arena->data_size, arena->block_size - sizeof(*block) - arena->data_size ); - return block; + *ret = block + 1; + return STATUS_SUCCESS; } @@ -1501,19 +1504,11 @@ static SIZE_T heap_get_block_size( const struct heap *heap, ULONG flags, SIZE_T return block_size; } -static NTSTATUS heap_allocate( struct heap *heap, ULONG flags, SIZE_T block_size, SIZE_T size, void **ret ) +static NTSTATUS heap_allocate_block( struct heap *heap, ULONG flags, SIZE_T block_size, SIZE_T size, void **ret ) { SIZE_T old_block_size; struct block *block; - if (block_size >= HEAP_MIN_LARGE_BLOCK_SIZE) - { - if (!(block = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY; - - *ret = block + 1; - return STATUS_SUCCESS; - } - /* Locate a suitable free block */ if (!(block = find_free_block( heap, flags, block_size ))) return STATUS_NO_MEMORY; @@ -1545,10 +1540,12 @@ void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE status = STATUS_INVALID_HANDLE; else if ((block_size = heap_get_block_size( heap, heap_flags, size )) == ~0U) status = STATUS_NO_MEMORY; + else if (block_size >= HEAP_MIN_LARGE_BLOCK_SIZE) + status = heap_allocate_large( heap, heap_flags, block_size, size, &ptr ); else { heap_lock( heap, heap_flags ); - status = heap_allocate( heap, heap_flags, block_size, size, &ptr ); + status = heap_allocate_block( heap, heap_flags, block_size, size, &ptr ); heap_unlock( heap, heap_flags ); }

1 0

Rémi Bernon : ntdll: Move large block free out of heap_free.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: cbe3fb89d2bf7fc2ec400122f9275b0d903a6295 URL: https://gitlab.winehq.org/wine/wine/-/commit/cbe3fb89d2bf7fc2ec400122f9275b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 15:18:43 2022 +0100 ntdll: Move large block free out of heap_free. --- dlls/ntdll/heap.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 69ffc3cd0ac..f8aba405234 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -749,7 +749,7 @@ static void create_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, } -static void free_used_block( struct heap *heap, ULONG flags, struct block *block ) +static NTSTATUS heap_free_block( struct heap *heap, ULONG flags, struct block *block ) { struct entry *entry; SIZE_T block_size; @@ -761,8 +761,8 @@ static void free_used_block( struct heap *heap, ULONG flags, struct block *block heap->pending_free[heap->pending_pos] = block; heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; block_set_type( block, BLOCK_TYPE_DEAD ); - mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), flags ); - if (!(block = tmp)) return; + mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), heap->flags ); + if (!(block = tmp)) return STATUS_SUCCESS; } block_size = block_get_size( block ); @@ -778,7 +778,7 @@ static void free_used_block( struct heap *heap, ULONG flags, struct block *block subheap = block_get_subheap( heap, block ); create_free_block( heap, flags, subheap, block, block_size ); - if (next_block( subheap, block )) return; /* not the last block */ + if (next_block( subheap, block )) return STATUS_SUCCESS; /* not the last block */ if (block == first_block( subheap ) && subheap != &heap->subheap) { @@ -795,6 +795,8 @@ static void free_used_block( struct heap *heap, ULONG flags, struct block *block /* keep room for a full committed block as hysteresis */ subheap_decommit( heap, subheap, (char *)(entry + 1) + REGION_ALIGN ); } + + return STATUS_SUCCESS; } @@ -858,17 +860,17 @@ static NTSTATUS heap_allocate_large( struct heap *heap, ULONG flags, SIZE_T bloc } -/*********************************************************************** - * free_large_block - */ -static void free_large_block( struct heap *heap, struct block *block ) +static NTSTATUS heap_free_large( struct heap *heap, ULONG flags, struct block *block ) { ARENA_LARGE *arena = CONTAINING_RECORD( block, ARENA_LARGE, block ); LPVOID address = arena; SIZE_T size = 0; + heap_lock( heap, flags ); list_remove( &arena->entry ); - NtFreeVirtualMemory( NtCurrentProcess(), &address, &size, MEM_RELEASE ); + heap_unlock( heap, flags ); + + return NtFreeVirtualMemory( NtCurrentProcess(), &address, &size, MEM_RELEASE ); } @@ -1447,7 +1449,7 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE handle ) { heap->pending_free = NULL; for (tmp = pending; *tmp && tmp != pending + MAX_FREE_PENDING; ++tmp) - free_used_block( heap, heap->flags, *tmp ); + heap_free_block( heap, heap->flags, *tmp ); RtlFreeHeap( handle, 0, pending ); } @@ -1557,13 +1559,6 @@ void *WINAPI DECLSPEC_HOTPATCH RtlAllocateHeap( HANDLE handle, ULONG flags, SIZE } -static NTSTATUS heap_free( struct heap *heap, ULONG flags, struct block *block ) -{ - if (block_get_flags( block ) & BLOCK_FLAG_LARGE) free_large_block( heap, block ); - else free_used_block( heap, flags, block ); - return STATUS_SUCCESS; -} - /*********************************************************************** * RtlFreeHeap (NTDLL.@) */ @@ -1582,10 +1577,12 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * status = STATUS_INVALID_PARAMETER; else if (!(block = unsafe_block_from_ptr( heap, heap_flags, ptr ))) status = STATUS_INVALID_PARAMETER; + else if (block_get_flags( block ) & BLOCK_FLAG_LARGE) + status = heap_free_large( heap, heap_flags, block ); else { heap_lock( heap, heap_flags ); - status = heap_free( heap, heap_flags, block ); + status = heap_free_block( heap, heap_flags, block ); heap_unlock( heap, heap_flags ); }

1 0

Rémi Bernon : ntdll: Move delayed free support out of heap_free.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: a51e2a3f94baa3cece9f344c10db838aad4dc4a7 URL: https://gitlab.winehq.org/wine/wine/-/commit/a51e2a3f94baa3cece9f344c10db83… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Nov 14 15:19:55 2022 +0100 ntdll: Move delayed free support out of heap_free. --- dlls/ntdll/heap.c | 33 +++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index f8aba405234..1de9fe6a4b6 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -749,22 +749,33 @@ static void create_free_block( struct heap *heap, ULONG flags, SUBHEAP *subheap, } +static struct block *heap_delay_free( struct heap *heap, ULONG flags, struct block *block ) +{ + struct block *tmp; + + if (!heap->pending_free) return block; + + block_set_type( block, BLOCK_TYPE_DEAD ); + mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), flags ); + + heap_lock( heap, flags ); + + tmp = heap->pending_free[heap->pending_pos]; + heap->pending_free[heap->pending_pos] = block; + heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; + + heap_unlock( heap, flags ); + + return tmp; +} + + static NTSTATUS heap_free_block( struct heap *heap, ULONG flags, struct block *block ) { struct entry *entry; SIZE_T block_size; SUBHEAP *subheap; - if (heap->pending_free) - { - struct block *tmp = heap->pending_free[heap->pending_pos]; - heap->pending_free[heap->pending_pos] = block; - heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; - block_set_type( block, BLOCK_TYPE_DEAD ); - mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), heap->flags ); - if (!(block = tmp)) return STATUS_SUCCESS; - } - block_size = block_get_size( block ); if (block_get_flags( block ) & BLOCK_FLAG_PREV_FREE) { @@ -1579,6 +1590,8 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE handle, ULONG flags, void * status = STATUS_INVALID_PARAMETER; else if (block_get_flags( block ) & BLOCK_FLAG_LARGE) status = heap_free_large( heap, heap_flags, block ); + else if (!(block = heap_delay_free( heap, heap_flags, block ))) + status = STATUS_SUCCESS; else { heap_lock( heap, heap_flags );

1 0

Matteo Bruni : wined3d: Don't use separate GL contexts for different swapchains.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 72597b170e814599ef2be4b19dc4b9de0932a30f URL: https://gitlab.winehq.org/wine/wine/-/commit/72597b170e814599ef2be4b19dc4b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Aug 5 20:09:38 2020 +0200 wined3d: Don't use separate GL contexts for different swapchains. This avoids triggering a Mesa slowpath introduced by Mesa commit e7f3a8d6959c74f63c877dd8776fe519d54f946f. Additionally, it helps applications using multiple swapchains and queries (e.g. the one in bug 43773) by not requiring extra context switches when polling queries. For the records, the actual issue from bug 43773 was probably fixed a long time ago, maybe already by 7b62a970e9ad3b4179394cf54f0232475fe2388a or thereabouts. The downside of this change is that we'll now end up calling glFinish() when there are multiple threads using the same device when CSMT is disabled. That's a non-default setting and one that should only be used for troubleshooting purposes at this point, so it shouldn't be too bad of an issue. It might also make sense to just get rid of that glFinish() entirely, it's never going to be a complete fix. --- dlls/wined3d/adapter_gl.c | 2 +- dlls/wined3d/context_gl.c | 10 ++++++ dlls/wined3d/device.c | 14 +++----- dlls/wined3d/swapchain.c | 81 ++++++------------------------------------ dlls/wined3d/wined3d_private.h | 7 ---- 5 files changed, 26 insertions(+), 88 deletions(-)

1 0

Nikolay Sivov : vbscript: Make redim fail on fixed-size arrays.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 7ca1eff8e13b7f3f8a50be25856301543051fb44 URL: https://gitlab.winehq.org/wine/wine/-/commit/7ca1eff8e13b7f3f8a50be25856301… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Nov 23 08:35:01 2022 +0300 vbscript: Make redim fail on fixed-size arrays. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53964 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/interp.c | 23 ++++++++++++--------- dlls/vbscript/tests/lang.vbs | 48 ++++++++++++++++++++++++++++++++++++++------ dlls/vbscript/tests/run.c | 33 ++++++++++++++++++++++++++++-- 3 files changed, 87 insertions(+), 17 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 2d33982839e..b3be3bea6cf 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -1246,6 +1246,7 @@ static HRESULT interp_dim(exec_ctx_t *ctx) *array_ref = SafeArrayCreate(VT_VARIANT, array_desc->dim_cnt, array_desc->bounds); if(!*array_ref) return E_OUTOFMEMORY; + (*array_ref)->fFeatures |= (FADF_FIXEDSIZE | FADF_STATIC); } V_VT(v) = VT_ARRAY|VT_BYREF|VT_VARIANT; @@ -1302,6 +1303,18 @@ static HRESULT interp_redim(exec_ctx_t *ctx) return E_FAIL; } + v = ref.u.v; + + if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { + v = V_VARIANTREF(v); + } + + if(V_ISARRAY(v)) { + SAFEARRAY *sa = V_ISBYREF(v) ? *V_ARRAYREF(v) : V_ARRAY(v); + if(sa->fFeatures & FADF_FIXEDSIZE) + return MAKE_VBSERROR(VBSE_ARRAY_LOCKED); + } + hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); if(FAILED(hres)) return hres; @@ -1311,14 +1324,6 @@ static HRESULT interp_redim(exec_ctx_t *ctx) if(!array) return E_OUTOFMEMORY; - /* FIXME: We should check if we're not modifying an existing static array here */ - - v = ref.u.v; - - if(V_VT(v) == (VT_VARIANT|VT_BYREF)) { - v = V_VARIANTREF(v); - } - VariantClear(v); V_VT(v) = VT_ARRAY|VT_VARIANT; V_ARRAY(v) = array; @@ -1361,7 +1366,7 @@ static HRESULT interp_redim_preserve(exec_ctx_t *ctx) return E_FAIL; } - array = V_ARRAY(v); + array = V_ISBYREF(v) ? *V_ARRAYREF(v) : V_ARRAY(v); hres = array_bounds_from_stack(ctx, dim_cnt, &bounds); if(FAILED(hres)) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index ddfaf20a19d..d27277508c0 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1531,12 +1531,48 @@ e = err.number on error goto 0 ok e = 9, "e = " & e ' VBSE_OUT_OF_BOUNDS, can only change rightmost dimension -dim staticarray(4) -on error resume next -redim staticarray(3) -e = err.number -on error goto 0 -todo_wine_ok e = 10, "e = " & e +sub TestReDimFixed + on error resume next + + dim staticarray(4) + err.clear + redim staticarray(3) + call ok(err.number = 10, "err.number = " & err.number) + call ok(isArrayFixed(staticarray), "Expected fixed size array") + + err.clear + redim staticarray("abc") + call ok(err.number = 10, "err.number = " & err.number) + + dim staticarray2(4) + err.clear + redim preserve staticarray2(5) + call ok(err.number = 10, "err.number = " & err.number) + call ok(isArrayFixed(staticarray2), "Expected fixed size array") + + err.clear + redim preserve staticarray2("abc") + ' Win10+ builds return INVALID_CALL (5) + call ok(err.number = 5 or err.number = 13, "err.number = " & err.number) +end sub +Call TestRedimFixed + +sub TestRedimInputArg + on error resume next + + dim x + + x = Array(1) + err.clear + redim x("abc") + call ok(err.number = 13, "err.number = " & err.number) + + err.clear + redim preserve x("abc") + ' Win10+ builds return INVALID_CALL (5) + call ok(err.number = 5 or err.number = 13, "err.number = " & err.number) +end sub +Call TestRedimInputArg sub TestReDimList dim x, y diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 31ac03ab8d7..022d714dea5 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -146,6 +146,7 @@ DEFINE_EXPECT(OnLeaveScript); #define DISPID_GLOBAL_PROPARGSET 1025 #define DISPID_GLOBAL_UNKOBJ 1026 #define DISPID_GLOBAL_THROWEXCEPTION 1027 +#define DISPID_GLOBAL_ISARRAYFIXED 1028 #define DISPID_TESTOBJ_PROPGET 2000 #define DISPID_TESTOBJ_PROPPUT 2001 @@ -568,7 +569,6 @@ static void test_safearray(SAFEARRAY *safearray, unsigned indims) if(!exdims) exdims = 1; ok(safearray->cDims == exdims, "safearray->cDims = %d, expected %d\n", safearray->cDims, exdims); - todo_wine ok(safearray->fFeatures == (FADF_VARIANT|FADF_HAVEVARTYPE|FADF_FIXEDSIZE|FADF_STATIC), "safearray->fFeatures = %x\n", safearray->fFeatures); ok(safearray->cbElements == sizeof(VARIANT), "safearray->cbElements = %lx\n", safearray->cbElements); @@ -1163,7 +1163,8 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD { L"testOptionalArg", DISPID_GLOBAL_TESTOPTIONALARG }, { L"testErrorObject", DISPID_GLOBAL_TESTERROROBJECT }, { L"throwWithDesc", DISPID_GLOBAL_THROWWITHDESC }, - { L"unkObj", DISPID_GLOBAL_UNKOBJ } + { L"unkObj", DISPID_GLOBAL_UNKOBJ }, + { L"isArrayFixed", DISPID_GLOBAL_ISARRAYFIXED }, }; test_grfdex(grfdex, fdexNameCaseInsensitive); @@ -1737,6 +1738,34 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_UNKNOWN; V_UNKNOWN(pvarRes) = &unkObj; return S_OK; + + case DISPID_GLOBAL_ISARRAYFIXED: + { + BOOL is_fixed = FALSE; + VARIANT *v; + + ok(pdp != NULL, "pdp == NULL\n"); + ok(pdp->rgvarg != NULL, "rgvarg == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(V_VT(pvarRes) == VT_EMPTY, "V_VT(pvarRes) = %d\n", V_VT(pvarRes)); + ok(pei != NULL, "pei == NULL\n"); + + ok(V_VT(pdp->rgvarg) == (VT_VARIANT|VT_BYREF), "Unexpected argument type %d.\n", V_VT(pdp->rgvarg)); + v = V_VARIANTREF(pdp->rgvarg); + ok(V_VT(v) == (VT_VARIANT|VT_ARRAY|VT_BYREF), "Unexpected argument type %d.\n", V_VT(v)); + if (V_ISARRAY(v)) + { + SAFEARRAY *sa = V_ISBYREF(v) ? *V_ARRAYREF(v) : V_ARRAY(v); + is_fixed = (sa->fFeatures & (FADF_FIXEDSIZE | FADF_STATIC)) == (FADF_FIXEDSIZE | FADF_STATIC); + } + + V_VT(pvarRes) = VT_BOOL; + V_BOOL(pvarRes) = is_fixed ? VARIANT_TRUE : VARIANT_FALSE; + return S_OK; + } } ok(0, "unexpected call %ld\n", id);

1 0

Michel Zou : msvcrt: Fix errno set on dup from read-only file.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 53bc6c7a4a416252559a2a174821001fdd576c6f URL: https://gitlab.winehq.org/wine/wine/-/commit/53bc6c7a4a416252559a2a17482100… Author: Michel Zou <xantares09(a)hotmail.com> Date: Sat Nov 26 18:27:52 2022 +0100 msvcrt: Fix errno set on dup from read-only file. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53950 --- dlls/msvcrt/file.c | 1 + dlls/msvcrt/tests/file.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4a8c3510bd7..e72784eef41 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1244,6 +1244,7 @@ int CDECL _dup2(int od, int nd) if (info_nd == &MSVCRT___badioinfo) { + *_errno() = EBADF; ret = -1; } else if (info_od->wxflag & WX_OPEN) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index de21d11d0b9..3f57b3f871f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -267,6 +267,12 @@ static void test_readmode( BOOL ascii_mode ) close (fd); + fd = open ("fdopen.tst", O_RDONLY, _S_IREAD |_S_IWRITE); + errno = 0xdeadbeef; + ok(dup2(fd, -1) == -1, "dup2(fd, -1) succeeded\n"); + ok(errno == EBADF, "errno = %d\n", errno); + close (fd); + if (ascii_mode) { /* Open file in ascii mode */ fd = open ("fdopen.tst", O_RDONLY);

1 0

Matteo Bruni : wined3d: Don't try to access unused buffers in wined3d_context_gl_load_numbered_arrays().
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: d6e4e944af1c93dbb8ffeaab62d14af42fe8b738 URL: https://gitlab.winehq.org/wine/wine/-/commit/d6e4e944af1c93dbb8ffeaab62d14a… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 14 23:07:17 2022 +0200 wined3d: Don't try to access unused buffers in wined3d_context_gl_load_numbered_arrays(). wined3d_stream_info_from_declaration() doesn't update elements of the stream_info structure that are not used by the current vertex declaration. That means that there might be obsolete buffer references in stream_info, possibly to buffers that have since been destroyed. --- dlls/wined3d/context_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index af46cd9dfd7..5df0865824c 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -5675,7 +5675,6 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c for (i = 0; i < gl_info->limits.vertex_attribs; ++i) { const struct wined3d_stream_info_element *element = &stream_info->elements[i]; - const void *offset = get_vertex_attrib_pointer(element, state); const struct wined3d_stream_state *stream; const struct wined3d_format_gl *format_gl; @@ -5733,6 +5732,7 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c if (element->stride) { + const void *offset = get_vertex_attrib_pointer(element, state); unsigned int format_attrs = format_gl->f.attrs; bo = wined3d_bo_gl_id(element->data.buffer_object);

1 0

Matteo Bruni : wined3d: Remove unnecessary index increment in wined3d_context_gl_cleanup_resources().
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: c1857959b89bec51f096a1cc4cb69738435df711 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1857959b89bec51f096a1cc4cb697… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 14 23:16:37 2022 +0200 wined3d: Remove unnecessary index increment in wined3d_context_gl_cleanup_resources(). --- dlls/wined3d/context_gl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5df0865824c..c790157fd0a 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2663,8 +2663,6 @@ static void wined3d_context_gl_cleanup_resources(struct wined3d_context_gl *cont wined3d_device_gl_free_memory(device_gl, r->block); if (i != --count) *r = blocks[count]; - else - ++i; } device_gl->retired_block_count = count; }

1 0

Matteo Bruni : wined3d: Get rid of a redundant branch.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: b12cae8c99e8d7d606a4569d86ba63579d0087bd URL: https://gitlab.winehq.org/wine/wine/-/commit/b12cae8c99e8d7d606a4569d86ba63… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 21 10:25:00 2022 +0200 wined3d: Get rid of a redundant branch. --- dlls/wined3d/device.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7a37a27b0cd..b7d0b1adebc 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5848,6 +5848,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, device_init_swapchain_state(device, swapchain); if (wined3d_settings.logo) device_load_logo(device, wined3d_settings.logo); + + hr = device->adapter->adapter_ops->adapter_init_3d(device); } else { @@ -5857,12 +5859,8 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_device_context_set_depth_stencil_view(context, view); } - if (reset_state) - hr = device->adapter->adapter_ops->adapter_init_3d(device); - - /* All done. There is no need to reload resources or shaders, this will happen automatically on the - * first use - */ + /* All done. There is no need to reload resources or shaders, this will + * happen automatically on the first use. */ return hr; }

1 0

Matteo Bruni : wined3d: Move backup window / DC handling from the swapchain to the device.
by Alexandre Julliard 30 Nov '22

30 Nov '22

Module: wine Branch: master Commit: 242cdaee822f0533f5c84932c7be460e332f14ca URL: https://gitlab.winehq.org/wine/wine/-/commit/242cdaee822f0533f5c84932c7be46… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 25 19:20:57 2022 +0100 wined3d: Move backup window / DC handling from the swapchain to the device. --- dlls/wined3d/context_gl.c | 16 +++++++--------- dlls/wined3d/device.c | 35 +++++++++++++++++++++++++++++++++++ dlls/wined3d/swapchain.c | 36 ++---------------------------------- dlls/wined3d/wined3d_private.h | 8 ++++---- 4 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index c790157fd0a..66e4321dd12 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -1258,7 +1258,7 @@ success: static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context_gl) { - struct wined3d_swapchain_gl *swapchain_gl = wined3d_swapchain_gl(context_gl->c.swapchain); + struct wined3d_device_gl *device_gl = wined3d_device_gl(context_gl->c.device); BOOL backup = FALSE; if (!wined3d_context_gl_set_pixel_format(context_gl)) @@ -1275,23 +1275,20 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context context_gl->valid = 0; WARN("Trying fallback to the backup window.\n"); - /* FIXME: If the context is destroyed it's no longer associated with - * a swapchain, so we can't use the swapchain to get a backup dc. To - * make this work windowless contexts would need to be handled by the - * device. */ - if (context_gl->c.destroyed || !swapchain_gl) + if (context_gl->c.destroyed) { FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); wined3d_context_gl_set_current(NULL); return FALSE; } - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + if (!(context_gl->dc = wined3d_device_gl_get_backup_dc(device_gl))) { wined3d_context_gl_set_current(NULL); return FALSE; } + TRACE("Using backup DC %p.\n", context_gl->dc); context_gl->dc_is_private = TRUE; context_gl->dc_has_format = FALSE; @@ -2032,7 +2029,7 @@ static BOOL wined3d_context_gl_create_wgl_ctx(struct wined3d_context_gl *context context_gl->pixel_format, context_gl->dc); wined3d_release_dc(context_gl->window, context_gl->dc); - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + if (!(context_gl->dc = wined3d_device_gl_get_backup_dc(wined3d_device_gl(device)))) { ERR("Failed to retrieve the backup device context.\n"); return FALSE; @@ -2109,7 +2106,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi if (!context_gl->dc) { - if (!(context_gl->dc = wined3d_swapchain_gl_get_backup_dc(swapchain_gl))) + if (!(context_gl->dc = wined3d_device_gl_get_backup_dc(wined3d_device_gl(device)))) { ERR("Failed to retrieve a device context.\n"); return E_FAIL; @@ -2354,6 +2351,7 @@ void wined3d_context_gl_destroy(struct wined3d_context_gl *context_gl) context_gl->c.destroy_delayed = 1; /* FIXME: Get rid of a pointer to swapchain from wined3d_context. */ context_gl->c.swapchain = NULL; + context_gl->c.device = NULL; return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b7d0b1adebc..7d2d9a61552 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1225,6 +1225,14 @@ void wined3d_device_gl_delete_opengl_contexts_cs(void *object) else wined3d_context_gl_destroy(wined3d_context_gl(device->contexts[0])); } + + if (device_gl->backup_dc) + { + TRACE("Destroying backup wined3d window %p, dc %p.\n", device_gl->backup_wnd, device_gl->backup_dc); + + wined3d_release_dc(device_gl->backup_wnd, device_gl->backup_dc); + DestroyWindow(device_gl->backup_wnd); + } } void wined3d_device_gl_create_primary_opengl_context_cs(void *object) @@ -5913,6 +5921,33 @@ void CDECL wined3d_device_get_gamma_ramp(const struct wined3d_device *device, wined3d_swapchain_get_gamma_ramp(swapchain, ramp); } +HDC wined3d_device_gl_get_backup_dc(struct wined3d_device_gl *device_gl) +{ + TRACE("device_gl %p.\n", device_gl); + + if (!device_gl->backup_dc) + { + TRACE("Creating the backup window for device %p.\n", device_gl); + + if (!(device_gl->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", + WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) + { + ERR("Failed to create a window.\n"); + return NULL; + } + + if (!(device_gl->backup_dc = GetDC(device_gl->backup_wnd))) + { + ERR("Failed to get a DC.\n"); + DestroyWindow(device_gl->backup_wnd); + device_gl->backup_wnd = NULL; + return NULL; + } + } + + return device_gl->backup_dc; +} + void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) { TRACE("device %p, resource %p.\n", device, resource); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 1712cda2373..79ee427572f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -98,14 +98,6 @@ void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) wined3d_cs_destroy_object(cs, wined3d_swapchain_gl_destroy_object, swapchain_gl); wined3d_cs_finish(cs, WINED3D_CS_QUEUE_DEFAULT); - - if (swapchain_gl->backup_dc) - { - TRACE("Destroying backup wined3d window %p, dc %p.\n", swapchain_gl->backup_wnd, swapchain_gl->backup_dc); - - wined3d_release_dc(swapchain_gl->backup_wnd, swapchain_gl->backup_dc); - DestroyWindow(swapchain_gl->backup_wnd); - } } static void wined3d_swapchain_vk_destroy_vulkan_swapchain(struct wined3d_swapchain_vk *swapchain_vk) @@ -610,7 +602,8 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, TRACE("Presenting DC %p.\n", context_gl->dc); pixel_format = &wined3d_adapter_gl(swapchain->device->adapter)->pixel_formats[context_gl->pixel_format]; - if (context_gl->dc == swapchain_gl->backup_dc || (pixel_format->swap_method != WGL_SWAP_COPY_ARB + if (context_gl->dc == wined3d_device_gl(swapchain->device)->backup_dc + || (pixel_format->swap_method != WGL_SWAP_COPY_ARB && swapchain_present_is_partial_copy(swapchain, dst_rect))) { swapchain_blit_gdi(swapchain, context, src_rect, dst_rect); @@ -1842,31 +1835,6 @@ struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapc return wined3d_swapchain_gl_create_context(swapchain_gl); } -HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) -{ - if (!swapchain_gl->backup_dc) - { - TRACE("Creating the backup window for swapchain %p.\n", swapchain_gl); - - if (!(swapchain_gl->backup_wnd = CreateWindowA(WINED3D_OPENGL_WINDOW_CLASS_NAME, "WineD3D fake window", - WS_OVERLAPPEDWINDOW, 10, 10, 10, 10, NULL, NULL, NULL, NULL))) - { - ERR("Failed to create a window.\n"); - return NULL; - } - - if (!(swapchain_gl->backup_dc = GetDC(swapchain_gl->backup_wnd))) - { - ERR("Failed to get a DC.\n"); - DestroyWindow(swapchain_gl->backup_wnd); - swapchain_gl->backup_wnd = NULL; - return NULL; - } - } - - return swapchain_gl->backup_dc; -} - void swapchain_update_draw_bindings(struct wined3d_swapchain *swapchain) { UINT i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cbee46740b1..47904390ed3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4294,6 +4294,9 @@ struct wined3d_device_gl } *retired_blocks; SIZE_T retired_blocks_size; SIZE_T retired_block_count; + + HWND backup_wnd; + HDC backup_dc; }; static inline struct wined3d_device_gl *wined3d_device_gl(struct wined3d_device *device) @@ -4331,6 +4334,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, GLenum usage, bool coherent, GLbitfield flags, struct wined3d_bo_gl *bo) DECLSPEC_HIDDEN; void wined3d_device_gl_create_primary_opengl_context_cs(void *object) DECLSPEC_HIDDEN; void wined3d_device_gl_delete_opengl_contexts_cs(void *object) DECLSPEC_HIDDEN; +HDC wined3d_device_gl_get_backup_dc(struct wined3d_device_gl *device_gl) DECLSPEC_HIDDEN; GLbitfield wined3d_device_gl_get_memory_type_flags(unsigned int memory_type_idx) DECLSPEC_HIDDEN; static inline float wined3d_alpha_ref(const struct wined3d_state *state) @@ -5708,9 +5712,6 @@ struct wined3d_swapchain_gl struct wined3d_context_gl **contexts; SIZE_T contexts_size; SIZE_T context_count; - - HDC backup_dc; - HWND backup_wnd; }; static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_swapchain *swapchain) @@ -5720,7 +5721,6 @@ static inline struct wined3d_swapchain_gl *wined3d_swapchain_gl(struct wined3d_s void wined3d_swapchain_gl_cleanup(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; void wined3d_swapchain_gl_destroy_contexts(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; -HDC wined3d_swapchain_gl_get_backup_dc(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_swapchain_gl_get_context(struct wined3d_swapchain_gl *swapchain_gl) DECLSPEC_HIDDEN; HRESULT wined3d_swapchain_gl_init(struct wined3d_swapchain_gl *swapchain_gl, struct wined3d_device *device, struct wined3d_swapchain_desc *desc,

1 0