May 2024 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in mutation.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 3add3a2457a1c74b033e72633a9bb345863b3b7f URL: https://gitlab.winehq.org/wine/wine/-/commit/3add3a2457a1c74b033e72633a9bb3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:01:55 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in mutation.c. --- dlls/mshtml/mutation.c | 55 ++------------------------------------------------ 1 file changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 845c189f98b..44cb2f491af 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -1089,59 +1089,8 @@ static inline struct mutation_observer *impl_from_IWineMSHTMLMutationObserver(IW return CONTAINING_RECORD(iface, struct mutation_observer, IWineMSHTMLMutationObserver_iface); } -static HRESULT WINAPI MutationObserver_QueryInterface(IWineMSHTMLMutationObserver *iface, REFIID riid, void **ppv) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI MutationObserver_AddRef(IWineMSHTMLMutationObserver *iface) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI MutationObserver_Release(IWineMSHTMLMutationObserver *iface) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI MutationObserver_GetTypeInfoCount(IWineMSHTMLMutationObserver *iface, UINT *pctinfo) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - FIXME("(%p)->(%p)\n", This, pctinfo); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI MutationObserver_GetTypeInfo(IWineMSHTMLMutationObserver *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI MutationObserver_GetIDsOfNames(IWineMSHTMLMutationObserver *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, - DISPID *rgDispId) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, lcid, - rgDispId); -} - -static HRESULT WINAPI MutationObserver_Invoke(IWineMSHTMLMutationObserver *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - struct mutation_observer *This = impl_from_IWineMSHTMLMutationObserver(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, - pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(MutationObserver, IWineMSHTMLMutationObserver, + impl_from_IWineMSHTMLMutationObserver(iface)->dispex) static HRESULT WINAPI MutationObserver_disconnect(IWineMSHTMLMutationObserver *iface) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in omnavigator.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 9d4aa67cbbda20a94fe77728759f7501a3d13a06 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d4aa67cbbda20a94fe77728759f75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:08:41 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in omnavigator.c. --- dlls/mshtml/omnavigator.c | 674 ++-------------------------------------------- 1 file changed, 21 insertions(+), 653 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in range.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 58ad3118b18b6dc218657a00745d314d318ae08b URL: https://gitlab.winehq.org/wine/wine/-/commit/58ad3118b18b6dc218657a00745d31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:09:52 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in range.c. --- dlls/mshtml/range.c | 106 +--------------------------------------------------- 1 file changed, 2 insertions(+), 104 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index e9b0b0edfef..e6d265bc2b0 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -810,58 +810,7 @@ static inline HTMLTxtRange *impl_from_IHTMLTxtRange(IHTMLTxtRange *iface) return CONTAINING_RECORD(iface, HTMLTxtRange, IHTMLTxtRange_iface); } -static HRESULT WINAPI HTMLTxtRange_QueryInterface(IHTMLTxtRange *iface, REFIID riid, void **ppv) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLTxtRange_AddRef(IHTMLTxtRange *iface) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLTxtRange_Release(IHTMLTxtRange *iface) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLTxtRange_GetTypeInfoCount(IHTMLTxtRange *iface, UINT *pctinfo) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLTxtRange_GetTypeInfo(IHTMLTxtRange *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLTxtRange_GetIDsOfNames(IHTMLTxtRange *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLTxtRange_Invoke(IHTMLTxtRange *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLTxtRange *This = impl_from_IHTMLTxtRange(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLTxtRange, IHTMLTxtRange, impl_from_IHTMLTxtRange(iface)->dispex) static HRESULT WINAPI HTMLTxtRange_get_htmlText(IHTMLTxtRange *iface, BSTR *p) { @@ -1771,58 +1720,7 @@ static inline HTMLDOMRange *impl_from_IHTMLDOMRange(IHTMLDOMRange *iface) return CONTAINING_RECORD(iface, HTMLDOMRange, IHTMLDOMRange_iface); } -static HRESULT WINAPI HTMLDOMRange_QueryInterface(IHTMLDOMRange *iface, REFIID riid, void **ppv) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLDOMRange_AddRef(IHTMLDOMRange *iface) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLDOMRange_Release(IHTMLDOMRange *iface) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLDOMRange_GetTypeInfoCount(IHTMLDOMRange *iface, UINT *pctinfo) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLDOMRange_GetTypeInfo(IHTMLDOMRange *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLDOMRange_GetIDsOfNames(IHTMLDOMRange *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLDOMRange_Invoke(IHTMLDOMRange *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLDOMRange *This = impl_from_IHTMLDOMRange(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLDOMRange, IHTMLDOMRange, impl_from_IHTMLDOMRange(iface)->dispex) static HRESULT WINAPI HTMLDOMRange_get_startContainer(IHTMLDOMRange *iface, IHTMLDOMNode **p) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in selection.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 411ae17fe81282acfd688ff8e753bb5b96a440b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/411ae17fe81282acfd688ff8e753bb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:11:02 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in selection.c. --- dlls/mshtml/selection.c | 112 ++---------------------------------------------- 1 file changed, 4 insertions(+), 108 deletions(-) diff --git a/dlls/mshtml/selection.c b/dlls/mshtml/selection.c index 0da2246a69e..fdf2be9acd5 100644 --- a/dlls/mshtml/selection.c +++ b/dlls/mshtml/selection.c @@ -47,60 +47,8 @@ static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject(IHTMLSelection return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject_iface); } -static HRESULT WINAPI HTMLSelectionObject_QueryInterface(IHTMLSelectionObject *iface, - REFIID riid, void **ppv) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_QueryInterface(&This->dispex.IDispatchEx_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectionObject_AddRef(IHTMLSelectionObject *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_AddRef(&This->dispex.IDispatchEx_iface); -} - -static ULONG WINAPI HTMLSelectionObject_Release(IHTMLSelectionObject *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - return IDispatchEx_Release(&This->dispex.IDispatchEx_iface); -} - -static HRESULT WINAPI HTMLSelectionObject_GetTypeInfoCount(IHTMLSelectionObject *iface, UINT *pctinfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectionObject_GetTypeInfo(IHTMLSelectionObject *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLSelectionObject_GetIDsOfNames(IHTMLSelectionObject *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, - LCID lcid, DISPID *rgDispId) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectionObject_Invoke(IHTMLSelectionObject *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, - VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject(iface); - - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectionObject, IHTMLSelectionObject, + impl_from_IHTMLSelectionObject(iface)->dispex) static HRESULT WINAPI HTMLSelectionObject_createRange(IHTMLSelectionObject *iface, IDispatch **range) { @@ -205,60 +153,8 @@ static inline HTMLSelectionObject *impl_from_IHTMLSelectionObject2(IHTMLSelectio return CONTAINING_RECORD(iface, HTMLSelectionObject, IHTMLSelectionObject2_iface); } -static HRESULT WINAPI HTMLSelectionObject2_QueryInterface(IHTMLSelectionObject2 *iface, REFIID riid, void **ppv) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_QueryInterface(&This->IHTMLSelectionObject_iface, riid, ppv); -} - -static ULONG WINAPI HTMLSelectionObject2_AddRef(IHTMLSelectionObject2 *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_AddRef(&This->IHTMLSelectionObject_iface); -} - -static ULONG WINAPI HTMLSelectionObject2_Release(IHTMLSelectionObject2 *iface) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IHTMLSelectionObject_Release(&This->IHTMLSelectionObject_iface); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfoCount(IHTMLSelectionObject2 *iface, UINT *pctinfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetTypeInfo(IHTMLSelectionObject2 *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); -} - -static HRESULT WINAPI HTMLSelectionObject2_GetIDsOfNames(IHTMLSelectionObject2 *iface, REFIID riid, - LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, - cNames, lcid, rgDispId); -} - -static HRESULT WINAPI HTMLSelectionObject2_Invoke(IHTMLSelectionObject2 *iface, DISPID dispIdMember, - REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, - EXCEPINFO *pExcepInfo, UINT *puArgErr) -{ - HTMLSelectionObject *This = impl_from_IHTMLSelectionObject2(iface); - - return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, - lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); -} +DISPEX_IDISPATCH_IMPL(HTMLSelectionObject2, IHTMLSelectionObject2, + impl_from_IHTMLSelectionObject2(iface)->dispex) static HRESULT WINAPI HTMLSelectionObject2_createRangeCollection(IHTMLSelectionObject2 *iface, IDispatch **rangeCollection) {

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in svg.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 2bc5a13209dfcda8bfe44bca68e51bf9d5c302c3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2bc5a13209dfcda8bfe44bca68e51b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:15:12 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in svg.c. --- dlls/mshtml/svg.c | 219 ++---------------------------------------------------- 1 file changed, 8 insertions(+), 211 deletions(-)

1 0

Jacek Caban : mshtml: Use DISPEX_IDISPATCH_IMPL macro in xmlhttprequest.c.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 3b0943e094c1b539fc2bb514e8107c6dad7d1211 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b0943e094c1b539fc2bb514e8107c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 22 12:18:16 2024 +0200 mshtml: Use DISPEX_IDISPATCH_IMPL macro in xmlhttprequest.c. --- dlls/mshtml/xmlhttprequest.c | 198 ++----------------------------------------- 1 file changed, 8 insertions(+), 190 deletions(-)

1 0

Paul Gofman : wine.inf: Add Explorer\Advanced registry key.
by Alexandre Julliard 22 May '24

22 May '24

Module: wine Branch: master Commit: 1bccb4cf9a5804fd1917b32827288a77276bb910 URL: https://gitlab.winehq.org/wine/wine/-/commit/1bccb4cf9a5804fd1917b32827288a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue May 21 16:53:42 2024 -0600 wine.inf: Add Explorer\Advanced registry key. --- loader/wine.inf.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 256a24bc5a1..f952ef84f43 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -359,6 +359,7 @@ HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57d HKLM,System\CurrentControlSet\Control\Class\{745a17a0-74d3-11d0-b6fe-00a0c90f57da},"Class",,"HIDClass" [CurrentVersion] +HKCU,%CurrentVersion%\Explorer\Advanced,,16 HKCU,%CurrentVersion%\Run,,16 HKCU,%CurrentVersionNT%\Winlogon,,16 HKLM,%CurrentVersion%,"CommonFilesDir",,"%16427%" @@ -373,6 +374,7 @@ HKLM,%CurrentVersion%\Control Panel\Cursors\Schemes,,16 HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMax",,"3600" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"DiskSpinDownMin",,"3" HKLM,%CurrentVersion%\Controls Folder\PowerCfg,"LastID",,"5" +HKLM,%CurrentVersion%\Explorer\Advanced,,16 HKLM,%CurrentVersion%\Explorer\AutoplayHandlers,,16 HKLM,%CurrentVersion%\Explorer\DriveIcons,,16 HKLM,%CurrentVersion%\Explorer\KindMap,,16

1 0

Conor McCarthy : tests/d3d12: Do not test 3D depth textures in test_get_copyable_footprints().
by Alexandre Julliard 22 May '24

22 May '24

Module: vkd3d Branch: master Commit: 42eee382ec8e4b99c07593fb9051a38c99422abf URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/42eee382ec8e4b99c07593fb9051a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 13:20:02 2024 +1000 tests/d3d12: Do not test 3D depth textures in test_get_copyable_footprints(). --- tests/d3d12.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index de7db0d7..2e69cb71 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20229,6 +20229,7 @@ static void test_get_copyable_footprints(void) { DXGI_FORMAT format; bool is_compressed; + bool is_depth; } formats[] = { @@ -20244,8 +20245,8 @@ static void test_get_copyable_footprints(void) {DXGI_FORMAT_BC6H_UF16, true}, {DXGI_FORMAT_BC6H_SF16, true}, {DXGI_FORMAT_BC7_UNORM, true}, - {DXGI_FORMAT_D32_FLOAT, false}, - {DXGI_FORMAT_D24_UNORM_S8_UINT, false}, + {DXGI_FORMAT_D32_FLOAT, false, true}, + {DXGI_FORMAT_D24_UNORM_S8_UINT, false, true}, }; static const uint64_t base_offsets[] = { @@ -20328,6 +20329,9 @@ static void test_get_copyable_footprints(void) { if (formats[j].is_compressed && !resources[i].test_with_compressed) continue; + /* Depth formats are not supported for 3D textures in any current feature level including 12.1. */ + if (formats[j].is_depth && resources[i].dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + continue; if (is_buffer && j > 0) continue;

1 0

Conor McCarthy : tests/d3d12: Do not clear UAVs via a structured view.
by Alexandre Julliard 22 May '24

22 May '24

Module: vkd3d Branch: master Commit: dcc715b4d1c0e33fcab6aed345bd17b3d4a56e19 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/dcc715b4d1c0e33fcab6aed345bd1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Sat Apr 20 13:21:18 2024 +1000 tests/d3d12: Do not clear UAVs via a structured view. --- tests/d3d12.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2e69cb71..2c044322 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23928,15 +23928,13 @@ static void test_graphics_uav_counters(void) context.pipeline_state = create_pipeline_state(context.device, context.root_signature, 0, NULL, &ps, NULL); memset(&uav_desc, 0, sizeof(uav_desc)); - uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Format = DXGI_FORMAT_R32_UINT; uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; uav_desc.Buffer.NumElements = 64; - uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); uav_desc.Buffer.Flags = D3D12_BUFFER_UAV_FLAG_NONE; ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, cpu_heap, 0)); - uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; - ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, get_cpu_descriptor_handle(&context, gpu_heap, 0)); ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); @@ -23947,6 +23945,12 @@ static void test_graphics_uav_counters(void) buffer, clear_value, 0, NULL); uav_barrier(command_list, buffer); + uav_desc.Format = DXGI_FORMAT_UNKNOWN; + uav_desc.Buffer.StructureByteStride = sizeof(uint32_t); + uav_desc.Buffer.CounterOffsetInBytes = D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT; + ID3D12Device_CreateUnorderedAccessView(device, buffer, counter_buffer, &uav_desc, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + counter = 0; upload_buffer_data(counter_buffer, uav_desc.Buffer.CounterOffsetInBytes, sizeof(counter), &counter, queue, command_list);

1 0

Conor McCarthy : tests/d3d12: Set the descriptor heaps for the draw call in test_graphics_uav_counters().
by Alexandre Julliard 22 May '24

22 May '24

Module: vkd3d Branch: master Commit: 23881bad7a655f02a6d2f20406d5c0d5bbb88e91 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/23881bad7a655f02a6d2f20406d5c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue May 21 00:23:53 2024 +1000 tests/d3d12: Set the descriptor heaps for the draw call in test_graphics_uav_counters(). --- tests/d3d12.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2c044322..376538ee 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23962,6 +23962,7 @@ static void test_graphics_uav_counters(void) ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &gpu_heap); ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(gpu_heap)); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state);

1 0