use an interface

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -2,13 +2,16 @@
 #include <string>
 
 namespace dxc {
-class DxcDllExtValidationSupport {
-  // DxcompilerSupport manages the
+class DxcDllExtValidationSupport : public IDllSupport {
+  // DxCompilerSupport manages the
   // lifetime of dxcompiler.dll, while DxilExtValSupport
   // manages the lifetime of dxil.dll
-  dxc::DxcDllSupport DxcompilerSupport;
+  dxc::DxcDllSupport DxCompilerSupport;
   dxc::DxcDllSupport DxilExtValSupport;
 
+  DxcCreateInstanceProc m_createFn;
+  DxcCreateInstance2Proc m_createFn2;
+
   std::string DxilDllPath;
   HRESULT InitializeInternal(LPCSTR fnName);
 
@@ -18,23 +21,32 @@ class DxcDllExtValidationSupport {
     return !DxilDllPath.empty() && !DxilExtValSupport.IsEnabled();
   }
 
+  HRESULT CreateInstance(REFCLSID clsid, REFIID riid, IUnknown **pResult);
+  HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
+                          IUnknown **pResult);
+
+  HRESULT Initialize() { return InitializeInternal("DxcCreateInstance"); }
+  HRESULT InitializeForDll(LPCSTR dll, LPCSTR entryPoint) {
+    return InitializeInternal(dll);
+  }
+
+  bool HasCreateWithMalloc() const { return m_createFn2 != nullptr; }
+
+  bool IsEnabled() const { return DxCompilerSupport.IsEnabled(); }
+
+  bool DxcDllExtValidationSupport::GetCreateInstanceProcs(
+      DxcCreateInstanceProc *pCreateFn,
+      DxcCreateInstance2Proc *pCreateFn2) const;
+
   void Cleanup() {
     DxilExtValSupport.Cleanup();
-    DxcompilerSupport.Cleanup();
+    DxCompilerSupport.Cleanup();
   }
 
   HMODULE Detach() {
     // Can't Detach and return a handle for DxilSupport. Cleanup() instead.
     DxilExtValSupport.Cleanup();
-    return DxcompilerSupport.Detach();
+    return DxCompilerSupport.Detach();
   }
-
-  HRESULT CreateInstance(REFCLSID clsid, REFIID riid, IUnknown **pResult);
-  HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
-                          IUnknown **pResult);
-
-  HRESULT Initialize() { return InitializeInternal("DxcCreateInstance"); }
-
-  bool IsEnabled() const { return DxcompilerSupport.IsEnabled(); }
 };
 } // namespace dxc

include/dxc/Support/dxcapi.use.h

@@ -19,8 +19,51 @@ namespace dxc {
 extern const char *kDxCompilerLib;
 extern const char *kDxilLib;
 
+// Interface for common dll operations
+class IDllSupport {
+public:
+  IDllSupport() = default;
+
+  IDllSupport(IDllSupport &&other) = default;
+
+  virtual ~IDllSupport() = default;
+
+  virtual HRESULT Initialize() = 0;
+
+  virtual HRESULT InitializeForDll(LPCSTR dll, LPCSTR entryPoint) = 0;
+
+  template <typename TInterface>
+  HRESULT CreateInstance(REFCLSID clsid, TInterface **pResult) {
+    return CreateInstance(clsid, __uuidof(TInterface), (IUnknown **)pResult);
+  }
+
+  virtual HRESULT CreateInstance(REFCLSID clsid, REFIID riid,
+                                 IUnknown **pResult) = 0;
+
+  template <typename TInterface>
+  HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid,
+                          TInterface **pResult) {
+    return CreateInstance2(pMalloc, clsid, __uuidof(TInterface),
+                           (IUnknown **)pResult);
+  }
+
+  virtual HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
+                                  IUnknown **pResult) = 0;
+
+  virtual bool HasCreateWithMalloc() const = 0;
+
+  virtual bool IsEnabled() const = 0;
+
+  virtual bool
+  GetCreateInstanceProcs(DxcCreateInstanceProc *pCreateFn,
+                         DxcCreateInstance2Proc *pCreateFn2) const = 0;
+
+  virtual void Cleanup() = 0;
+  virtual HMODULE Detach() = 0;
+};
+
 // Helper class to dynamically load the dxcompiler or a compatible libraries.
-class DxcDllSupport {
+class DxcDllSupport : public IDllSupport {
 
   HMODULE m_dll;
   DxcCreateInstanceProc m_createFn;
@@ -95,11 +138,9 @@ class DxcDllSupport {
     return InitializeInternal(dll, entryPoint);
   }
 
-  template <typename TInterface>
-  HRESULT CreateInstance(REFCLSID clsid, TInterface **pResult) {
-    return CreateInstance(clsid, __uuidof(TInterface), (IUnknown **)pResult);
-  }
-
+  // Also bring visibility into the interface definition of this function
+  // which takes 2 args
+  using IDllSupport::CreateInstance;
   HRESULT CreateInstance(REFCLSID clsid, REFIID riid, IUnknown **pResult) {
     if (pResult == nullptr)
       return E_POINTER;
@@ -109,13 +150,9 @@ class DxcDllSupport {
     return hr;
   }
 
-  template <typename TInterface>
-  HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid,
-                          TInterface **pResult) {
-    return CreateInstance2(pMalloc, clsid, __uuidof(TInterface),
-                           (IUnknown **)pResult);
-  }
-
+  // Also bring visibility into the interface definition of this function
+  // which takes 3 args
+  using IDllSupport::CreateInstance2;
   HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
                           IUnknown **pResult) {
     if (pResult == nullptr)

lib/DxcSupport/dxcapi.extval.cpp

@@ -11,7 +11,7 @@ HRESULT DxcDllExtValidationSupport::CreateInstance(REFCLSID clsid, REFIID riid,
   if (DxilExtValSupport.IsEnabled() && clsid == CLSID_DxcValidator)
     return DxilExtValSupport.CreateInstance(clsid, riid, pResult);
 
-  return DxcompilerSupport.CreateInstance(clsid, riid, pResult);
+  return DxCompilerSupport.CreateInstance(clsid, riid, pResult);
 }
 
 HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
@@ -20,12 +20,12 @@ HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
   if (DxilExtValSupport.IsEnabled() && clsid == CLSID_DxcValidator)
     return DxilExtValSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
 
-  return DxcompilerSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
+  return DxCompilerSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
 }
 
 HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR fnName) {
   // Load dxcompiler.dll
-  HRESULT Result = DxcompilerSupport.InitializeForDll(kDxCompilerLib, fnName);
+  HRESULT Result = DxCompilerSupport.InitializeForDll(kDxCompilerLib, fnName);
   // if dxcompiler.dll fails to load, return the failed HRESULT
   if (DXC_FAILED(Result)) {
     return Result;
@@ -48,4 +48,14 @@ HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR fnName) {
   return DxilExtValSupport.InitializeForDll(DxilDllPath.c_str(), fnName);
 }
 
+bool DxcDllExtValidationSupport::GetCreateInstanceProcs(
+    DxcCreateInstanceProc *pCreateFn,
+    DxcCreateInstance2Proc *pCreateFn2) const {
+  if (pCreateFn == nullptr || pCreateFn2 == nullptr || m_createFn == nullptr)
+    return false;
+  *pCreateFn = m_createFn;
+  *pCreateFn2 = m_createFn2;
+  return true;
+}
+
 } // namespace dxc