diff options
Diffstat (limited to 'plugins/MirFox/src/MirandaInterface.cpp')
| -rw-r--r-- | plugins/MirFox/src/MirandaInterface.cpp | 70 |
1 files changed, 28 insertions, 42 deletions
diff --git a/plugins/MirFox/src/MirandaInterface.cpp b/plugins/MirFox/src/MirandaInterface.cpp index b4f2f6ef0b..e744018012 100644 --- a/plugins/MirFox/src/MirandaInterface.cpp +++ b/plugins/MirFox/src/MirandaInterface.cpp @@ -2,8 +2,8 @@ #include "version.h"
#include "mirandaInterface.h"
-//Miranda - handle from DllMain
-HINSTANCE hInst;
+// Miranda - handle from DllMain
+CMPlugin g_plugin;
//Miranda - Langpack
int hLangpack;
@@ -18,7 +18,10 @@ HANDLE hPopupError; //main add-on's object
CMirfoxMiranda mirfoxMiranda;
-PLUGININFOEX pluginInfo={
+/////////////////////////////////////////////////////////////////////////////////////////
+
+PLUGININFOEX pluginInfo =
+{
sizeof(PLUGININFOEX),
__PLUGIN_NAME,
PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM),
@@ -30,21 +33,12 @@ PLUGININFOEX pluginInfo={ { 0xe99a09b2, 0xe05b, 0x4633, { 0xaa, 0x3a, 0x5c, 0x83, 0xef, 0x1c, 0xba, 0xb6 } }
};
-
-extern "C" BOOL APIENTRY DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) {
-
- hInst = hinstDLL;
- return TRUE;
-}
-
-
-extern "C" __declspec (dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion) {
+extern "C" __declspec (dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
+{
return &pluginInfo;
}
-
-
-
+/////////////////////////////////////////////////////////////////////////////////////////
static int __cdecl onAccListChanged(WPARAM wParam, LPARAM lParam)
{
@@ -70,8 +64,8 @@ static int __cdecl onContactDeleted(WPARAM wParam, LPARAM) return 0;
}
-static int __cdecl onContactSettingChanged(WPARAM hContact, LPARAM lParam){
-
+static int __cdecl onContactSettingChanged(WPARAM hContact, LPARAM lParam)
+{
if (mirfoxMiranda.getMirfoxData().Plugin_Terminated)
return 0;
if (hContact == NULL || lParam == NULL)
@@ -95,15 +89,13 @@ static int __cdecl onContactSettingChanged(WPARAM hContact, LPARAM lParam){ return 0;
}
+/////////////////////////////////////////////////////////////////////////////////////////
+// hook on ME_SYSTEM_MODULESLOADED at Load()
-
-/*
- * hook on ME_SYSTEM_MODULESLOADED at Load()
- */
static int onModulesLoaded(WPARAM, LPARAM)
{
//init popup classes
- POPUPCLASS puc = {0};
+ POPUPCLASS puc = { 0 };
puc.cbSize = sizeof(puc);
puc.flags = PCF_TCHAR;
@@ -112,7 +104,7 @@ static int onModulesLoaded(WPARAM, LPARAM) puc.colorBack = RGB(173, 206, 247); //light blue
puc.colorText = GetSysColor(COLOR_WINDOWTEXT);
puc.iSeconds = 3;
- puc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON_PN));
+ puc.hIcon = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ICON_PN));
hPopupNotify = Popup_RegisterClass(&puc);
puc.pszName = "MirFox_Error";
@@ -120,7 +112,7 @@ static int onModulesLoaded(WPARAM, LPARAM) puc.colorBack = RGB(255, 128, 128); //light red
puc.colorText = GetSysColor(COLOR_WINDOWTEXT);
puc.iSeconds = 20;
- puc.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ICON_PE));
+ puc.hIcon = LoadIcon(g_plugin.getInst(), MAKEINTRESOURCE(IDI_ICON_PE));
hPopupError = Popup_RegisterClass(&puc);
@@ -142,6 +134,7 @@ static int OnShutdown(WPARAM, LPARAM) return 0;
}
+/////////////////////////////////////////////////////////////////////////////////////////
extern "C" int __declspec(dllexport) Load(void)
{
@@ -152,8 +145,8 @@ extern "C" int __declspec(dllexport) Load(void) hProtoAck = HookEvent(ME_PROTO_ACK, MirandaUtils::onProtoAck);
- //Ensure that the common control DLL is loaded. needed to use ICC_LISTVIEW_CLASSES control in options TODO move to InitOptions();?
- INITCOMMONCONTROLSEX icex = {0};
+ // Ensure that the common control DLL is loaded. needed to use ICC_LISTVIEW_CLASSES control in options TODO move to InitOptions();?
+ INITCOMMONCONTROLSEX icex = { 0 };
icex.dwSize = sizeof(icex);
icex.dwICC = ICC_LISTVIEW_CLASSES;
InitCommonControlsEx(&icex);
@@ -162,42 +155,35 @@ extern "C" int __declspec(dllexport) Load(void) mirfoxMiranda.getMirfoxData().setPluginState(MFENUM_PLUGIN_STATE_INIT);
mirfoxMiranda.onMirandaInterfaceLoad();
InitOptions();
-
- if (mirfoxMiranda.getMirfoxData().getPluginState() != MFENUM_PLUGIN_STATE_ERROR){
+
+ if (mirfoxMiranda.getMirfoxData().getPluginState() != MFENUM_PLUGIN_STATE_ERROR)
mirfoxMiranda.getMirfoxData().setPluginState(MFENUM_PLUGIN_STATE_WORK);
- } /*else {
- mirfoxMiranda.onMirandaInterfaceUnload();
- DeinitOptions();
- } */ //TODO
-
+
return 0;
}
+/////////////////////////////////////////////////////////////////////////////////////////
-extern "C" __declspec (dllexport) int Unload(void) {
-
+extern "C" __declspec (dllexport) int Unload(void)
+{
MFLogger::getInstance()->log(L"Unload: start");
-
- //wait for csmThread, msgQueueThread and userActionThread's end
+ // wait for csmThread, msgQueueThread and userActionThread's end
mirfoxMiranda.getMirfoxData().Plugin_Terminated = true;
UnhookEvent(hProtoAck);
int counter = 0;
const int UNLOAD_WAIT_TIME = 50; //[ms]
const int MAX_UNLOAD_WAIT_COUNTER = 10; //10 * 50ms = 0,5s
- while (mirfoxMiranda.getMirfoxData().workerThreadsCount > 0 ){
+ while (mirfoxMiranda.getMirfoxData().workerThreadsCount > 0) {
MFLogger::getInstance()->log_p(L"Unload: workerThreadsCount=%d > 0, waiting. counter=%d", mirfoxMiranda.getMirfoxData().workerThreadsCount, counter);
SleepEx(UNLOAD_WAIT_TIME, TRUE);
counter++;
}
- MFLogger::getInstance()->log_p(L"Unload: workerThreadsCount=%d. counter=%d", mirfoxMiranda.getMirfoxData().workerThreadsCount, counter);
-
+ MFLogger::getInstance()->log_p(L"Unload: workerThreadsCount=%d. counter=%d", mirfoxMiranda.getMirfoxData().workerThreadsCount, counter);
MFLogger::getInstance()->log(L"Unload: last log");
mirfoxMiranda.onMirandaInterfaceUnload();
DeinitOptions();
-
return 0;
}
-
|