1 files changed, 29 insertions, 17 deletions
diff --git a/source/core/slang-shared-library.cpp b/source/core/slang-shared-library.cpp
index 6ce10ad9e..0e4f0ee73 100644
--- a/source/core/slang-shared-library.cpp
+++ b/source/core/slang-shared-library.cpp
@@ -62,7 +62,7 @@ SlangResult DefaultSharedLibraryLoader::loadPlatformSharedLibrary(const char* pa
     }
 }
 
-/* !!!!!!!!!!!!!!!!!!!!!!!!!! DefaultSharedLibrary !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+/* !!!!!!!!!!!!!!!!!!!!!!!!!! TemporarySharedLibrary !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
 TemporarySharedLibrary::~TemporarySharedLibrary()
 {
@@ -76,38 +76,50 @@ TemporarySharedLibrary::~TemporarySharedLibrary()
 
 /* !!!!!!!!!!!!!!!!!!!!!!!!!! DefaultSharedLibrary !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
 
-SLANG_NO_THROW SlangResult SLANG_MCALL DefaultSharedLibrary::queryInterface(SlangUUID const& uuid, void** outObject)
+DefaultSharedLibrary::~DefaultSharedLibrary()
 {
-    // Mechanism to cast to underlying type. 
-    // NOTE! Purposefully does not ref count
-    if (uuid == DefaultSharedLibrary::getTypeGuid())
+    if (m_sharedLibraryHandle)
     {
-        *outObject = this;
-        return SLANG_OK;
+        SharedLibrary::unload(m_sharedLibraryHandle);
     }
+}
+
+void* DefaultSharedLibrary::findSymbolAddressByName(char const* name)
+{
+    return SharedLibrary::findSymbolAddressByName(m_sharedLibraryHandle, name);
+}
 
-    if (uuid == ISlangUnknown::getTypeGuid() || uuid == ISlangSharedLibrary::getTypeGuid()) 
+void* DefaultSharedLibrary::castAs(const SlangUUID& guid)
+{
+    if (auto intf = getInterface(guid))
     {
-        ++m_refCount;
-        *outObject = static_cast<ISlangSharedLibrary*>(this);
-        return SLANG_OK;
+        return intf;
     }
-    return SLANG_E_NO_INTERFACE;
+    return getObject(guid);
 }
 
-DefaultSharedLibrary::~DefaultSharedLibrary()
+void* DefaultSharedLibrary::getInterface(const Guid& guid)
 {
-    if (m_sharedLibraryHandle)
+    if (guid == ISlangUnknown::getTypeGuid() ||
+        guid == ICastable::getTypeGuid() ||
+        guid == ISlangSharedLibrary::getTypeGuid())
     {
-        SharedLibrary::unload(m_sharedLibraryHandle);
+        return static_cast<ISlangSharedLibrary*>(this);
     }
+    return nullptr;
 }
 
-void* DefaultSharedLibrary::findSymbolAddressByName(char const* name)
+void* DefaultSharedLibrary::getObject(const Guid& guid)
 {
-    return SharedLibrary::findSymbolAddressByName(m_sharedLibraryHandle, name);
+    if (guid == DefaultSharedLibrary::getTypeGuid())
+    {
+        return this;
+    }
+    return nullptr;
 }
 
+/* !!!!!!!!!!!!!!!!!!!!!!!!!! SharedLibraryUtils !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!*/
+
 String SharedLibraryUtils::getSharedLibraryFileName(void* symbolInLib)
 {
 #if defined(_WIN32)