intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-03 14:55:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

add function to properly load dependency

Browse Source 
Change-Id: I0cec677ae19fa6525890c9b0abe0601a0c11e7df
This commit is contained in:
Artur Harasimiuk
2018-03-02 15:19:29 +01:00
committed by sys_ocldev
parent cfa9cd8040
commit 3297cd8342
4 changed files with 123 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
runtime/os_interface/windows/os_library.cpp
View File

@@ -22,7 +22,6 @@
#include "runtime/os_interface/os_library.h"
#include "os_library.h"
#include "DriverStore.h"
namespace OCLRT {
@@ -37,12 +36,28 @@ OsLibrary *OsLibrary::load(const std::string &name) {
}
namespace Windows {
decltype(&LoadLibraryExA) OsLibrary::loadLibraryExA = LoadLibraryExA;
decltype(&GetModuleFileNameA) OsLibrary::getModuleFileNameA = GetModuleFileNameA;
HMODULE OsLibrary::loadDependency(const std::string &dependencyFileName) const {
char dllPath[MAX_PATH];
DWORD length = getModuleFileNameA(GetModuleHandle(NULL), dllPath, MAX_PATH);
for (DWORD idx = length; idx > 0; idx--) {
if (dllPath[idx - 1] == '\\') {
dllPath[idx] = '\0';
break;
}
}
strcat_s(dllPath, MAX_PATH, dependencyFileName.c_str());
return loadLibraryExA(dllPath, NULL, 0);
}
OsLibrary::OsLibrary(const std::string &name) {
if (name.empty()) {
this->handle = GetModuleHandleA(nullptr);
} else {
this->handle = LoadDependency(name.c_str());
this->handle = loadDependency(name);
if (this->handle == nullptr) {
this->handle = ::LoadLibraryA(name.c_str());
}

6
runtime/os_interface/windows/os_library.h
View File

@@ -39,6 +39,12 @@ class OsLibrary : public OCLRT::OsLibrary {
bool isLoaded();
void *getProcAddress(const std::string &procName);
protected:
HMODULE loadDependency(const std::string &dependencyFileName) const;
static decltype(&LoadLibraryExA) loadLibraryExA;
static decltype(&GetModuleFileNameA) getModuleFileNameA;
};
}
}