From b89a8fee0496050e8557d3370d0b1a887fa54a23 Mon Sep 17 00:00:00 2001
From: jmossman <jmossman@users.noreply.github.com>
Date: Fri, 15 Dec 2017 11:41:34 -0600
Subject: [PATCH] [host] simplify dll loading

---
 host/Capture/NvFBC.cpp |  7 +++----
 host/Util.h            | 35 -----------------------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/host/Capture/NvFBC.cpp b/host/Capture/NvFBC.cpp
index 2e2e2da4..e35a65b3 100644
--- a/host/Capture/NvFBC.cpp
+++ b/host/Capture/NvFBC.cpp
@@ -61,11 +61,10 @@ bool NvFBC::Initialize(CaptureOptions * options)
     if (_strcmpi(*it, "nowait") == 0) { m_optNoWait = true ; continue; }
   }
 
-  std::string nvfbc = Util::GetSystemRoot() + "\\" + NVFBC_LIBRARY_NAME;
-  m_hDLL = LoadLibraryA(nvfbc.c_str());
+  m_hDLL = LoadLibraryA(NVFBC_LIBRARY_NAME);
   if (!m_hDLL)
   {
-    DEBUG_ERROR("Failed to load the NvFBC library: %d - %s", GetLastError(), nvfbc.c_str());
+    DEBUG_ERROR("Failed to load the NvFBC library: %d - %s", GetLastError(), NVFBC_LIBRARY_NAME);
     return false;
   }
 
@@ -76,7 +75,7 @@ bool NvFBC::Initialize(CaptureOptions * options)
 
   if (!m_fnCreateEx || !m_fnSetGlobalFlags || !m_fnGetStatusEx || !m_fnEnable)
   {
-    DEBUG_ERROR("Unable to locate required entry points in %s", nvfbc.c_str());
+    DEBUG_ERROR("Unable to locate required entry points in %s", NVFBC_LIBRARY_NAME);
     DeInitialize();
     return false;
   }
diff --git a/host/Util.h b/host/Util.h
index b7db3d9e..44f747fa 100644
--- a/host/Util.h
+++ b/host/Util.h
@@ -23,45 +23,10 @@ Place, Suite 330, Boston, MA 02111-1307 USA
 #include <inttypes.h>
 #include <tmmintrin.h>
 
-#include "common\debug.h"
-
 
 class Util
 {
 public:
-  static std::string GetSystemRoot()
-  {
-    std::string defaultPath;
-
-    size_t pathSize;
-    char *libPath;
-
-    if (_dupenv_s(&libPath, &pathSize, "SystemRoot") != 0)
-    {
-      DEBUG_ERROR("Unable to get the SystemRoot environment variable");
-      return defaultPath;
-    }
-
-    if (!pathSize)
-    {
-      DEBUG_ERROR("The SystemRoot environment variable is not set");
-      return defaultPath;
-    }
-#ifdef _WIN64
-    defaultPath = std::string(libPath) + "\\System32";
-#else
-    if (IsWow64())
-    {
-      defaultPath = std::string(libPath) + "\\Syswow64";
-    }
-    else
-    {
-      defaultPath = std::string(libPath) + "\\System32";
-    }
-#endif
-    return defaultPath;
-  }
-
   static inline void BGRAtoRGB(uint8_t * orig, size_t imagesize, uint8_t * dest)
   {
     assert((uintptr_t)orig % 16 == 0);