diff options
| author | George Hazan <ghazan@miranda.im> | 2018-06-01 15:45:30 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-06-01 15:45:30 +0300 |
| commit | 03b421197a6af2c626b87830f7309b7110ce5561 (patch) | |
| tree | fd0b03a602b57835e77a4ce190c947710c6b84aa | |
| parent | ba1d518f322c4f336f14c1d8e1dfb111e5860e26 (diff) | |
CMPluginBase::getModule: new helper for returning plugin's module
| -rw-r--r-- | include/newpluginapi.h | 1 | ||||
| -rw-r--r-- | libs/win32/mir_app.lib | bin | 169860 -> 170150 bytes | |||
| -rw-r--r-- | libs/win64/mir_app.lib | bin | 165048 -> 165348 bytes | |||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 1 | ||||
| -rw-r--r-- | src/mir_app/src/srmm_statusicon.cpp | 2 |
6 files changed, 4 insertions, 1 deletions
diff --git a/include/newpluginapi.h b/include/newpluginapi.h index d4c8a4eac0..709b099ace 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -181,6 +181,7 @@ public: void debugLogW(LPCWSTR wszFormat, ...);
__forceinline const PLUGININFOEX& getInfo() const { return m_pInfo; }
+ __forceinline const char* getModule() const { return m_szModuleName; }
__forceinline HINSTANCE getInst() const { return m_hInst; }
__forceinline void setInst(HINSTANCE hInst) { m_hInst = hInst; }
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 847b839939..e26e11a99f 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex 41f80a52d2..a699c36c3a 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 33f5a59f10..513d8cae5c 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -618,3 +618,4 @@ UnregisterPlugin @633 ?Load@CMPluginBase@@UAEHXZ @647 NONAME
?Unload@CMPluginBase@@UAEHXZ @648 NONAME
Srmm_ClickStatusIcon @649
+?getModule@CMPluginBase@@QBEPBDXZ @650 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 67d1f4ee8b..732effd29f 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -618,3 +618,4 @@ UnregisterPlugin @633 ?Load@CMPluginBase@@UEAAHXZ @647 NONAME
?Unload@CMPluginBase@@UEAAHXZ @648 NONAME
Srmm_ClickStatusIcon @649
+?getModule@CMPluginBase@@QEBAPEBDXZ @650 NONAME
diff --git a/src/mir_app/src/srmm_statusicon.cpp b/src/mir_app/src/srmm_statusicon.cpp index 34499a7f27..72e3a4f936 100644 --- a/src/mir_app/src/srmm_statusicon.cpp +++ b/src/mir_app/src/srmm_statusicon.cpp @@ -196,7 +196,7 @@ MIR_APP_DLL(StatusIconData*) Srmm_GetNthIcon(MCONTACT hContact, int index) /////////////////////////////////////////////////////////////////////////////////////////
-MIR_APP_DLL(void) Srmm_ClickStatusIcon(MCONTACT hContact, const StatusIconData *sid)
+MIR_APP_DLL(void) Srmm_ClickStatusIcon(MCONTACT hContact, const StatusIconClickData *sid)
{
NotifyEventHooks(hHookIconPressedEvt, hContact, (LPARAM)sid);
}
|