AuroraMiddleware/winpty
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove the ASSERT from OsModule to make it more suitable for winpty.dll

Browse Source
This commit is contained in:
Ryan Prichard 2016-01-15 18:05:18 -06:00
parent fe60984ce4
commit 95be1c291f
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/shared/OsModule.h
View File

@ -21,24 +21,36 @@
#ifndef OS_MODULE_H
#define OS_MODULE_H
#include <string>
#include "DebugClient.h"
#include "WinptyAssert.h"
class OsModule {
std::wstring m_fileName;
HMODULE m_module;
public:
OsModule(const wchar_t *fileName) {
OsModule(const wchar_t *fileName) : m_fileName(fileName) {
m_module = LoadLibraryW(fileName);
ASSERT(m_module != NULL);
if (m_module == nullptr) {
trace("Could not load %ls: error %u",
fileName, static_cast<unsigned>(GetLastError()));
}
}
~OsModule() {
FreeLibrary(m_module);
if (m_module != nullptr) {
FreeLibrary(m_module);
}
}
operator bool() const { return m_module != nullptr; }
HMODULE handle() const { return m_module; }
FARPROC proc(const char *funcName) {
FARPROC ret = GetProcAddress(m_module, funcName);
if (ret == NULL) {
trace("GetProcAddress: %s is missing", funcName);
FARPROC ret = nullptr;
if (m_module != nullptr) {
ret = GetProcAddress(m_module, funcName);
if (ret == NULL) {
trace("GetProcAddress: %s is missing from %ls",
funcName, m_fileName.c_str());
}
}
return ret;
}