From 0468cd0d1a8a1cff1d838a741b050ef11f6d7461 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Sat, 8 Apr 2023 01:11:27 +0800 Subject: Add SLANG_IID_PPV_ARGS (#2784) * Add SLANG_IID_PPV_ARGS To mirror IID_PPV_ARGS from the COM Coding Practices: https://learn.microsoft.com/en-us/windows/win32/LearnWin32/com-coding-practices#the-iid_ppv_args-macro * Make getTypeGuid constexpr --------- Co-authored-by: Yong He --- source/compiler-core/slang-artifact-handler-impl.cpp | 2 +- source/compiler-core/slang-artifact-impl.cpp | 2 +- source/compiler-core/slang-slice-allocator.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source/compiler-core') diff --git a/source/compiler-core/slang-artifact-handler-impl.cpp b/source/compiler-core/slang-artifact-handler-impl.cpp index 9bf4313a9..84b786784 100644 --- a/source/compiler-core/slang-artifact-handler-impl.cpp +++ b/source/compiler-core/slang-artifact-handler-impl.cpp @@ -68,7 +68,7 @@ SlangResult DefaultArtifactHandler::_addRepresentation(IArtifact* artifact, Arti // See if it implements ICastable { ComPtr castable; - if (SLANG_SUCCEEDED(rep->queryInterface(ICastable::getTypeGuid(), (void**)castable.writeRef())) && castable) + if (SLANG_SUCCEEDED(rep->queryInterface(SLANG_IID_PPV_ARGS(castable.writeRef()))) && castable) { return _addRepresentation(artifact, keep, castable, outCastable); } diff --git a/source/compiler-core/slang-artifact-impl.cpp b/source/compiler-core/slang-artifact-impl.cpp index bec28f3eb..237ea7436 100644 --- a/source/compiler-core/slang-artifact-impl.cpp +++ b/source/compiler-core/slang-artifact-impl.cpp @@ -178,7 +178,7 @@ void Artifact::addRepresentationUnknown(ISlangUnknown* unk) } ComPtr castable; - if (SLANG_SUCCEEDED(unk->queryInterface(ICastable::getTypeGuid(), (void**)castable.writeRef())) && castable) + if (SLANG_SUCCEEDED(unk->queryInterface(SLANG_IID_PPV_ARGS(castable.writeRef()))) && castable) { if (m_representations.indexOf(castable) >= 0) { diff --git a/source/compiler-core/slang-slice-allocator.cpp b/source/compiler-core/slang-slice-allocator.cpp index 9a0620ced..738bdf303 100644 --- a/source/compiler-core/slang-slice-allocator.cpp +++ b/source/compiler-core/slang-slice-allocator.cpp @@ -39,7 +39,7 @@ namespace Slang { // See if it has a castable interface ComPtr castable; - if (SLANG_SUCCEEDED(blob->queryInterface(ICastable::getTypeGuid(), (void**)castable.writeRef()))) + if (SLANG_SUCCEEDED(blob->queryInterface(SLANG_IID_PPV_ARGS(castable.writeRef())))) { if (castable->castAs(SlangTerminatedChars::getTypeGuid())) { -- cgit v1.2.3