ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1272 from Frank-74/Remove-pjutilDynLibCallDllMain() 

Remove pjutil::DynLibCallDllMain()
This commit is contained in:
zilmar 2017-03-27 13:03:49 +11:00 committed by GitHub
parent 2cf8ec57a1 fe33883d0a
commit 044eea5459
6 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Common/Util.cpp
View File

@ -49,20 +49,6 @@ void pjutil::DynLibClose(pjutil::DynLibHandle LibHandle)
}
}
#ifdef _WIN32
static void EmptyThreadFunction(void)
{
}
void pjutil::DynLibCallDllMain(void)
{
//jabo had a bug so I call CreateThread so the dllmain in the plugins will get called again with thread attached
DWORD ThreadID;
HANDLE hthread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)EmptyThreadFunction, NULL, 0, &ThreadID);
CloseHandle(hthread);
}
#endif
void pjutil::Sleep(uint32_t timeout)
{
#ifdef _WIN32

5
Source/Common/Util.h
View File

@ -9,9 +9,6 @@ public:
static DynLibHandle DynLibOpen(const char *pccLibraryPath, bool ShowErrors = true);
static void * DynLibGetProc(DynLibHandle LibHandle, const char * ProcedureName);
static void DynLibClose(DynLibHandle LibHandle);
#ifdef _WIN32
static void DynLibCallDllMain(void);
#endif
static void Sleep(uint32_t timeout);
static bool TerminatedExistingExe();
@ -19,4 +16,4 @@ private:
pjutil(void); // Disable default constructor
pjutil(const pjutil&); // Disable copy constructor
pjutil& operator=(const pjutil&); // Disable assignment
};
};

3
Source/Project64-core/Plugins/AudioPlugin.cpp
View File

@ -148,9 +148,6 @@ bool CAudioPlugin::Initiate(CN64System * System, RenderWindow * Window)
m_Initialized = InitiateAudio(Info) != 0;
#ifdef _WIN32
//jabo had a bug so I call CreateThread so his dllmain gets called again
pjutil::DynLibCallDllMain();
if (System != NULL)
{
if (AiUpdate)

6
Source/Project64-core/Plugins/ControllerPlugin.cpp
View File

@ -122,12 +122,6 @@ bool CControl_Plugin::Initiate(CN64System * System, RenderWindow * Window)
m_Initialized = true;
}
}
#ifdef _WIN32
//jabo had a bug so I call CreateThread so his dllmain gets called again
pjutil::DynLibCallDllMain();
#endif
return m_Initialized;
}

5
Source/Project64-core/Plugins/GFXPlugin.cpp
View File

@ -260,11 +260,6 @@ bool CGfxPlugin::Initiate(CN64System * System, RenderWindow * Window)
WriteTrace(TraceGFXPlugin, TraceDebug, "Calling InitiateGFX");
m_Initialized = InitiateGFX(Info) != 0;
#ifdef _WIN32
//jabo had a bug so I call CreateThread so his dllmain gets called again
pjutil::DynLibCallDllMain();
#endif
WriteTrace(TraceGFXPlugin, TraceDebug, "Done (res: %s)", m_Initialized ? "true" : "false");
return m_Initialized;
}

6
Source/Project64-core/Plugins/RSPPlugin.cpp
View File

@ -352,10 +352,6 @@ bool CRSP_Plugin::Initiate(CPlugins * Plugins, CN64System * System)
m_Initialized = true;
#ifdef _WIN32
//jabo had a bug so I call CreateThread so his dllmain gets called again
pjutil::DynLibCallDllMain();
#endif
WriteTrace(TraceRSPPlugin, TraceDebug, "Done (res: %s)", m_Initialized ? "true" : "false");
return m_Initialized;
}
@ -375,4 +371,4 @@ void CRSP_Plugin::ProcessMenuItem(int id)
{
m_RSPDebug.ProcessMenuItem(id);
}
}
}