MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-06-30 08:24:05 +00:00
Code Issues Projects Releases Wiki Activity

GLideNUI: introduce Config{Init,Cleanup}

Browse Source
This commit is contained in:
Rosalie Wanders 2021-08-07 12:43:37 +02:00 committed by Sergey Lipskiy
parent 60c07f5b60
commit 0ebc545c93
7 changed files with 49 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GLideNUI-wtl/ConfigDlg.cpp
View File

@ -438,13 +438,16 @@ public:
GlideN64WtlModule * WtlModule = NULL;
void ConfigInit(void * hinst) {
extern "C"
{
EXPORT void CALL ConfigInit(void * hinst) {
WtlModule = new GlideN64WtlModule((HINSTANCE)hinst);
}
void ConfigCleanup(void) {
EXPORT void CALL ConfigCleanup(void) {
if (WtlModule) {
delete WtlModule;
WtlModule = NULL;
}
}
}

5
src/GLideNUI-wtl/ConfigDlg.h
View File

@ -76,8 +76,3 @@ protected:
uint32_t m_TabLeft, m_ProfileLeft;
bool m_Saved;
};
#ifdef _WIN32
void ConfigInit(void * hinst);
void ConfigCleanup(void);
#endif

2
src/GLideNUI-wtl/GLideNUI.h
View File

@ -13,6 +13,8 @@ extern "C" {
#define CALL
#endif
EXPORT void CALL ConfigInit(void * hinst);
EXPORT void CALL ConfigCleanup(void);
EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy);
EXPORT int CALL RunAbout(const wchar_t * _strFileName);
EXPORT void CALL LoadConfig(const wchar_t * _strFileName);

53
src/GLideNUI/GLideNUI.cpp
View File

@ -20,29 +20,21 @@ Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin)
inline void initMyResource() { Q_INIT_RESOURCE(icon); }
inline void cleanMyResource() { Q_CLEANUP_RESOURCE(icon); }
static std::unique_ptr<QApplication> s_pQApp;
static QCoreApplication* s_pAppInstance;
static
int openConfigDialog(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, float _maxAnisotropy, bool & _accepted)
{
cleanMyResource();
initMyResource();
QString strIniFileName = QString::fromWCharArray(_strFileName);
loadSettings(strIniFileName);
if (config.generalEmulation.enableCustomSettings != 0 && _romName != nullptr && strlen(_romName) != 0)
loadCustomRomSettings(strIniFileName, _romName);
std::unique_ptr<QApplication> pQApp;
QCoreApplication* pApp = QCoreApplication::instance();
if (pApp == nullptr) {
int argc = 0;
char * argv = 0;
pQApp.reset(new QApplication(argc, &argv));
pApp = pQApp.get();
}
QTranslator translator;
if (translator.load(getTranslationFile(), strIniFileName))
pApp->installTranslator(&translator);
if (translator.load(getTranslationFile(), strIniFileName)) {
s_pAppInstance->installTranslator(&translator);
}
ConfigDialog w(Q_NULLPTR, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint, _maxMSAALevel, _maxAnisotropy);
@ -51,7 +43,7 @@ int openConfigDialog(const wchar_t * _strFileName, const char * _romName, unsign
w.setTitle();
w.show();
int res = pQApp ? pQApp->exec() : w.exec();
int res = s_pQApp ? s_pQApp->exec() : w.exec();
_accepted = w.isAccepted();
return res;
}
@ -59,20 +51,13 @@ int openConfigDialog(const wchar_t * _strFileName, const char * _romName, unsign
static
int openAboutDialog(const wchar_t * _strFileName)
{
cleanMyResource();
initMyResource();
int argc = 0;
char * argv = 0;
QApplication a(argc, &argv);
QTranslator translator;
if (translator.load(getTranslationFile(), QString::fromWCharArray(_strFileName)))
a.installTranslator(&translator);
s_pAppInstance->installTranslator(&translator);
AboutDialog w(Q_NULLPTR, Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
w.show();
return a.exec();
return s_pQApp ? s_pQApp->exec() : w.exec();
}
bool runConfigThread(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy) {
@ -97,6 +82,26 @@ int runAboutThread(const wchar_t * _strFileName) {
return 0;
}
EXPORT void CALL ConfigInit(void * hinst)
{
initMyResource();
s_pAppInstance = QCoreApplication::instance();
if (s_pAppInstance == nullptr) {
int argc = 0;
char * argv = 0;
s_pQApp.reset(new QApplication(argc, &argv));
s_pAppInstance = s_pQApp.get();
}
}
EXPORT void CALL ConfigCleanup(void)
{
cleanMyResource();
s_pQApp.release();
}
EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy)
{
return runConfigThread(_strFileName, _romName, _maxMSAALevel, _maxAnisotropy);

4
src/GLideNUI/GLideNUI.h
View File

@ -7,12 +7,14 @@ extern "C" {
#ifdef OS_WINDOWS
#define EXPORT __declspec(dllexport)
#define CALL __cdecl
#define CALL __cdecl
#else
#define EXPORT __attribute__((visibility("default")))
#define CALL
#endif
EXPORT void CALL ConfigInit(void * hinst);
EXPORT void CALL ConfigCleanup(void);
EXPORT bool CALL RunConfig(const wchar_t * _strFileName, const char * _romName, unsigned int _maxMSAALevel, unsigned int _maxAnisotropy);
EXPORT int CALL RunAbout(const wchar_t * _strFileName);
EXPORT void CALL LoadConfig(const wchar_t * _strFileName);

9
src/mupenplus/MupenPlusAPIImpl.cpp
View File

@ -11,6 +11,10 @@
#define DLSYM(a, b) dlsym(a, b)
#endif // OS_WINDOWS
#ifdef M64P_GLIDENUI
#include "GLideNUI/GLideNUI.h"
#endif
ptr_ConfigGetSharedDataFilepath ConfigGetSharedDataFilepath = nullptr;
ptr_ConfigGetUserConfigPath ConfigGetUserConfigPath = nullptr;
ptr_ConfigGetUserDataPath ConfigGetUserDataPath = nullptr;
@ -103,6 +107,8 @@ m64p_error PluginAPI::PluginStartup(m64p_dynlib_handle _CoreLibHandle)
Config_SetDefault();
}
}
#else
ConfigInit(nullptr);
#endif // M64P_GLIDENUI
return M64ERR_SUCCESS;
@ -122,6 +128,9 @@ m64p_error PluginAPI::PluginShutdown()
_callAPICommand(acRomClosed);
delete m_pRspThread;
m_pRspThread = nullptr;
#endif
#ifdef M64P_GLIDENUI
ConfigCleanup();
#endif
return M64ERR_SUCCESS;
}

10
src/windows/GLideN64_windows.cpp
View File

@ -1,18 +1,13 @@
#include "GLideN64_Windows.h"
#include "GLideNUI/GLideNUI.h"
HWND hWnd;
HWND hStatusBar;
HWND hToolBar;
HINSTANCE hInstance;
#ifdef WTL_UI
void ConfigInit(void * hinst);
void ConfigCleanup(void);
#endif
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID /*lpvReserved*/)
{
#ifdef WTL_UI
if (dwReason == DLL_PROCESS_ATTACH)
{
hInstance = hinstDLL;
@ -22,8 +17,5 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD dwReason, LPVOID /*lpvReserved*/)
{
ConfigCleanup();
}
#else
hInstance = hinstDLL;
#endif
return TRUE;
}