November 2021 - Wine-Commits

Alexandre Julliard : ntdll: Add a helper function to build an import dll name.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: eb6a9151d6e23012df49d8ab1edff2e6b7830c69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb6a9151d6e23012df49d8ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 24 12:17:20 2021 +0100 ntdll: Add a helper function to build an import dll name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 53 +++++++++++++++++++++-------------------------------- 1 file changed, 21 insertions(+), 32 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index a6d5063dcf7..2ce39585fac 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -587,6 +587,21 @@ static WINE_MODREF *find_fileid_module( const struct file_id *id ) return NULL; } + +/********************************************************************** + * build_import_name + */ +static NTSTATUS build_import_name( WCHAR buffer[256], const char *import, int len ) +{ + while (len && import[len-1] == ' ') len--; /* remove trailing spaces */ + if (len + sizeof(".dll") > 256) return STATUS_DLL_NOT_FOUND; + ascii_to_unicode( buffer, import, len ); + buffer[len] = 0; + if (!wcschr( buffer, '.' )) wcscpy( buffer + len, L".dll" ); + return STATUS_SUCCESS; +} + + /*********************************************************************** * is_import_dll_system */ @@ -716,26 +731,17 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS const IMAGE_EXPORT_DIRECTORY *exports; DWORD exp_size; WINE_MODREF *wm; - WCHAR buffer[32], *mod_name = buffer; + WCHAR mod_name[256]; const char *end = strrchr(forward, '.'); FARPROC proc = NULL; if (!end) return NULL; - if ((end - forward) * sizeof(WCHAR) > sizeof(buffer) - sizeof(L".dll")) - { - if (!(mod_name = RtlAllocateHeap( GetProcessHeap(), 0, - (end - forward + sizeof(L".dll")) * sizeof(WCHAR) ))) - return NULL; - } - ascii_to_unicode( mod_name, forward, end - forward ); - mod_name[end - forward] = 0; - if (!wcschr( mod_name, '.' )) - memcpy( mod_name + (end - forward), L".dll", sizeof(L".dll") ); + if (build_import_name( mod_name, forward, end - forward )) return NULL; if (!(wm = find_basename_module( mod_name ))) { TRACE( "delay loading %s for '%s'\n", debugstr_w(mod_name), forward ); - if (load_dll( load_path, mod_name, L".dll", 0, &wm ) == STATUS_SUCCESS && + if (load_dll( load_path, mod_name, NULL, 0, &wm ) == STATUS_SUCCESS && !(wm->ldr.Flags & LDR_DONT_RESOLVE_REFS)) { if (!imports_fixup_done && current_modref) @@ -751,7 +757,6 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS if (!wm) { - if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); ERR( "module not found for forward '%s' used by %s\n", forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer) ); return NULL; @@ -776,7 +781,6 @@ static FARPROC find_forwarded_export( HMODULE module, const char *forward, LPCWS forward, debugstr_w(get_modref(module)->ldr.FullDllName.Buffer), debugstr_w(get_modref(module)->ldr.BaseDllName.Buffer) ); } - if (mod_name != buffer) RtlFreeHeap( GetProcessHeap(), 0, mod_name ); return proc; } @@ -909,7 +913,7 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP DWORD exp_size; const IMAGE_THUNK_DATA *import_list; IMAGE_THUNK_DATA *thunk_list; - WCHAR buffer[32]; + WCHAR buffer[256]; const char *name = get_rva( module, descr->Name ); DWORD len = strlen(name); PVOID protect_base; @@ -929,23 +933,8 @@ static BOOL import_dll( HMODULE module, const IMAGE_IMPORT_DESCRIPTOR *descr, LP return TRUE; } - while (len && name[len-1] == ' ') len--; /* remove trailing spaces */ - - if (len * sizeof(WCHAR) < sizeof(buffer)) - { - ascii_to_unicode( buffer, name, len ); - buffer[len] = 0; - status = load_dll( load_path, buffer, L".dll", 0, &wmImp ); - } - else /* need to allocate a larger buffer */ - { - WCHAR *ptr = RtlAllocateHeap( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (!ptr) return FALSE; - ascii_to_unicode( ptr, name, len ); - ptr[len] = 0; - status = load_dll( load_path, ptr, L".dll", 0, &wmImp ); - RtlFreeHeap( GetProcessHeap(), 0, ptr ); - } + status = build_import_name( buffer, name, len ); + if (!status) status = load_dll( load_path, buffer, NULL, 0, &wmImp ); if (status) {

1 0

Alexandre Julliard : ntdll: Merge the calls to find_builtin_without_file().
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: f10a85de60ee42bd4abef24396b1f5a0156fae9f URL: https://source.winehq.org/git/wine.git/?a=commit;h=f10a85de60ee42bd4abef243… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 24 14:19:50 2021 +0100 ntdll: Merge the calls to find_builtin_without_file(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 508e4214f19..e32df565c64 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2786,6 +2786,14 @@ static NTSTATUS find_builtin_without_file( const WCHAR *name, UNICODE_STRING *ne NTSTATUS status = STATUS_DLL_NOT_FOUND; BOOL found_image = FALSE; + if (contains_path( name )) return status; + + if (!is_prefix_bootstrap) + { + /* 16-bit files can't be loaded from the prefix */ + if (!name[1] || wcscmp( name + wcslen(name) - 2, L"16" )) return status; + } + if (!get_env_var( L"WINEBUILDDIR", 20 + 2 * wcslen(name), new_name )) { len = new_name->Length; @@ -2885,10 +2893,7 @@ static NTSTATUS search_dll_file( LPCWSTR paths, LPCWSTR search, UNICODE_STRING * paths = ptr; } - if (found_image) - status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; - else if (is_prefix_bootstrap && !contains_path( search )) - status = find_builtin_without_file( search, nt_name, pwm, mapping, image_info, id ); + if (found_image) status = STATUS_IMAGE_MACHINE_TYPE_MISMATCH; done: RtlFreeHeap( GetProcessHeap(), 0, name ); @@ -2936,14 +2941,14 @@ static NTSTATUS find_dll_file( const WCHAR *load_path, const WCHAR *libname, UNI } if (RtlDetermineDosPathNameType_U( libname ) == RELATIVE_PATH) + { status = search_dll_file( load_path, libname, nt_name, pwm, mapping, image_info, id ); + if (status == STATUS_DLL_NOT_FOUND) + status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); + } else if (!(status = RtlDosPathNameToNtPathName_U_WithStatus( libname, nt_name, NULL, NULL ))) status = open_dll_file( nt_name, pwm, mapping, image_info, id ); - /* 16-bit files can't be loaded from the prefix */ - if (status && libname[0] && libname[1] && !wcscmp( libname + wcslen(libname) - 2, L"16" ) && !contains_path( libname )) - status = find_builtin_without_file( libname, nt_name, pwm, mapping, image_info, id ); - if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH) status = STATUS_INVALID_IMAGE_FORMAT; done:

1 0

Henri Verbeet : wined3d: Do not add the BO address offset when calling glFlushMappedBufferRange().
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 052dbb427d6d1097babb346b9eb3768d3ad05cc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=052dbb427d6d1097babb346b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 23 21:17:08 2021 -0600 wined3d: Do not add the BO address offset when calling glFlushMappedBufferRange(). Fixes: c2f0ae50b4dd70aa9d364ec6a7dd728e65370d8b Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 3c57bcbe249..0b0d594b4b1 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2759,8 +2759,9 @@ static void flush_bo_ranges(struct wined3d_context_gl *context_gl, const struct { for (i = 0; i < range_count; ++i) { - GL_EXTCALL(glFlushMappedBufferRange(bo->binding, - (UINT_PTR)data->addr + ranges[i].offset, ranges[i].size)); + /* The offset passed to glFlushMappedBufferRange() is relative to + * the mapped range, so don't add data->addr in this case. */ + GL_EXTCALL(glFlushMappedBufferRange(bo->binding, ranges[i].offset, ranges[i].size)); } } else if (gl_info->supported[APPLE_FLUSH_BUFFER_RANGE])

1 0

Connor McAdams : oleaut32: Implement LPSAFEARRAY user marshal interface marshaling.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: a1f2b44a1bf9ecbcf772aa8509f87c2be1ccc415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1f2b44a1bf9ecbcf772aa85… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 23 20:07:30 2021 -0500 oleaut32: Implement LPSAFEARRAY user marshal interface marshaling. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/usrmarshal.c | 112 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 86 insertions(+), 26 deletions(-) diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index 5eeafb8e378..fe21520b2e7 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -268,7 +268,7 @@ static unsigned int get_type_alignment(ULONG *pFlags, VARTYPE vt) } /* WdtpInterfacePointer_UserSize takes care of 2 additional DWORDs to store marshalling buffer size */ -static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *punk) +static unsigned interface_user_size(ULONG *pFlags, ULONG Start, REFIID riid, IUnknown *punk) { ULONG size = 0; @@ -283,7 +283,7 @@ static unsigned interface_variant_size(ULONG *pFlags, REFIID riid, IUnknown *pun } size += sizeof(ULONG); TRACE("wire-size extra of interface variant is %d\n", size); - return size; + return Start + size; } static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) @@ -304,13 +304,13 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) case VT_VARIANT | VT_BYREF: return VARIANT_UserSize(pFlags, Start, V_VARIANTREF(pvar)); case VT_UNKNOWN: - return Start + interface_variant_size(pFlags, &IID_IUnknown, V_UNKNOWN(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, V_UNKNOWN(pvar)); case VT_UNKNOWN | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IUnknown, *V_UNKNOWNREF(pvar)); case VT_DISPATCH: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); case VT_DISPATCH | VT_BYREF: - return Start + interface_variant_size(pFlags, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + return interface_user_size(pFlags, Start, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); case VT_RECORD: FIXME("wire-size record\n"); return Start; @@ -324,7 +324,7 @@ static ULONG wire_extra_user_size(ULONG *pFlags, ULONG Start, VARIANT *pvar) } /* helper: called for VT_DISPATCH variants to marshal the IDispatch* into the buffer */ -static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char* interface_user_marshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown *punk) { TRACE("pFlags=%d, Buffer=%p, pUnk=%p\n", *pFlags, Buffer, punk); @@ -345,7 +345,7 @@ static unsigned char* interface_variant_marshal(ULONG *pFlags, unsigned char *Bu } /* helper: called for VT_DISPATCH / VT_UNKNOWN variants to unmarshal the buffer */ -static unsigned char *interface_variant_unmarshal(ULONG *pFlags, unsigned char *Buffer, +static unsigned char *interface_user_unmarshal(ULONG *pFlags, unsigned char *Buffer, REFIID riid, IUnknown **ppunk) { DWORD ptr; @@ -459,16 +459,16 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, Pos = VARIANT_UserMarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IUnknown, *V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); + Pos = interface_user_marshal(pFlags, Pos, &IID_IDispatch, (IUnknown*)*V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -590,16 +590,16 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe Pos = VARIANT_UserUnmarshal(pFlags, Pos, V_VARIANTREF(pvar)); break; case VT_UNKNOWN: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, &V_UNKNOWN(pvar)); break; case VT_UNKNOWN | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IUnknown, V_UNKNOWNREF(pvar)); break; case VT_DISPATCH: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)&V_DISPATCH(pvar)); break; case VT_DISPATCH | VT_BYREF: - Pos = interface_variant_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); + Pos = interface_user_unmarshal(pFlags, Pos, &IID_IDispatch, (IUnknown**)V_DISPATCHREF(pvar)); break; case VT_RECORD: FIXME("handle BRECORD by val\n"); @@ -733,22 +733,40 @@ static inline SF_TYPE SAFEARRAY_GetUnionType(SAFEARRAY *psa) static DWORD elem_wire_size(LPSAFEARRAY lpsa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_BSTR: + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: return sizeof(DWORD); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(variant_wire_t) - sizeof(DWORD); - else + + default: return lpsa->cbElements; + } } static DWORD elem_mem_size(wireSAFEARRAY wiresa, SF_TYPE sftype) { - if (sftype == SF_BSTR) + switch (sftype) + { + case SF_HAVEIID: + case SF_UNKNOWN: + case SF_DISPATCH: + return sizeof(void *); + + case SF_BSTR: return sizeof(BSTR); - else if (sftype == SF_VARIANT) + + case SF_VARIANT: return sizeof(VARIANT); - else + + default: return wiresa->cbElements; + } } ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY *ppsa) @@ -795,8 +813,22 @@ ULONG WINAPI LPSAFEARRAY_UserSize(ULONG *pFlags, ULONG StartingSize, LPSAFEARRAY case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("size interfaces\n"); + { + IUnknown **lpUnk; + GUID guid; + + if (sftype == SF_HAVEIID) + SafeArrayGetIID(psa, &guid); + else if (sftype == SF_UNKNOWN) + guid = IID_IUnknown; + else + guid = IID_IDispatch; + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + size = interface_user_size(pFlags, size, &guid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -870,7 +902,7 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf Buffer += sizeof(ULONG); hr = SafeArrayGetVartype(psa, &vt); - if (FAILED(hr)) vt = 0; + if ((psa->fFeatures & FADF_HAVEIID) || FAILED(hr)) vt = 0; *(ULONG *)Buffer = (USHORT)psa->cLocks | (vt << 16); Buffer += sizeof(ULONG); @@ -916,8 +948,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserMarshal(ULONG *pFlags, unsigned char *Buf case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = psa->pvData; ulCellCount; ulCellCount--, lpUnk++) + Buffer = interface_user_marshal(pFlags, Buffer, iid, *lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant; @@ -1093,8 +1139,22 @@ unsigned char * WINAPI LPSAFEARRAY_UserUnmarshal(ULONG *pFlags, unsigned char *B case SF_DISPATCH: case SF_UNKNOWN: case SF_HAVEIID: - FIXME("marshal interfaces\n"); + { + IUnknown **lpUnk; + const GUID *iid; + + if (sftype == SF_HAVEIID) + iid = &guid; + else if (sftype == SF_UNKNOWN) + iid = &IID_IUnknown; + else + iid = &IID_IDispatch; + + for (lpUnk = (*ppsa)->pvData; cell_count; cell_count--, lpUnk++) + Buffer = interface_user_unmarshal(pFlags, Buffer, iid, lpUnk); + break; + } case SF_VARIANT: { VARIANT* lpVariant;

1 0

Thomas Faber : comctl32/tests: Fix DC handle leak.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: wine Branch: master Commit: 102d69105059dc05ff632a75213af21c377c859c URL: https://source.winehq.org/git/wine.git/?a=commit;h=102d69105059dc05ff632a75… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Tue Nov 23 19:08:03 2021 -0500 comctl32/tests: Fix DC handle leak. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/rebar.c | 2 +- dlls/comctl32/tests/toolbar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index d0b201a8763..63449d4d457 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -70,7 +70,7 @@ static void init_system_font_height(void) { hDC = CreateCompatibleDC(NULL); GetTextMetricsA(hDC, &tm); - DeleteDC(NULL); + DeleteDC(hDC); system_font_height = tm.tmHeight; } diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 87b4611d056..d238e9f1071 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1023,7 +1023,7 @@ static int system_font_height(void) { hDC = CreateCompatibleDC(NULL); GetTextMetricsA(hDC, &tm); - DeleteDC(NULL); + DeleteDC(hDC); return tm.tmHeight; }

1 0

Conor McCarthy : vkd3d: Only allocate descriptor offsets when descriptor arrays are used.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: vkd3d Branch: master Commit: d6ff603605d33dfbb28a62348670f0d0c9d06f74 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d6ff603605d33dfbb28a623… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 24 00:41:34 2021 +1000 vkd3d: Only allocate descriptor offsets when descriptor arrays are used. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/state.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 413b0a3..cb3f99a 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1170,8 +1170,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa if (!(root_signature->descriptor_mapping = vkd3d_calloc(root_signature->binding_count, sizeof(*root_signature->descriptor_mapping)))) goto fail; - if (!(root_signature->descriptor_offsets = vkd3d_calloc(root_signature->binding_count, - sizeof(*root_signature->descriptor_offsets)))) + if (root_signature->use_descriptor_arrays && !(root_signature->descriptor_offsets = vkd3d_calloc( + root_signature->binding_count, sizeof(*root_signature->descriptor_offsets)))) goto fail; root_signature->root_constant_count = info.root_constant_count; if (!(root_signature->root_constants = vkd3d_calloc(root_signature->root_constant_count,

1 0

Conor McCarthy : vkd3d-shader/spirv: Use runtime descriptor arrays.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: vkd3d Branch: master Commit: 535d4a78b153de25e114096272de5ef12d4e1dd7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=535d4a78b153de25e114096… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Nov 24 00:41:33 2021 +1000 vkd3d-shader/spirv: Use runtime descriptor arrays. Runtime descriptor arrays should be used for descriptor bindings with a variable count. Support for SpvCapabilityRuntimeDescriptorArrayEXT is required by the Vulkan spec as part of descriptor indexing support. The current implementation depends on a separate array declaration for each range because binding_base_idx is stored in the array data. This occurs in practice because binding.count is always different. Use of runtime arrays eliminates the count from the key, so binding_base_idx must be separated from the array data. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 59 ++++++++++++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 24 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=535d4a78b153de25e11…

1 0

Julian Rüger : Remove stray file.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: website Branch: master Commit: 2e3a191f96cef795804f447005778ff0f05217c9 URL: https://source.winehq.org/git/website.git/?a=commit;h=2e3a191f96cef795804f4… Author: Julian Rüger <jr98(a)gmx.net> Date: Mon Nov 22 18:14:52 2021 +0100 Remove stray file. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- freenode.uP4Y16UYccnE.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/freenode.uP4Y16UYccnE.html b/freenode.uP4Y16UYccnE.html deleted file mode 100644 index e69de29b..00000000

1 0

Floris Renaud : Add the news button to the Dutch website.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: website Branch: master Commit: 9394202e0b8ac995b9ed581b8abedbd0e88511ef URL: https://source.winehq.org/git/website.git/?a=commit;h=9394202e0b8ac995b9ed5… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Nov 23 00:39:29 2021 +0100 Add the news button to the Dutch website. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/nl/home.template | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/templates/nl/home.template b/templates/nl/home.template index ea998c7f..b93cdb9e 100644 --- a/templates/nl/home.template +++ b/templates/nl/home.template @@ -114,6 +114,16 @@ </a> <div class="clear"></div> + <a class="winehq_menu_item appdb" href="{$root}/news"> + <span class="winehq_badge fa-4x fa-layers fa-fw"> + <i class="winehq_badge_inner fas fa-square"></i> + <i class="fa-inverse fas fa-newspaper" data-fa-transform="shrink-6"></i> + </span> + <span class="title">Nieuws</span> + <span class="subtitle">Wat is er laatst gebeurd?</span> + </a> + <div class="clear"></div> + <a class="winehq_menu_item appdb" href="https://appdb.winehq.org"> <span class="winehq_badge fa-4x fa-layers fa-fw"> <i class="winehq_badge_inner fas fa-square"></i> @@ -166,6 +176,10 @@  - <p><a href="{$root}/news" class="btn btn-default"><span class="glyphicon glyphicon-chevron-right"></span> meer nieuws...</a></p> + <p> + <a href="{$root}/news" class="btn btn-default"><i class="fas fa-chevron-right"></i> Nieuwsarchief</a> +   + <a href="{$root}/wwn" class="btn btn-default"><i class="fas fa-newspaper"></i> World Wine Nieuws</a> + </p> </div>

1 0

Floris Renaud : Add the Dutch wwn template.
by Alexandre Julliard Nov. 24, 2021

Nov. 24, 2021

Module: website Branch: master Commit: c9afb6c9297e06d6a57ff399238c069f65fc49a1 URL: https://source.winehq.org/git/website.git/?a=commit;h=c9afb6c9297e06d6a57ff… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Tue Nov 23 00:39:31 2021 +0100 Add the Dutch wwn template. Signed-off-by: Floris Renaud <jkfloris(a)dds.nl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- templates/nl/wwn.template | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/templates/nl/wwn.template b/templates/nl/wwn.template new file mode 100644 index 00000000..d3c397a7 --- /dev/null +++ b/templates/nl/wwn.template @@ -0,0 +1,9 @@ + + + + +<h1 class="title"><i class="far fa-newspaper"></i> World Wine Nieuws</h1> + +<p class="margin-bottom-lg">Misschien wel het beste nieuws van Wine in het Engels.</p> + +

1 0