From 008fe34954b0bda8fd3487a9658c14581ecd813a Mon Sep 17 00:00:00 2001 From: Vlad Mironov Date: Sat, 30 Jun 2012 15:24:11 +0000 Subject: =?UTF-8?q?=D0=9D=D0=B0=D0=B2=D0=BE=D0=B4=D0=B8=D0=BC=20=D0=BF?= =?UTF-8?q?=D0=BE=D1=80=D1=8F=D0=B4=D0=BE=D0=BA.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://svn.miranda-ng.org/main/trunk@695 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Variables/tokenregister.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'plugins/Variables/tokenregister.cpp') 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); -- cgit v1.2.3