mirror of
https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
synced 2024-11-14 10:50:13 +01:00
Fix race condition
Fix race condition when renderer was found and we were hooking a library func
This commit is contained in:
parent
894300b6f4
commit
4d99b6affd
3 changed files with 19 additions and 11 deletions
|
@ -522,18 +522,24 @@ void Renderer_Detector::find_renderer_proc(Renderer_Detector* _this)
|
||||||
std::vector<std::string>::const_iterator it = libraries.begin();
|
std::vector<std::string>::const_iterator it = libraries.begin();
|
||||||
while (it != libraries.end())
|
while (it != libraries.end())
|
||||||
{
|
{
|
||||||
it = std::find_if(it, libraries.end(), [](std::string const& name) {
|
{
|
||||||
auto x = GetModuleHandle(name.c_str());
|
std::lock_guard<std::mutex> lock(_this->_found_mutex);
|
||||||
if (x != NULL)
|
if (_this->_renderer_found)
|
||||||
return true;
|
break;
|
||||||
return false;
|
|
||||||
});
|
|
||||||
|
|
||||||
if (it == libraries.end())
|
it = std::find_if(it, libraries.end(), [](std::string const& name) {
|
||||||
break;
|
auto x = GetModuleHandle(name.c_str());
|
||||||
|
if (x != NULL)
|
||||||
|
return true;
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
_this->create_hook(it->c_str());
|
if (it == libraries.end())
|
||||||
++it;
|
break;
|
||||||
|
|
||||||
|
_this->create_hook(it->c_str());
|
||||||
|
++it;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
std::this_thread::sleep_for(std::chrono::milliseconds(500));
|
||||||
|
@ -824,6 +830,7 @@ extern "C" void* dlsym(void* handle, const char* name)
|
||||||
|
|
||||||
void Renderer_Detector::renderer_found(Base_Hook* hook)
|
void Renderer_Detector::renderer_found(Base_Hook* hook)
|
||||||
{
|
{
|
||||||
|
std::lock_guard<std::mutex> lock(_found_mutex);
|
||||||
Hook_Manager& hm = Hook_Manager::Inst();
|
Hook_Manager& hm = Hook_Manager::Inst();
|
||||||
|
|
||||||
_renderer_found = true;
|
_renderer_found = true;
|
||||||
|
|
|
@ -16,6 +16,7 @@ class Renderer_Detector
|
||||||
private:
|
private:
|
||||||
// Variables
|
// Variables
|
||||||
std::thread* _hook_thread;
|
std::thread* _hook_thread;
|
||||||
|
std::mutex _found_mutex;
|
||||||
unsigned int _hook_retries;
|
unsigned int _hook_retries;
|
||||||
bool _renderer_found; // Is the renderer hooked ?
|
bool _renderer_found; // Is the renderer hooked ?
|
||||||
bool _dx9_hooked;
|
bool _dx9_hooked;
|
||||||
|
@ -70,6 +71,7 @@ class Renderer_Detector
|
||||||
{
|
{
|
||||||
// Variables
|
// Variables
|
||||||
std::thread* _hook_thread;
|
std::thread* _hook_thread;
|
||||||
|
std::mutex _found_mutex;
|
||||||
unsigned int _hook_retries;
|
unsigned int _hook_retries;
|
||||||
bool _oglx_hooked;
|
bool _oglx_hooked;
|
||||||
bool _renderer_found; // Is the renderer hooked ?
|
bool _renderer_found; // Is the renderer hooked ?
|
||||||
|
|
|
@ -165,7 +165,6 @@ UINT WINAPI Windows_Hook::MyGetRawInputData(HRAWINPUT hRawInput, UINT uiCommand,
|
||||||
|
|
||||||
RawMouseEvent(*reinterpret_cast<RAWINPUT*>(pData));
|
RawMouseEvent(*reinterpret_cast<RAWINPUT*>(pData));
|
||||||
|
|
||||||
//memset(pData, 0, *pcbSize);
|
|
||||||
*pcbSize = 0;
|
*pcbSize = 0;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue