diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-02-27 12:20:10 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-02-27 12:20:10 +0000 |
| commit | a21d750e3d96ea33a9039cd6bf95b019e5e66597 (patch) | |
| tree | f442d93fa407931db8bf58751d57d046e4bb4919 | |
| parent | c0c16a96a67312c05c1e836b885fc3ae6671f1a2 (diff) | |
more memory leaks fixed
git-svn-id: http://svn.miranda-ng.org/main/trunk@3794 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/Popup/src/main.cpp | 1 | ||||
| -rw-r--r-- | plugins/Popup/src/notifications.cpp | 2 | ||||
| -rw-r--r-- | src/modules/extraicons/extraicons.cpp | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 7c7986c40b..edd2caf603 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -465,6 +465,7 @@ MIRAPI int Unload(void) UnloadGDIPlus();
UnloadActions();
+ UnloadTreeData();
CloseHandle(hMainThread);
diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index 193baf5ccf..aa2a92338a 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -178,7 +178,7 @@ void LoadNotificationSettings(POPUPTREEDATA *ptd, char* szModul) HANDLE RegisterNotification(POPUPNOTIFICATION *notification)
{
- POPUPTREEDATA *ptd = (POPUPTREEDATA *)mir_alloc(sizeof(POPUPTREEDATA));
+ POPUPTREEDATA *ptd = (POPUPTREEDATA *)mir_alloc(sizeof(POPUPTREEDATA));
ptd->signature = PopupNotificationData_SIGNATURE;
ptd->typ = 1;
ptd->pszTreeRoot = mir_a2t(notification->lpzGroup);
diff --git a/src/modules/extraicons/extraicons.cpp b/src/modules/extraicons/extraicons.cpp index 5974e7fcc3..80187be9af 100644 --- a/src/modules/extraicons/extraicons.cpp +++ b/src/modules/extraicons/extraicons.cpp @@ -368,7 +368,8 @@ INT_PTR ExtraIcon_Register(WPARAM wParam, LPARAM lParam) if (ei->type == EXTRAICON_TYPE_CALLBACK && (ei->ApplyIcon == NULL || ei->RebuildIcons == NULL))
return 0;
- TCHAR *desc = Langpack_PcharToTchar(ei->description);
+ mir_ptr<TCHAR> tszDesc( mir_a2t(ei->description));
+ TCHAR *desc = TranslateTH(lParam, tszDesc);
BaseExtraIcon *extra = GetExtraIconByName(ei->name);
if (extra != NULL) {
|