diff options
| author | George Hazan <ghazan@miranda.im> | 2019-04-12 13:06:33 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-04-12 13:06:33 +0300 |
| commit | 2a2ae7810fe1d5dcaa4e19d57b6010a4d84a338f (patch) | |
| tree | bbf01fcfa19a938e0e58eb4fdcca038ab079669b | |
| parent | 8469e07dd899482905b638c248200db6a7c16191 (diff) | |
missing parameter added
| -rw-r--r-- | include/newpluginapi.h | 4 | ||||
| -rw-r--r-- | libs/win32/mir_app.lib | bin | 190696 -> 190716 bytes | |||
| -rw-r--r-- | libs/win64/mir_app.lib | bin | 186598 -> 186618 bytes | |||
| -rw-r--r-- | src/mir_app/src/CMPluginBase.cpp | 8 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app.def | 4 | ||||
| -rw-r--r-- | src/mir_app/src/mir_app64.def | 4 |
6 files changed, 10 insertions, 10 deletions
diff --git a/include/newpluginapi.h b/include/newpluginapi.h index f479f5f9f4..69fa059881 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -174,9 +174,9 @@ public: void debugLogW(LPCWSTR wszFormat, ...);
__forceinline void addIcolib(HANDLE hIcolib) { m_arIcons.insert(hIcolib); }
- HICON getIcon(int iconId);
+ HICON getIcon(int iconId, bool big = false);
HANDLE getIconHandle(int iconId);
- void releaseIcon(int iconId);
+ void releaseIcon(int iconId, bool big = false);
__forceinline const PLUGININFOEX& getInfo() const { return m_pInfo; }
__forceinline const char* getModule() const { return m_szModuleName; }
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 20744cd2aa..759c5d1b4a 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 550c19b1b8..b1b5a76d8a 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/src/mir_app/src/CMPluginBase.cpp b/src/mir_app/src/CMPluginBase.cpp index 2b5fe51b29..17b72e227f 100644 --- a/src/mir_app/src/CMPluginBase.cpp +++ b/src/mir_app/src/CMPluginBase.cpp @@ -279,9 +279,9 @@ void CMPluginBase::debugLogW(LPCWSTR wszFormat, ...) ///////////////////////////////////////////////////////////////////////////////////////// -HICON CMPluginBase::getIcon(int iconId) +HICON CMPluginBase::getIcon(int iconId, bool big) { - return IcoLib_GetIconByHandle(getIconHandle(iconId)); + return IcoLib_GetIconByHandle(getIconHandle(iconId), big); } HANDLE CMPluginBase::getIconHandle(int iconId) @@ -291,9 +291,9 @@ HANDLE CMPluginBase::getIconHandle(int iconId) return m_arIcons.find(p); } -void CMPluginBase::releaseIcon(int iconId) +void CMPluginBase::releaseIcon(int iconId, bool big) { - IcoLib_ReleaseIcon(getIcon(iconId)); + IcoLib_ReleaseIcon(getIcon(iconId), big); } ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 2754e8aa53..ffce4e29f0 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -676,6 +676,6 @@ Popup_Change @765 Skin_GetProtoIcon @766
Srmm_SetIconFlags @767
?addIcolib@CMPluginBase@@QAEXPAX@Z @768 NONAME
-?getIcon@CMPluginBase@@QAEPAUHICON__@@H@Z @769 NONAME
+?getIcon@CMPluginBase@@QAEPAUHICON__@@H_N@Z @769 NONAME
?getIconHandle@CMPluginBase@@QAEPAXH@Z @770 NONAME
-?releaseIcon@CMPluginBase@@QAEXH@Z @771 NONAME
+?releaseIcon@CMPluginBase@@QAEXH_N@Z @771 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index dbb8284250..1c3b8e9832 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -676,6 +676,6 @@ Popup_Change @765 Skin_GetProtoIcon @766
Srmm_SetIconFlags @767
?addIcolib@CMPluginBase@@QEAAXPEAX@Z @768 NONAME
-?getIcon@CMPluginBase@@QEAAPEAUHICON__@@H@Z @769 NONAME
+?getIcon@CMPluginBase@@QEAAPEAUHICON__@@H_N@Z @769 NONAME
?getIconHandle@CMPluginBase@@QEAAPEAXH@Z @770 NONAME
-?releaseIcon@CMPluginBase@@QEAAXH@Z @771 NONAME
+?releaseIcon@CMPluginBase@@QEAAXH_N@Z @771 NONAME
|