From c77af32ca5d045a672f97bea69d905646bb7de95 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sun, 11 Sep 2016 10:26:49 +0000 Subject: MS_CLIST_EXTRA_ADD_ICON - forgotten EI service git-svn-id: http://svn.miranda-ng.org/main/trunk@17280 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/lib/mir_app.lib | Bin 75000 -> 75230 bytes bin10/lib/mir_app64.lib | Bin 72224 -> 72434 bytes bin12/lib/mir_app.lib | Bin 75000 -> 75230 bytes bin12/lib/mir_app64.lib | Bin 72224 -> 72434 bytes bin14/lib/mir_app.lib | Bin 75000 -> 75230 bytes bin14/lib/mir_app64.lib | Bin 72224 -> 72434 bytes include/delphi/m_extraicons.inc | 7 ------- include/m_extraicons.h | 13 +++++-------- plugins/FingerprintNG/src/fingerprint.cpp | 2 +- plugins/SecureIM/src/crypt_icons.cpp | 2 +- src/mir_app/src/DefaultExtraIcons.cpp | 2 +- src/mir_app/src/extraicons.cpp | 11 ++--------- src/mir_app/src/extraicons.h | 2 -- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + src/mir_app/src/srmm_statusicon.cpp | 4 ++-- src/mir_app/src/usedIcons.cpp | 2 +- 17 files changed, 15 insertions(+), 32 deletions(-) diff --git a/bin10/lib/mir_app.lib b/bin10/lib/mir_app.lib index 9d9cae772b..1c38892c4b 100644 Binary files a/bin10/lib/mir_app.lib and b/bin10/lib/mir_app.lib differ diff --git a/bin10/lib/mir_app64.lib b/bin10/lib/mir_app64.lib index 2b94aead96..2e79a59692 100644 Binary files a/bin10/lib/mir_app64.lib and b/bin10/lib/mir_app64.lib differ diff --git a/bin12/lib/mir_app.lib b/bin12/lib/mir_app.lib index 9d9cae772b..1c38892c4b 100644 Binary files a/bin12/lib/mir_app.lib and b/bin12/lib/mir_app.lib differ diff --git a/bin12/lib/mir_app64.lib b/bin12/lib/mir_app64.lib index 2b94aead96..2e79a59692 100644 Binary files a/bin12/lib/mir_app64.lib and b/bin12/lib/mir_app64.lib differ diff --git a/bin14/lib/mir_app.lib b/bin14/lib/mir_app.lib index 9d9cae772b..1c38892c4b 100644 Binary files a/bin14/lib/mir_app.lib and b/bin14/lib/mir_app.lib differ diff --git a/bin14/lib/mir_app64.lib b/bin14/lib/mir_app64.lib index 2b94aead96..2e79a59692 100644 Binary files a/bin14/lib/mir_app64.lib and b/bin14/lib/mir_app64.lib differ diff --git a/include/delphi/m_extraicons.inc b/include/delphi/m_extraicons.inc index e247599761..bca17226ef 100644 --- a/include/delphi/m_extraicons.inc +++ b/include/delphi/m_extraicons.inc @@ -24,13 +24,6 @@ const EMPTY_EXTRA_ICON = $FFFF; const -// Adding icon to extra image list. -// Used for EXTRAICON_TYPE_CALLBACK extra icons -// -// wparam = (HICON)hIcon -// lparam = 0 (unused) -// return HANDLE hImage on success or INVALID_HANDLE_VALUE on failure - MS_CLIST_EXTRA_ADD_ICON:PansiChar = 'CListFrames/AddIconToExtraImageList'; //called with wparam=hContact ME_CLIST_EXTRA_IMAGE_APPLY:PansiChar = 'CListFrames/OnExtraImageApply'; diff --git a/include/m_extraicons.h b/include/m_extraicons.h index 783eebcaec..e07384cedb 100644 --- a/include/m_extraicons.h +++ b/include/m_extraicons.h @@ -32,14 +32,6 @@ Boston, MA 02111-1307, USA. #define EMPTY_EXTRA_ICON 0xFFFF -// Adding icon to extra image list. -// Used for EXTRAICON_TYPE_CALLBACK extra icons -// -// wparam = (HICON)hIcon -// lparam = 0 (unused) -// return HANDLE hImage on success or INVALID_HANDLE_VALUE on failure -#define MS_CLIST_EXTRA_ADD_ICON "CListFrames/AddIconToExtraImageList" - //called with wparam=hContact #define ME_CLIST_EXTRA_IMAGE_APPLY "CListFrames/OnExtraImageApply" @@ -124,4 +116,9 @@ EXTERN_C MIR_APP_DLL(int) ExtraIcon_SetIconByName(HANDLE hExtraIcon, MCONTACT hC EXTERN_C MIR_APP_DLL(int) ExtraIcon_Clear(HANDLE hExtraIcon, MCONTACT hContact); +// Adding icon to extra image list. +// Used for EXTRAICON_TYPE_CALLBACK extra icons + +EXTERN_C MIR_APP_DLL(HANDLE) ExtraIcon_AddIcon(HICON hIcon); + #endif // __M_EXTRAICONS_H__ diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 0ec2887af0..c632f6f5d6 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -722,7 +722,7 @@ HANDLE __fastcall GetIconIndexFromFI(LPTSTR szMirVer) fiList[nFICount].dwArray = val; if (hIcon != NULL) { - hFoundImage = (HANDLE)CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)hIcon, 0); + hFoundImage = ExtraIcon_AddIcon(hIcon); fiList[nFICount].hRegisteredImage = hFoundImage; DestroyIcon(hIcon); } diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp index 704b2a8254..b636464e38 100644 --- a/plugins/SecureIM/src/crypt_icons.cpp +++ b/plugins/SecureIM/src/crypt_icons.cpp @@ -56,7 +56,7 @@ HANDLE mode2clicon(int mode, int type) ICON_CACHE &p = getCacheItem(mode, type); if (p.hCLIcon == NULL) - p.hCLIcon = (HANDLE)CallService(MS_CLIST_EXTRA_ADD_ICON, (WPARAM)p.icon, 0); + p.hCLIcon = ExtraIcon_AddIcon(p.icon); return p.hCLIcon; } diff --git a/src/mir_app/src/DefaultExtraIcons.cpp b/src/mir_app/src/DefaultExtraIcons.cpp index 40a38d8397..d7e6ec54cb 100644 --- a/src/mir_app/src/DefaultExtraIcons.cpp +++ b/src/mir_app/src/DefaultExtraIcons.cpp @@ -266,7 +266,7 @@ static ProtoInfo* FindProto(const char *proto) if (hIcon == NULL) return NULL; - HANDLE hImage = ExtraIcon_Add(hIcon); + HANDLE hImage = ExtraIcon_AddIcon(hIcon); if (hImage == INVALID_HANDLE_VALUE) return NULL; diff --git a/src/mir_app/src/extraicons.cpp b/src/mir_app/src/extraicons.cpp index aae28f5ff2..10a6bb853b 100644 --- a/src/mir_app/src/extraicons.cpp +++ b/src/mir_app/src/extraicons.cpp @@ -278,7 +278,7 @@ HANDLE hEventExtraImageListRebuilding, hEventExtraImageApplying, hEventExtraClic static bool bImageCreated = false; static HIMAGELIST hExtraImageList; -HANDLE ExtraIcon_Add(HICON hIcon) +MIR_APP_DLL(HANDLE) ExtraIcon_AddIcon(HICON hIcon) { if (hExtraImageList == 0 || hIcon == 0) return INVALID_HANDLE_VALUE; @@ -485,11 +485,6 @@ MIR_APP_DLL(int) ExtraIcon_Clear(HANDLE hExtraIcon, MCONTACT hContact) return extra->setIcon((INT_PTR)hExtraIcon, hContact, NULL); } -static INT_PTR svcExtraIcon_Add(WPARAM wParam, LPARAM) -{ - return (INT_PTR)ExtraIcon_Add((HICON)wParam); -} - /////////////////////////////////////////////////////////////////////////////// static IconItem iconList[] = @@ -501,9 +496,7 @@ static IconItem iconList[] = void LoadExtraIconsModule() { - // Services - CreateServiceFunction(MS_CLIST_EXTRA_ADD_ICON, svcExtraIcon_Add); - + // Events hEventExtraClick = CreateHookableEvent(ME_CLIST_EXTRA_CLICK); hEventExtraImageApplying = CreateHookableEvent(ME_CLIST_EXTRA_IMAGE_APPLY); hEventExtraImageListRebuilding = CreateHookableEvent(ME_CLIST_EXTRA_LIST_REBUILD); diff --git a/src/mir_app/src/extraicons.h b/src/mir_app/src/extraicons.h index 285c8372a7..1213654115 100644 --- a/src/mir_app/src/extraicons.h +++ b/src/mir_app/src/extraicons.h @@ -42,8 +42,6 @@ int Clist_SetExtraIcon(MCONTACT hContact, int slot, HANDLE hImage); void DefaultExtraIcons_Load(); -HANDLE ExtraIcon_Add(HICON hIcon); - void fnReloadExtraIcons(); void fnSetAllExtraIcons(MCONTACT hContact); diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 0a7e79dcec..dfd4856bbf 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -279,3 +279,4 @@ Srmm_AddIcon @278 Srmm_GetNthIcon @279 Srmm_ModifyIcon @280 Srmm_RemoveIcon @281 +ExtraIcon_AddIcon @282 diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 76df5da91f..6e1cfb3ff0 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -279,3 +279,4 @@ Srmm_AddIcon @278 Srmm_GetNthIcon @279 Srmm_ModifyIcon @280 Srmm_RemoveIcon @281 +ExtraIcon_AddIcon @282 diff --git a/src/mir_app/src/srmm_statusicon.cpp b/src/mir_app/src/srmm_statusicon.cpp index 1ca52bb065..eb2ded0671 100644 --- a/src/mir_app/src/srmm_statusicon.cpp +++ b/src/mir_app/src/srmm_statusicon.cpp @@ -78,7 +78,7 @@ static HANDLE hHookIconsChanged; ///////////////////////////////////////////////////////////////////////////////////////// -MIR_APP_DLL(int) Srmm_AddIcon(StatusIconData *sid, int hLangpack) +MIR_APP_DLL(int) Srmm_AddIcon(StatusIconData *sid, int _hLangpack) { if (sid == NULL || sid->cbSize != sizeof(StatusIconData)) return 1; @@ -89,7 +89,7 @@ MIR_APP_DLL(int) Srmm_AddIcon(StatusIconData *sid, int hLangpack) p = new StatusIconMain; memcpy(&p->sid, sid, sizeof(p->sid)); - p->hLangpack = hLangpack; + p->hLangpack = _hLangpack; p->sid.szModule = mir_strdup(sid->szModule); if (sid->flags & MBF_UNICODE) p->sid.tszTooltip = mir_wstrdup(sid->wszTooltip); diff --git a/src/mir_app/src/usedIcons.cpp b/src/mir_app/src/usedIcons.cpp index 26890bef4f..6c0b129c90 100644 --- a/src/mir_app/src/usedIcons.cpp +++ b/src/mir_app/src/usedIcons.cpp @@ -55,7 +55,7 @@ static Icon* FindIcon(const char *icolibName) if (icon->hImage == INVALID_HANDLE_VALUE) { HICON hIcon = IcoLib_GetIcon(icon->name); if (hIcon != NULL) { - icon->hImage = ExtraIcon_Add(hIcon); + icon->hImage = ExtraIcon_AddIcon(hIcon); IcoLib_ReleaseIcon(hIcon); } } -- cgit v1.2.3