diff options
| author | Vlad Mironov <mironych@googlemail.com> | 2012-06-30 15:24:11 +0000 |
|---|---|---|
| committer | Vlad Mironov <mironych@googlemail.com> | 2012-06-30 15:24:11 +0000 |
| commit | 008fe34954b0bda8fd3487a9658c14581ecd813a (patch) | |
| tree | f546ed4196e4a09311bf19878ff6e7d1af772d4c /plugins/Variables/tokenregister.cpp | |
| parent | 14f435dc730cf2b242cae1cc2a2f4d4c2a65162e (diff) | |
Наводим порядок.
git-svn-id: http://svn.miranda-ng.org/main/trunk@695 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Variables/tokenregister.cpp')
| -rw-r--r-- | plugins/Variables/tokenregister.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/Variables/tokenregister.cpp b/plugins/Variables/tokenregister.cpp index 50c81ddad8..d88b81949a 100644 --- a/plugins/Variables/tokenregister.cpp +++ b/plugins/Variables/tokenregister.cpp @@ -57,7 +57,8 @@ int registerIntToken(TCHAR *szToken, TCHAR *(*parseFunction)(ARGUMENTSINFO *ai), TOKENREGISTEREX tr = { 0 };
tr.cbSize = sizeof(tr);
tr.flags = TRF_FREEMEM|TRF_TCHAR|TRF_PARSEFUNC|extraFlags;
- tr.memType = TR_MEM_VARIABLES;
+ //tr.memType = TR_MEM_VARIABLES;
+ tr.memType = TR_MEM_MIRANDA;
tr.szHelpText = szHelpText;
tr.tszTokenString = szToken;
tr.parseFunctionT = parseFunction;
@@ -211,7 +212,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) cAi.argv[j] = u2a( ai->targv[j] );
if ( thisVr->flags & TRF_PARSEFUNC )
- callRes = (int)thisVr->parseFunction( &cAi );
+ callRes = (INT_PTR)thisVr->parseFunction( &cAi );
else if ( thisVr->szService != NULL)
callRes = CallService( thisVr->szService, (WPARAM)0, (LPARAM)&cAi );
@@ -225,7 +226,7 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) else {
// unicode variables calls unicode plugin
if ( thisVr->flags & TRF_PARSEFUNC )
- callRes = (int)thisVr->parseFunctionT( ai );
+ callRes = (INT_PTR)thisVr->parseFunctionT( ai );
else if ( thisVr->szService != NULL )
callRes = CallService( thisVr->szService, (WPARAM)0, (LPARAM)ai );
@@ -244,8 +245,8 @@ TCHAR *parseFromRegister(ARGUMENTSINFO *ai) if ( trCopy.flags & TRF_FREEMEM ) {
if ( trCopy.memType == TR_MEM_MIRANDA )
mir_free(( void* )callRes );
- else if ( trCopy.memType == TR_MEM_VARIABLES )
- free((void *)callRes);
+// else if ( trCopy.memType == TR_MEM_VARIABLES )
+// free((void *)callRes);
}
}
LeaveCriticalSection(&csRegister);
|