remove friend, remove protected:

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -6,11 +6,11 @@ class DxcDllExtValidationSupport {
   // DxcompilerSupport manages the
   // lifetime of dxcompiler.dll, while DxilExtValSupport
   // manages the lifetime of dxil.dll
-protected:
   dxc::DxcDllSupport DxcompilerSupport;
   dxc::DxcDllSupport DxilExtValSupport;
 
   std::string DxilDllPath;
+  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName);
 
 public:
   std::string GetDxilDllPath() { return DxilDllPath; }
@@ -33,11 +33,10 @@ class DxcDllExtValidationSupport {
   HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
                           IUnknown **pResult);
 
-  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName);
   HRESULT Initialize() {
     return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
   }
 
-  bool IsEnabled() const { return DxcompilerSupport.m_dll != nullptr; }
+  bool IsEnabled() const { return DxcompilerSupport.IsEnabled(); }
 };
 } // namespace dxc

include/dxc/Support/dxcapi.use.h

@@ -21,9 +21,7 @@ extern const char *kDxilLib;
 
 // Helper class to dynamically load the dxcompiler or a compatible libraries.
 class DxcDllSupport {
-  friend class DxcDllExtValidationSupport;
 
-protected:
   HMODULE m_dll;
   DxcCreateInstanceProc m_createFn;
   DxcCreateInstance2Proc m_createFn2;

lib/DxcSupport/dxcapi.extval.cpp

@@ -26,7 +26,7 @@ HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
 HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR dllName,
                                                        LPCSTR fnName) {
   // Load dxcompiler.dll
-  HRESULT Result = DxcompilerSupport.InitializeInternal(dllName, fnName);
+  HRESULT Result = DxcompilerSupport.InitializeForDll(dllName, fnName);
   // if dxcompiler.dll fails to load, return the failed HRESULT
   if (DXC_FAILED(Result)) {
     return Result;