address Damyan final concerns

Author: bob80905

include/dxc/Support/dxcapi.extval.h

@@ -10,7 +10,7 @@ class DxcDllExtValidationSupport {
   dxc::DxcDllSupport DxilExtValSupport;
 
   std::string DxilDllPath;
-  HRESULT InitializeInternal(LPCSTR dllName, LPCSTR fnName);
+  HRESULT InitializeInternal(LPCSTR fnName);
 
 public:
   std::string GetDxilDllPath() { return DxilDllPath; }
@@ -33,9 +33,7 @@ class DxcDllExtValidationSupport {
   HRESULT CreateInstance2(IMalloc *pMalloc, REFCLSID clsid, REFIID riid,
                           IUnknown **pResult);
 
-  HRESULT Initialize() {
-    return InitializeInternal(kDxCompilerLib, "DxcCreateInstance");
-  }
+  HRESULT Initialize() { return InitializeInternal("DxcCreateInstance"); }
 
   bool IsEnabled() const { return DxcompilerSupport.IsEnabled(); }
 };

lib/DxcSupport/dxcapi.extval.cpp

@@ -23,10 +23,9 @@ HRESULT DxcDllExtValidationSupport::CreateInstance2(IMalloc *pMalloc,
   return DxcompilerSupport.CreateInstance2(pMalloc, clsid, riid, pResult);
 }
 
-HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR dllName,
-                                                       LPCSTR fnName) {
+HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR fnName) {
   // Load dxcompiler.dll
-  HRESULT Result = DxcompilerSupport.InitializeForDll(dllName, fnName);
+  HRESULT Result = DxcompilerSupport.InitializeForDll(kDxCompilerLib, fnName);
   // if dxcompiler.dll fails to load, return the failed HRESULT
   if (DXC_FAILED(Result)) {
     return Result;
@@ -38,21 +37,19 @@ HRESULT DxcDllExtValidationSupport::InitializeInternal(LPCSTR dllName,
     return S_OK;
   }
 
-  std::string DllPathStr(EnvVarVal);
-  DxilDllPath = DllPathStr;
-  std::filesystem::path DllPath(DllPathStr);
+  DxilDllPath = std::string(EnvVarVal);
+  std::filesystem::path DllPath(DxilDllPath);
 
   // Check if path is absolute and exists
   if (!DllPath.is_absolute() || !std::filesystem::exists(DllPath)) {
-    return S_OK;
+    return ERROR_DLL_INIT_FAILED;
   }
   // code that calls this function is responsible for checking
   // to see if dxil.dll is successfully loaded.
-  // the CheckDxilDLLLoaded function can determine whether there were any
+  // the DxilDllFailedToLoad function can determine whether there were any
   // problems loading dxil.dll or not
-  DxilExtValSupport.InitializeForDll(DllPathStr.data(), fnName);
 
-  return S_OK;
+  return DxilExtValSupport.InitializeForDll(DxilDllPath.c_str(), fnName);
 }
 
 } // namespace dxc

tools/clang/unittests/HLSL/ValidationTest.cpp

@@ -25,7 +25,6 @@
 #include "llvm/ADT/ArrayRef.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/Regex.h"
-#include <cstdlib> // for setenv(), getenv(), unsetenv()
 #include <wchar.h> // for _wgetenv
 
 #ifdef _WIN32
@@ -4281,11 +4280,12 @@ TEST_F(ValidationTest, UnitTestExtValidationSupport) {
   VERIFY_SUCCEEDED(ExtSupportBogus.CreateInstance(
       CLSID_DxcValidator, __uuidof(IDxcValidator), (IUnknown **)&Validator));
 
-  CComPtr<IMalloc> Malloc;
-  CComPtr<IDxcCompiler2> Compiler2;
   Linker.Release();
   Validator.Release();
   Compiler.Release();
+
+  CComPtr<IMalloc> Malloc;
+  CComPtr<IDxcCompiler2> Compiler2;
   VERIFY_SUCCEEDED(DxcCoGetMalloc(1, &Malloc));
   VERIFY_SUCCEEDED(ExtSupportBogus.CreateInstance2(Malloc, CLSID_DxcCompiler,
                                                    __uuidof(IDxcCompiler),