August 2021 - Wine-Devel - list.winehq.org

[PATCH] dbghelp: let SymGetTypeFromName fill more fields in SYMBOL_INFO
by Eric Pouech Aug. 20, 2021

Aug. 20, 2021

--- dlls/dbghelp/type.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 8e91eb3c554..1a7cef9b7c0 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -925,6 +925,8 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, { struct module_pair pair; struct symt* type; + const char* name; + DWORD64 size; pair.pcs = process_find_by_handle(hProcess); if (!pair.pcs) return FALSE; @@ -932,7 +934,19 @@ BOOL WINAPI SymGetTypeFromName(HANDLE hProcess, ULONG64 BaseOfDll, if (!module_get_debug(&pair)) return FALSE; type = symt_find_type_by_name(pair.effective, SymTagNull, Name); if (!type) return FALSE; - Symbol->TypeIndex = symt_ptr2index(pair.effective, type); - + Symbol->Index = Symbol->TypeIndex = symt_ptr2index(pair.effective, type); + if (Symbol->MaxNameLen) + { + name = symt_get_name(type); + Symbol->NameLen = min(strlen(name), Symbol->MaxNameLen - 1); + memcpy(Symbol->Name, name, Symbol->NameLen); + Symbol->Name[Symbol->NameLen] = '\0'; + } + else + Symbol->NameLen = 0; + symt_get_info(pair.effective, type, TI_GET_LENGTH, &size); + Symbol->Size = size; + Symbol->ModBase = pair.requested->module.BaseOfImage; + Symbol->Tag = type->tag; return TRUE; }

1 0

[PATCH] dbghelp: handling of complex location in dwarf
by Eric Pouech Aug. 20, 2021

Aug. 20, 2021

Don't recompute the location when we need to store a location block for later recomputation. It had also the bad side effect of letting the location to be absolute, which wasn't expected at all. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dwarf.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 53274c4f597..a4f426ca6a0 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -930,7 +930,6 @@ static BOOL dwarf2_compute_location_attr(dwarf2_parse_context_t* ctx, *ptr = xloc.u.block.size; memcpy(ptr + 1, xloc.u.block.ptr, xloc.u.block.size); loc->offset = (ULONG_PTR)ptr; - compute_location(ctx->module, &lctx, loc, NULL, frame); } } return TRUE;

1 0

[PATCH] dbghelp: return name of compiland in SymGetTypeInfo
by Eric Pouech Aug. 20, 2021

Aug. 20, 2021

Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 1 + dlls/dbghelp/type.c | 2 ++ 3 files changed, 4 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 3415fc1557c..d87b1b5ecde 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -164,6 +164,7 @@ struct symt_block struct symt_compiland { struct symt symt; + struct module* module; ULONG_PTR address; unsigned source; struct vector vchildren; /* global variables & functions */ diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..df952fc3984 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -190,6 +190,7 @@ struct symt_compiland* symt_new_compiland(struct module* module, if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) { sym->symt.tag = SymTagCompiland; + sym->module = module; sym->address = address; sym->source = src_idx; vector_init(&sym->vchildren, sizeof(struct symt*), 32); diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 374b69aeb08..8e91eb3c554 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -87,6 +87,8 @@ const char* symt_get_name(const struct symt* sym) case SymTagBaseType: return ((const struct symt_basic*)sym)->hash_elt.name; case SymTagLabel: return ((const struct symt_hierarchy_point*)sym)->hash_elt.name; case SymTagThunk: return ((const struct symt_thunk*)sym)->hash_elt.name; + case SymTagCompiland: return source_get(((const struct symt_compiland*)sym)->module, + ((const struct symt_compiland*)sym)->source); /* hierarchy tree */ case SymTagEnum: return ((const struct symt_enum*)sym)->name; case SymTagTypedef: return ((const struct symt_typedef*)sym)->hash_elt.name;

1 0

[PATCH] kernelbase: Handle 2 full paths in PathAllocCombine.
by Daniel Lehman Aug. 20, 2021

Aug. 20, 2021

3 2

[PATCH v2] quartz: Change reference increasing method to avoid unintended DLL unloading.
by Hiroki Awata Aug. 19, 2021

Aug. 19, 2021

Incrementing object_locks by DSCF_CreateInstance is sometimes wrong. For example, dsound_render_create creates two instances because it calls system_clock_create internally, but object_locks is only increased by 1. Each create function should increase the object_locks instead of DSCF_CreateInstance. Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/quartz/acmwrapper.c | 1 + dlls/quartz/avidec.c | 1 + dlls/quartz/dsoundrender.c | 1 + dlls/quartz/filesource.c | 1 + dlls/quartz/filtergraph.c | 1 + dlls/quartz/filtermapper.c | 3 +++ dlls/quartz/main.c | 1 - dlls/quartz/memallocator.c | 1 + dlls/quartz/passthrough.c | 1 + dlls/quartz/systemclock.c | 1 + dlls/quartz/vmr9.c | 1 + 11 files changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..0804c18b3c8 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -534,6 +534,7 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) object->lasttime_real = object->lasttime_sent = -1; + InterlockedIncrement(&object_locks); TRACE("Created ACM wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..8191b703553 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -611,6 +611,7 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, &object->sink.pin.IPin_iface); + InterlockedIncrement(&object_locks); TRACE("Created AVI decompressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..521a97ca359 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1049,6 +1049,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) object->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; object->IQualityControl_iface.lpVtbl = &dsound_render_qc_vtbl; + InterlockedIncrement(&object_locks); TRACE("Created DirectSound renderer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..12830d404b8 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -430,6 +430,7 @@ HRESULT async_reader_create(IUnknown *outer, IUnknown **out) object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); object->io_thread = CreateThread(NULL, 0, io_thread, object, 0, NULL); + InterlockedIncrement(&object_locks); TRACE("Created file source %p.\n", object); *out = &object->filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..6b13fca6787 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5652,6 +5652,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL else object->message_thread = NULL; + InterlockedIncrement(&object_locks); TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..249867da8c8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -195,6 +195,7 @@ static HRESULT enum_reg_filters_create(REGFILTER *filters, unsigned int count, I object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumRegFilters_iface; return S_OK; @@ -329,6 +330,7 @@ static HRESULT enum_moniker_create(IMoniker **filters, unsigned int count, IEnum object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumMoniker_iface; return S_OK; @@ -1701,6 +1703,7 @@ HRESULT filter_mapper_create(IUnknown *pUnkOuter, IUnknown **out) else pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; + InterlockedIncrement(&object_locks); TRACE("Created filter mapper %p.\n", pFM2impl); *out = &pFM2impl->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..282c56e6c7f 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -127,7 +127,6 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..1bc4d1d0041 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -936,5 +936,6 @@ HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) else CoTaskMemFree(pMemAlloc); + InterlockedIncrement(&object_locks); return hr; } diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..e576547f934 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -108,6 +108,7 @@ HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) strmbase_passthrough_init(&object->passthrough, object->outer_unk); + InterlockedIncrement(&object_locks); TRACE("Created seeking passthrough %p.\n", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..917cde99681 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -339,6 +339,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + InterlockedIncrement(&object_locks); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..df50a32d514 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2587,6 +2587,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + InterlockedIncrement(&object_locks); TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; -- 2.27.0

3 2

pending patches
by Eric Pouech Aug. 19, 2021

Aug. 19, 2021

Hi Alexandre, there are a bunch of patches - https://www.winehq.org/pipermail/wine-devel/2021-August/192926.html - ot the serie https://www.winehq.org/pipermail/wine-devel/2021-July/190750.html which are neither committed nor being commented upon would you mind giving some feedback on the status of those? TIA -- Eric Pouech

2 1

[PATCH v3 1/2] quartz: Change reference increasing method to avoid unintended DLL unloading.
by Hiroki Awata Aug. 19, 2021

Aug. 19, 2021

Incrementing object_locks by DSCF_CreateInstance is sometimes wrong. For example, dsound_render_create creates two instances because it calls system_clock_create internally, but object_locks is only increased by 1. Each create function should increase the object_locks instead of DSCF_CreateInstance. Signed-off-by: Hiroki Awata <castaneai(a)by.black> --- dlls/quartz/acmwrapper.c | 1 + dlls/quartz/avidec.c | 1 + dlls/quartz/dsoundrender.c | 1 + dlls/quartz/filesource.c | 1 + dlls/quartz/filtergraph.c | 1 + dlls/quartz/filtermapper.c | 3 +++ dlls/quartz/main.c | 1 - dlls/quartz/memallocator.c | 5 +++++ dlls/quartz/passthrough.c | 1 + dlls/quartz/systemclock.c | 1 + dlls/quartz/videorenderer.c | 1 + dlls/quartz/vmr9.c | 1 + 12 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 81e856a00df..0804c18b3c8 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -534,6 +534,7 @@ HRESULT acm_wrapper_create(IUnknown *outer, IUnknown **out) object->lasttime_real = object->lasttime_sent = -1; + InterlockedIncrement(&object_locks); TRACE("Created ACM wrapper %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index b1e07fe5879..8191b703553 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -611,6 +611,7 @@ HRESULT avi_dec_create(IUnknown *outer, IUnknown **out) ISeekingPassThru_Init(&object->passthrough.ISeekingPassThru_iface, FALSE, &object->sink.pin.IPin_iface); + InterlockedIncrement(&object_locks); TRACE("Created AVI decompressor %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 68c88ea5a15..521a97ca359 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -1049,6 +1049,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out) object->IAMDirectSound_iface.lpVtbl = &IAMDirectSound_Vtbl; object->IQualityControl_iface.lpVtbl = &dsound_render_qc_vtbl; + InterlockedIncrement(&object_locks); TRACE("Created DirectSound renderer %p.\n", object); *out = &object->filter.IUnknown_inner; diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index cf5fe457715..12830d404b8 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -430,6 +430,7 @@ HRESULT async_reader_create(IUnknown *outer, IUnknown **out) object->port = CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, 0, 0); object->io_thread = CreateThread(NULL, 0, io_thread, object, 0, NULL); + InterlockedIncrement(&object_locks); TRACE("Created file source %p.\n", object); *out = &object->filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index a1f3757a202..6b13fca6787 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -5652,6 +5652,7 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL else object->message_thread = NULL; + InterlockedIncrement(&object_locks); TRACE("Created %sthreaded filter graph %p.\n", threaded ? "" : "non-", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index b3210fdcd59..249867da8c8 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -195,6 +195,7 @@ static HRESULT enum_reg_filters_create(REGFILTER *filters, unsigned int count, I object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumRegFilters_iface; return S_OK; @@ -329,6 +330,7 @@ static HRESULT enum_moniker_create(IMoniker **filters, unsigned int count, IEnum object->refcount = 1; object->count = count; + InterlockedIncrement(&object_locks); TRACE("Created enumerator %p.\n", object); *out = &object->IEnumMoniker_iface; return S_OK; @@ -1701,6 +1703,7 @@ HRESULT filter_mapper_create(IUnknown *pUnkOuter, IUnknown **out) else pFM2impl->outer_unk = &pFM2impl->IUnknown_inner; + InterlockedIncrement(&object_locks); TRACE("Created filter mapper %p.\n", pFM2impl); *out = &pFM2impl->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 303cc30a931..282c56e6c7f 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -127,7 +127,6 @@ static HRESULT WINAPI DSCF_CreateInstance(IClassFactory *iface, IUnknown *pOuter if (SUCCEEDED(hres = This->create_instance(pOuter, &punk))) { - InterlockedIncrement(&object_locks); hres = IUnknown_QueryInterface(punk, riid, ppobj); IUnknown_Release(punk); } diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index cc13f776cfb..966346ed7ce 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -932,9 +932,14 @@ HRESULT mem_allocator_create(IUnknown *lpUnkOuter, IUnknown **out) pMemAlloc->pMemory = NULL; if (SUCCEEDED(hr = BaseMemAllocator_Init(StdMemAllocator_Alloc, StdMemAllocator_Free, NULL, NULL, NULL, StdMemAllocator_Destroy, &pMemAlloc->csState, &pMemAlloc->base))) + { *out = (IUnknown *)&pMemAlloc->base.IMemAllocator_iface; + InterlockedIncrement(&object_locks); + } else + { CoTaskMemFree(pMemAlloc); + } return hr; } diff --git a/dlls/quartz/passthrough.c b/dlls/quartz/passthrough.c index 7f81ae8a1be..e576547f934 100644 --- a/dlls/quartz/passthrough.c +++ b/dlls/quartz/passthrough.c @@ -108,6 +108,7 @@ HRESULT seeking_passthrough_create(IUnknown *outer, IUnknown **out) strmbase_passthrough_init(&object->passthrough, object->outer_unk); + InterlockedIncrement(&object_locks); TRACE("Created seeking passthrough %p.\n", object); *out = &object->IUnknown_inner; return S_OK; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 73a923a7b99..917cde99681 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -339,6 +339,7 @@ HRESULT system_clock_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->cs); object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SystemClockImpl.cs"); + InterlockedIncrement(&object_locks); TRACE("Created system clock %p.\n", object); *out = &object->IUnknown_inner; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 1a59a9b5213..7b248a01438 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -496,6 +496,7 @@ HRESULT video_renderer_create(IUnknown *outer, IUnknown **out) return hr; } + InterlockedIncrement(&object_locks); TRACE("Created video renderer %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2562b74932a..df50a32d514 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -2587,6 +2587,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) object->mixing_prefs = MixerPref9_NoDecimation | MixerPref9_ARAdjustXorY | MixerPref9_BiLinearFiltering | MixerPref9_RenderTargetRGB; + InterlockedIncrement(&object_locks); TRACE("Created VMR %p.\n", object); *out = &object->renderer.filter.IUnknown_inner; return S_OK; -- 2.27.0

1 1

[PATCH] include: Add ID3DX10Mesh definition.
by Nikolay Sivov Aug. 19, 2021

Aug. 19, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/Makefile.in | 1 + include/d3dx10.h | 1 + include/d3dx10mesh.h | 99 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 include/d3dx10mesh.h diff --git a/include/Makefile.in b/include/Makefile.in index 0163b9b0951..5d5caf74c63 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -144,6 +144,7 @@ SOURCES = \ d3dx10async.h \ d3dx10core.h \ d3dx10math.h \ + d3dx10mesh.h \ d3dx10tex.h \ d3dx11.h \ d3dx11async.h \ diff --git a/include/d3dx10.h b/include/d3dx10.h index 7062d24ea09..cb7b65c53cc 100644 --- a/include/d3dx10.h +++ b/include/d3dx10.h @@ -31,6 +31,7 @@ #include "d3dx10core.h" #include "d3dx10async.h" #include "d3dx10tex.h" +#include "d3dx10mesh.h" #define _FACDD 0x876 #define MAKE_DDHRESULT(code) MAKE_HRESULT(1, _FACDD, code) diff --git a/include/d3dx10mesh.h b/include/d3dx10mesh.h new file mode 100644 index 00000000000..d813ef68df2 --- /dev/null +++ b/include/d3dx10mesh.h @@ -0,0 +1,99 @@ +/* + * Copyright 2021 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "d3dx10.h" + +DEFINE_GUID(IID_ID3DX10Mesh, 0x4020e5c2, 0x1403, 0x4929, 0x88, 0x3f, 0xe2, 0xe8, 0x49, 0xfa, 0xc1, 0x95); +DEFINE_GUID(IID_ID3DX10MeshBuffer, 0x4b0d117, 0x1041, 0x46b1, 0xaa, 0x8a, 0x39, 0x52, 0x84, 0x8b, 0xa2, 0x2e); + +typedef enum _D3DX10_MESH_DISCARD_FLAGS +{ + D3DX10_MESH_DISCARD_ATTRIBUTE_BUFFER = 0x01, + D3DX10_MESH_DISCARD_ATTRIBUTE_TABLE = 0x02, + D3DX10_MESH_DISCARD_POINTREPS = 0x04, + D3DX10_MESH_DISCARD_ADJACENCY = 0x08, + D3DX10_MESH_DISCARD_DEVICE_BUFFERS = 0x10, +} D3DX10_MESH_DISCARD_FLAGS; + +typedef struct _D3DX10_ATTRIBUTE_RANGE +{ + UINT AttribId; + UINT FaceStart; + UINT FaceCount; + UINT VertexStart; + UINT VertexCount; +} D3DX10_ATTRIBUTE_RANGE; +typedef D3DX10_ATTRIBUTE_RANGE* LPD3DX10_ATTRIBUTE_RANGE; + +#define INTERFACE ID3DX10MeshBuffer +DECLARE_INTERFACE_(ID3DX10MeshBuffer, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10MeshBuffer methods ***/ + STDMETHOD(Map)(THIS_ void **data, SIZE_T *size) PURE; + STDMETHOD(Unmap)(THIS) PURE; + STDMETHOD_(SIZE_T, GetSize)(THIS) PURE; +}; +#undef INTERFACE + +#define INTERFACE ID3DX10Mesh +DECLARE_INTERFACE_(ID3DX10Mesh, IUnknown) +{ + /*** IUnknown methods ***/ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **out) PURE; + STDMETHOD_(ULONG, AddRef)(THIS) PURE; + STDMETHOD_(ULONG, Release)(THIS) PURE; + /*** ID3DX10Mesh methods ***/ + STDMETHOD_(UINT, GetFaceCount)(THIS) PURE; + STDMETHOD_(UINT, GetVertexCount)(THIS) PURE; + STDMETHOD_(UINT, GetVertexBufferCount)(THIS) PURE; + STDMETHOD_(UINT, GetFlags)(THIS) PURE; + STDMETHOD(GetVertexDescription)(THIS_ const D3D10_INPUT_ELEMENT_DESC **desc, UINT *count) PURE; + STDMETHOD(SetVertexData)(THIS_ UINT index, const void *data) PURE; + STDMETHOD(GetVertexBuffer)(THIS_ UINT index, ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetIndexData)(THIS_ const void *data, UINT count) PURE; + STDMETHOD(GetIndexBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetAttributeData)(THIS_ const UINT *data) PURE; + STDMETHOD(GetAttributeBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetAttributeTable)(THIS_ const D3DX10_ATTRIBUTE_RANGE *table, UINT size) PURE; + STDMETHOD(GetAttributeTable)(THIS_ D3DX10_ATTRIBUTE_RANGE *table, UINT *size) PURE; + STDMETHOD(GenerateAdjacencyAndPointReps)(THIS_ float epsilon) PURE; + STDMETHOD(GenerateGSAdjacency)(THIS) PURE; + STDMETHOD(SetAdjacencyData)(THIS_ const UINT *adjacency) PURE; + STDMETHOD(GetAdjacenctBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(SetPointRepData)(THIS_ const UINT *pointreps) PURE; + STDMETHOD(GetPointRepBuffer)(THIS_ ID3DX10MeshBuffer **buffer) PURE; + STDMETHOD(Discard)(THIS_ D3DX10_MESH_DISCARD_FLAGS flags) PURE; + STDMETHOD(CloneMesh)(THIS_ UINT flags, const char *pos_semantic, const D3D10_INPUT_ELEMENT_DESC *desc, + UINT decl_count, ID3DX10Mesh **cloned_mesh); + STDMETHOD(Optimize)(THIS_ UINT flags, UINT *face_remap, ID3D10Blob **vertex_remap) PURE; + STDMETHOD(GenerateAttributeBufferFromTable)(THIS) PURE; + STDMETHOD(Intersect)(THIS_ D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, UINT *face_index, + float *u, float *v, float *dist, ID3D10Blob **all_hits) PURE; + STDMETHOD(IntersectSubset)(THIS_ UINT attr_id, D3DXVECTOR3 *ray_pos, D3DXVECTOR3 *ray_dir, UINT *hit_count, + float *u, float *v, float *dist, ID3D10Blob **all_hits) PURE; + STDMETHOD(CommitToDevice)(THIS) PURE; + STDMETHOD(DrawSubset)(THIS_ UINT attr_id) PURE; + STDMETHOD(DrawSubsetInstanced)(THIS_ UINT attr_id, UINT instance_count, UINT start_instance) PURE; + STDMETHOD(GetDeviceVertexBuffer)(THIS_ UINT index, ID3D10Buffer **buffer) PURE; + STDMETHOD(GetDeviceIndexBuffer)(THIS_ ID3D10Buffer **buffer) PURE; +}; +#undef INTERFACE -- 2.32.0

1 0

[PATCH vkd3d 1/6] vkd3d-shader/hlsl: Free all instruction lists in reverse order (Valgrind).
by Zebediah Figura Aug. 19, 2021

Aug. 19, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 16 +++++----------- libs/vkd3d-shader/hlsl.y | 34 ++++++++++++++++++++-------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3544b9d6..01d5e773 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1278,7 +1278,6 @@ void hlsl_free_instr_list(struct list *list) * the "uses" list. */ LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) hlsl_free_instr(node); - vkd3d_free(list); } static void free_ir_constant(struct hlsl_ir_constant *constant) @@ -1297,12 +1296,8 @@ static void free_ir_expr(struct hlsl_ir_expr *expr) static void free_ir_if(struct hlsl_ir_if *if_node) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&if_node->then_instrs); + hlsl_free_instr_list(&if_node->else_instrs); hlsl_src_remove(&if_node->condition); vkd3d_free(if_node); } @@ -1320,10 +1315,7 @@ static void free_ir_load(struct hlsl_ir_load *load) static void free_ir_loop(struct hlsl_ir_loop *loop) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &loop->body, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&loop->body); vkd3d_free(loop); } @@ -1342,6 +1334,8 @@ static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) void hlsl_free_instr(struct hlsl_ir_node *node) { + assert(list_empty(&node->uses)); + switch (node->type) { case HLSL_IR_CONSTANT: diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5f1e9167..cb4fd7c8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -136,6 +136,12 @@ static struct list *make_empty_list(struct hlsl_ctx *ctx) return list; } +static void destroy_instr_list(struct list *list) +{ + hlsl_free_instr_list(list); + vkd3d_free(list); +} + static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) { if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) @@ -385,10 +391,10 @@ oom: vkd3d_free(loop); vkd3d_free(cond_jump); vkd3d_free(list); - hlsl_free_instr_list(init); - hlsl_free_instr_list(cond); - hlsl_free_instr_list(iter); - hlsl_free_instr_list(body); + destroy_instr_list(init); + destroy_instr_list(cond); + destroy_instr_list(iter); + destroy_instr_list(body); return NULL; } @@ -405,7 +411,7 @@ static unsigned int initializer_size(const struct parse_initializer *initializer static void free_parse_initializer(struct parse_initializer *initializer) { - hlsl_free_instr_list(initializer->instrs); + destroy_instr_list(initializer->instrs); vkd3d_free(initializer->args); } @@ -1789,7 +1795,7 @@ hlsl_prog: { if (!list_empty($2)) hlsl_fixme(ctx, @2, "Uniform initializer."); - hlsl_free_instr_list($2); + destroy_instr_list($2); } | hlsl_prog preproc_directive | hlsl_prog ';' @@ -2364,7 +2370,7 @@ arrays: unsigned int size = evaluate_array_dimension(node_from_list($2)); uint32_t *new_array; - hlsl_free_instr_list($2); + destroy_instr_list($2); $$ = $4; @@ -2656,7 +2662,7 @@ postfix_expr: { if (!add_increment(ctx, $1, false, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2665,7 +2671,7 @@ postfix_expr: { if (!add_increment(ctx, $1, true, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2717,20 +2723,20 @@ postfix_expr: if (index->data_type->type != HLSL_CLASS_SCALAR) { hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } if (!(cast = hlsl_new_cast(ctx, index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } list_add_tail($1, &cast->node.entry); if (!add_array_load(ctx, $1, array, &cast->node, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2821,7 +2827,7 @@ unary_expr: { if (!add_increment(ctx, $2, false, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; @@ -2830,7 +2836,7 @@ unary_expr: { if (!add_increment(ctx, $2, true, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; -- 2.32.0

6 26

[v2 PATCH vkd3d 1/6] vkd3d-shader/hlsl: Free all instruction lists in reverse order (Valgrind).
by Matteo Bruni Aug. 19, 2021

Aug. 19, 2021

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2 (Matteo): Add a missing vkd3d_free() to free_function_decl(). libs/vkd3d-shader/hlsl.c | 17 ++++++----------- libs/vkd3d-shader/hlsl.y | 34 ++++++++++++++++++++-------------- 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 3544b9d6..0d9186ae 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1278,7 +1278,6 @@ void hlsl_free_instr_list(struct list *list) * the "uses" list. */ LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry) hlsl_free_instr(node); - vkd3d_free(list); } static void free_ir_constant(struct hlsl_ir_constant *constant) @@ -1297,12 +1296,8 @@ static void free_ir_expr(struct hlsl_ir_expr *expr) static void free_ir_if(struct hlsl_ir_if *if_node) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->then_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &if_node->else_instrs, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&if_node->then_instrs); + hlsl_free_instr_list(&if_node->else_instrs); hlsl_src_remove(&if_node->condition); vkd3d_free(if_node); } @@ -1320,10 +1315,7 @@ static void free_ir_load(struct hlsl_ir_load *load) static void free_ir_loop(struct hlsl_ir_loop *loop) { - struct hlsl_ir_node *node, *next_node; - - LIST_FOR_EACH_ENTRY_SAFE(node, next_node, &loop->body, struct hlsl_ir_node, entry) - hlsl_free_instr(node); + hlsl_free_instr_list(&loop->body); vkd3d_free(loop); } @@ -1342,6 +1334,8 @@ static void free_ir_swizzle(struct hlsl_ir_swizzle *swizzle) void hlsl_free_instr(struct hlsl_ir_node *node) { + assert(list_empty(&node->uses)); + switch (node->type) { case HLSL_IR_CONSTANT: @@ -1382,6 +1376,7 @@ static void free_function_decl(struct hlsl_ir_function_decl *decl) { vkd3d_free(decl->parameters); hlsl_free_instr_list(decl->body); + vkd3d_free(decl->body); vkd3d_free(decl); } diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 5f1e9167..cb4fd7c8 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -136,6 +136,12 @@ static struct list *make_empty_list(struct hlsl_ctx *ctx) return list; } +static void destroy_instr_list(struct list *list) +{ + hlsl_free_instr_list(list); + vkd3d_free(list); +} + static void check_invalid_matrix_modifiers(struct hlsl_ctx *ctx, DWORD modifiers, struct vkd3d_shader_location loc) { if (modifiers & HLSL_MODIFIERS_MAJORITY_MASK) @@ -385,10 +391,10 @@ oom: vkd3d_free(loop); vkd3d_free(cond_jump); vkd3d_free(list); - hlsl_free_instr_list(init); - hlsl_free_instr_list(cond); - hlsl_free_instr_list(iter); - hlsl_free_instr_list(body); + destroy_instr_list(init); + destroy_instr_list(cond); + destroy_instr_list(iter); + destroy_instr_list(body); return NULL; } @@ -405,7 +411,7 @@ static unsigned int initializer_size(const struct parse_initializer *initializer static void free_parse_initializer(struct parse_initializer *initializer) { - hlsl_free_instr_list(initializer->instrs); + destroy_instr_list(initializer->instrs); vkd3d_free(initializer->args); } @@ -1789,7 +1795,7 @@ hlsl_prog: { if (!list_empty($2)) hlsl_fixme(ctx, @2, "Uniform initializer."); - hlsl_free_instr_list($2); + destroy_instr_list($2); } | hlsl_prog preproc_directive | hlsl_prog ';' @@ -2364,7 +2370,7 @@ arrays: unsigned int size = evaluate_array_dimension(node_from_list($2)); uint32_t *new_array; - hlsl_free_instr_list($2); + destroy_instr_list($2); $$ = $4; @@ -2656,7 +2662,7 @@ postfix_expr: { if (!add_increment(ctx, $1, false, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2665,7 +2671,7 @@ postfix_expr: { if (!add_increment(ctx, $1, true, true, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2717,20 +2723,20 @@ postfix_expr: if (index->data_type->type != HLSL_CLASS_SCALAR) { hlsl_error(ctx, @3, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, "Array index is not scalar."); - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } if (!(cast = hlsl_new_cast(ctx, index, ctx->builtin_types.scalar[HLSL_TYPE_UINT], &index->loc))) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } list_add_tail($1, &cast->node.entry); if (!add_array_load(ctx, $1, array, &cast->node, @2)) { - hlsl_free_instr_list($1); + destroy_instr_list($1); YYABORT; } $$ = $1; @@ -2821,7 +2827,7 @@ unary_expr: { if (!add_increment(ctx, $2, false, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; @@ -2830,7 +2836,7 @@ unary_expr: { if (!add_increment(ctx, $2, true, false, @1)) { - hlsl_free_instr_list($2); + destroy_instr_list($2); YYABORT; } $$ = $2; -- 2.26.3

2 1