From acdaebe9729b0d50168ff51657f1b8220302d82a Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 25 Mar 2021 15:32:16 +0300 Subject: ME_SYSTEM_MODULELOAD & ME_SYSTEM_MODULEUNLOAD: handier parameter passing --- plugins/Clist_modern/src/modern_toolbar.cpp | 4 ++-- plugins/Clist_nicer/src/CLCButton.cpp | 4 ++-- plugins/TopToolBar/src/toolbar.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins') diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 763cfc91f6..62d18be1a6 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -312,8 +312,8 @@ void CustomizeButton(HANDLE ttbid, HWND hWnd, LPARAM lParam); static int Toolbar_ModuleReloaded(WPARAM wParam, LPARAM) { - PLUGININFOEX *pInfo = (PLUGININFOEX*)wParam; - if (!mir_strcmpi(pInfo->shortName, "TopToolBar")) + auto &pInfo = HPLUGIN(wParam)->getInfo(); + if (!mir_strcmpi(pInfo.shortName, "TopToolBar")) TopToolbar_SetCustomProc(CustomizeButton, 0); return 0; diff --git a/plugins/Clist_nicer/src/CLCButton.cpp b/plugins/Clist_nicer/src/CLCButton.cpp index aefe2bb6bf..b046a55ffc 100644 --- a/plugins/Clist_nicer/src/CLCButton.cpp +++ b/plugins/Clist_nicer/src/CLCButton.cpp @@ -604,8 +604,8 @@ static int Nicer_CustomizeToolbar(WPARAM, LPARAM) static int Nicer_ReloadToolbar(WPARAM wParam, LPARAM) { - PLUGININFOEX *pInfo = (PLUGININFOEX*)wParam; - if (!_stricmp(pInfo->shortName, "TopToolBar")) + auto &pInfo = HPLUGIN(wParam)->getInfo(); + if (!_stricmp(pInfo.shortName, "TopToolBar")) TopToolbar_SetCustomProc(CustomizeToolbar, 0); return 0; } diff --git a/plugins/TopToolBar/src/toolbar.cpp b/plugins/TopToolBar/src/toolbar.cpp index 2b536faf2d..777c36c536 100644 --- a/plugins/TopToolBar/src/toolbar.cpp +++ b/plugins/TopToolBar/src/toolbar.cpp @@ -551,9 +551,9 @@ int OnPluginLoad(WPARAM, LPARAM lParam) ///////////////////////////////////////////////////////////////////////////////////////// // Removes buttons of plugins being unloaded. lParam = HINSTANCE -int OnPluginUnload(WPARAM, LPARAM lParam) +int OnPluginUnload(WPARAM wParam, LPARAM) { - HPLUGIN pPlugin = &GetPluginByInstance((HINSTANCE)lParam); + HPLUGIN pPlugin = HPLUGIN(wParam); if (pPlugin) { bool bNeedUpdate = false; mir_cslock lck(csButtonsHook); -- cgit v1.2.3