Revert "Avoid using SetDllDirectory"

This reverts commit c957a583384192caaa5e5db466d9ee525e59fbf5.
Using absolute paths to the DLLs seems to cause issues for some people,
so until this can be properly diagnosed and fixed, return to SetDllDirectory.

Fixes issue 311

2 files changed, 7 insertions, 14 deletions

diff --git a/decoder/LAVAudio/DTSDecoder.cpp b/decoder/LAVAudio/DTSDecoder.cpp
index 836bad70..f3100ada 100644
--- a/decoder/LAVAudio/DTSDecoder.cpp
+++ b/decoder/LAVAudio/DTSDecoder.cpp
@@ -76,21 +76,16 @@ struct DTSDecoder {
 HRESULT CLAVAudio::InitDTSDecoder()
 {
   if (!m_hDllExtraDecoder) {
+    // Add path of LAVAudio.ax into the Dll search path
     WCHAR wModuleFile[1024];
     GetModuleFileName(g_hInst, wModuleFile, 1024);
     PathRemoveFileSpecW(wModuleFile);
+    SetDllDirectory(wModuleFile);
 
-    wcscat_s(wModuleFile, TEXT("\\"));
-    wcscat_s(wModuleFile, TEXT("dtsdecoderdll.dll"));
+    HMODULE hDll = LoadLibrary(TEXT("dtsdecoderdll.dll"));
+    CheckPointer(hDll, E_FAIL);
 
-    // Try loading from the LAV directory
-    m_hDllExtraDecoder = LoadLibrary(wModuleFile);
-
-    // And if this failed, from the system directories
-    if (m_hDllExtraDecoder == NULL)
-      m_hDllExtraDecoder = LoadLibrary(TEXT("dtsdecoderdll.dll"));
-
-    CheckPointer(m_hDllExtraDecoder, E_FAIL);
+    m_hDllExtraDecoder = hDll;
   }
 
   DTSDecoder *context = new DTSDecoder();
diff --git a/decoder/LAVVideo/decoders/quicksync.cpp b/decoder/LAVVideo/decoders/quicksync.cpp
index 4f8b5bb0..e3f7a0be 100644
--- a/decoder/LAVVideo/decoders/quicksync.cpp
+++ b/decoder/LAVVideo/decoders/quicksync.cpp
@@ -262,11 +262,9 @@ STDMETHODIMP CDecQuickSync::Init()
     WCHAR wModuleFile[1024];
     GetModuleFileName(g_hInst, wModuleFile, 1024);
     PathRemoveFileSpecW(wModuleFile);
+    SetDllDirectory(wModuleFile);
 
-    wcscat_s(wModuleFile, TEXT("\\"));
-    wcscat_s(wModuleFile, TEXT(QS_DEC_DLL_NAME));
-
-    qs.quickSyncLib = LoadLibrary(wModuleFile);
+    qs.quickSyncLib = LoadLibrary(TEXT(QS_DEC_DLL_NAME));
     if (qs.quickSyncLib == NULL) {
       DWORD dwError = GetLastError();
       DbgLog((LOG_ERROR, 10, L"-> Loading of " TEXT(QS_DEC_DLL_NAME) L" failed (%d)", dwError));