diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-01-10 23:33:35 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-01-10 23:33:35 +0000 |
| commit | 18448e7014c32235db05465f1bf76b30f9954029 (patch) | |
| tree | ebf78a23f27c92eeff9ad3d185258ea8fe029e97 /plugins/TabSRMM | |
| parent | 452fb59c22573ddf7939bea02b5e58f4f2e3916c (diff) | |
GCDEST::pszModule and GCDEST::ptszID must be constant
git-svn-id: http://svn.miranda-ng.org/main/trunk@7586 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/TabSRMM')
| -rw-r--r-- | plugins/TabSRMM/src/chat/tools.cpp | 12 | ||||
| -rw-r--r-- | plugins/TabSRMM/src/chat/window.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp index b22c898352..7230a6298f 100644 --- a/plugins/TabSRMM/src/chat/tools.cpp +++ b/plugins/TabSRMM/src/chat/tools.cpp @@ -1018,10 +1018,10 @@ BOOL DoEventHookAsync(HWND hwnd, const TCHAR *pszID, const char* pszModule, int GCHOOK *gch = (GCHOOK*)mir_calloc(sizeof(GCHOOK));
GCDEST *gcd = (GCDEST*)mir_calloc(sizeof(GCDEST));
- replaceStr(gcd->pszModule, pszModule);
- replaceStrT(gcd->ptszID, pszID);
- replaceStrT(gch->ptszUID, pszUID);
- replaceStrT(gch->ptszText, pszText);
+ gcd->pszModule = mir_strdup(pszModule);
+ gcd->ptszID = mir_tstrdup(pszID);
+ gch->ptszUID = mir_tstrdup(pszUID);
+ gch->ptszText = mir_tstrdup(pszText);
gcd->iType = iType;
gch->dwData = dwItem;
gch->pDest = gcd;
@@ -1035,8 +1035,8 @@ BOOL DoEventHook(const TCHAR *pszID, const char* pszModule, int iType, const TCH if (si == NULL)
return FALSE;
- GCHOOK gch = {0};
- GCDEST gcd = { (char*)pszModule, (LPTSTR)pszID, iType };
+ GCDEST gcd = { pszModule, pszID, iType };
+ GCHOOK gch = { 0 };
gch.ptszUID = (LPTSTR)pszUID;
gch.ptszText = (LPTSTR)pszText;
gch.dwData = dwItem;
diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp index 61b1dcd604..69a21e790f 100644 --- a/plugins/TabSRMM/src/chat/window.cpp +++ b/plugins/TabSRMM/src/chat/window.cpp @@ -2480,8 +2480,8 @@ LABEL_SHOWWINDOW: GCHOOK* gch = (GCHOOK*) lParam;
NotifyEventHooks(hSendEvent, 0, (WPARAM)gch);
if (gch->pDest) {
- mir_free(gch->pDest->ptszID);
- mir_free(gch->pDest->pszModule);
+ mir_free((void*)gch->pDest->ptszID);
+ mir_free((void*)gch->pDest->pszModule);
mir_free(gch->pDest);
}
mir_free(gch->ptszText);
|