diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-02-21 10:08:23 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-02-21 10:08:23 +0000 |
| commit | b303f760e66adcb879cae5024c7c264d2c23f2d3 (patch) | |
| tree | 7bc237efb81e9e7adc9f74d852f428b58d80c50f | |
| parent | 89f862d1c19935230609e6e2df27695ac21eb9d4 (diff) | |
fix for passing valid parameter into ME_SYSTEM_MODULELOAD/ME_SYSTEM_MODULEUNLOAD
git-svn-id: http://svn.miranda-ng.org/main/trunk@3660 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/TopToolBar/src/toolbar.cpp | 4 | ||||
| -rw-r--r-- | src/modules/plugins/newplugins.cpp | 4 | ||||
| -rw-r--r-- | src/modules/plugins/pluginopts.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index 8a2b29407e..655117fc50 100644 --- a/plugins/TopToolBar/src/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp @@ -560,7 +560,7 @@ static INT_PTR TTBSetCustomProc(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////////////////
// Adds buttons of plugins being loaded. lParam = HINSTANCE
-int OnPluginLoad(WPARAM wParam, LPARAM lParam)
+int OnPluginLoad(WPARAM, LPARAM lParam)
{
CallPluginEventHook((HINSTANCE)lParam, hTTBModuleLoaded, 0, 0);
if (g_ctrl->hWnd && g_ctrl->bOrderChanged)
@@ -571,7 +571,7 @@ int OnPluginLoad(WPARAM wParam, LPARAM lParam) /////////////////////////////////////////////////////////////////////////////////////////
// Removes buttons of plugins being unloaded. lParam = HINSTANCE
-int OnPluginUnload(WPARAM wParam, LPARAM lParam)
+int OnPluginUnload(WPARAM, LPARAM lParam)
{
int hLangpack = CallService(MS_LANGPACK_LOOKUPHANDLE, 0, lParam);
if (hLangpack) {
diff --git a/src/modules/plugins/newplugins.cpp b/src/modules/plugins/newplugins.cpp index 7b3ef4b408..7ce226db19 100644 --- a/src/modules/plugins/newplugins.cpp +++ b/src/modules/plugins/newplugins.cpp @@ -347,7 +347,7 @@ int Plugin_UnloadDyn(pluginEntry* p) if ( CallPluginEventHook(p->bpi.hInst, hOkToExitEvent, 0, 0) != 0)
return FALSE;
- NotifyEventHooks(hevUnloadModule, (WPARAM)p->bpi.InfoEx, (LPARAM)p->bpi.hInst);
+ NotifyEventHooks(hevUnloadModule, (WPARAM)p->bpi.pluginInfo, (LPARAM)p->bpi.hInst);
CallPluginEventHook(p->bpi.hInst, hPreShutdownEvent, 0, 0);
CallPluginEventHook(p->bpi.hInst, hShutdownEvent, 0, 0);
@@ -585,7 +585,7 @@ LBL_Error: if (CallPluginEventHook(pPlug->bpi.hInst, hModulesLoadedEvent, 0, 0) != 0)
goto LBL_Error;
- NotifyEventHooks(hevLoadModule, (WPARAM)pPlug->bpi.InfoEx, (LPARAM)pPlug->bpi.hInst);
+ NotifyEventHooks(hevLoadModule, (WPARAM)pPlug->bpi.pluginInfo, (LPARAM)pPlug->bpi.hInst);
}
mr.pImpl = pPlug;
return TRUE;
diff --git a/src/modules/plugins/pluginopts.cpp b/src/modules/plugins/pluginopts.cpp index af142f83a6..8448b255bb 100644 --- a/src/modules/plugins/pluginopts.cpp +++ b/src/modules/plugins/pluginopts.cpp @@ -183,7 +183,7 @@ LBL_Error: goto LBL_Error;
dat->hInst = pPlug->bpi.hInst;
- NotifyEventHooks(hevLoadModule, (WPARAM)pPlug->bpi.InfoEx, (LPARAM)pPlug->bpi.hInst);
+ NotifyEventHooks(hevLoadModule, (WPARAM)pPlug->bpi.pluginInfo, (LPARAM)pPlug->bpi.hInst);
return TRUE;
}
|