another part of small project fixes and x64 adaptation in some cases

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@230 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

1 files changed, 8 insertions, 8 deletions

diff --git a/QuickMessages/main.c b/QuickMessages/main.c
index 001aae9..6a387d5 100644
--- a/QuickMessages/main.c
+++ b/QuickMessages/main.c
@@ -121,7 +121,7 @@ static int InputMenuPopup(WPARAM wParam,LPARAM lParam)
 						hData = GetClipboardData(CF_TEXT);

 #endif

 						chBuffer= (TCHAR*)GlobalLock(hData);

-						textLength=_tcslen(chBuffer);

+						textLength=(int)_tcslen(chBuffer);

 						pszCBText=mir_tstrdup(chBuffer);

 						GlobalUnlock(hData);

 						CloseClipboard();

@@ -138,7 +138,7 @@ static int InputMenuPopup(WPARAM wParam,LPARAM lParam)
 					SendMessage(mwpd->hwnd,EM_GETSELTEXT, 0, (LPARAM)pszText);

 					}

 				if(qd->ptszValue){

-						ptszQValue=ParseString(mwpd->hContact,qd->ptszValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),_tcslen(qd->ptszValue),textlenght,pszCBText?_tcslen(pszCBText):0);

+						ptszQValue=ParseString(mwpd->hContact,qd->ptszValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),(int)_tcslen(qd->ptszValue),textlenght,pszCBText?(int)_tcslen(pszCBText):0);

 					if((bIsService=qd->bIsService)&&ptszQValue)

 #ifdef _UNICODE

 						CallService(mir_u2a(ptszQValue),(WPARAM)mwpd->hContact,0);

@@ -200,7 +200,7 @@ static int CustomButtonPressed(WPARAM wParam,LPARAM lParam)
 			hData = GetClipboardData(CF_TEXT);

 #endif

 			chBuffer= (TCHAR*)GlobalLock(hData);

-			textLength=_tcslen(chBuffer);

+			textLength=(int)_tcslen(chBuffer);

 			pszCBText=mir_tstrdup(chBuffer);

 			GlobalUnlock(hData);

 			CloseClipboard();

@@ -238,7 +238,7 @@ static int CustomButtonPressed(WPARAM wParam,LPARAM lParam)
 		{

 		case 1:

 			if(ButtonsList[cbcd->dwButtonId]->ptszQValue)

-				ptszQValue=ParseString(cbcd->hContact,ButtonsList[cbcd->dwButtonId]->ptszQValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),_tcslen(ButtonsList[cbcd->dwButtonId]->ptszQValue),textlenght,pszCBText?_tcslen(pszCBText):0);

+				ptszQValue=ParseString(cbcd->hContact,ButtonsList[cbcd->dwButtonId]->ptszQValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),(int)_tcslen(ButtonsList[cbcd->dwButtonId]->ptszQValue),textlenght,pszCBText?(int)_tcslen(pszCBText):0);

 			if((bIsService=ButtonsList[cbcd->dwButtonId]->bIsServName)&&ptszQValue)

 #ifdef _UNICODE

 				CallService(mir_u2a(ptszQValue),(WPARAM)cbcd->hContact,0);

@@ -251,7 +251,7 @@ static int CustomButtonPressed(WPARAM wParam,LPARAM lParam)
 			ButtonData * bd=NULL;

 			bd=(ButtonData *)sl->items[0];

 			if(bd&&bd->pszValue){

-				ptszQValue=ParseString(cbcd->hContact,bd->pszValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),_tcslen(bd->pszValue),textlenght,pszCBText?_tcslen(pszCBText):0);

+				ptszQValue=ParseString(cbcd->hContact,bd->pszValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),(int)_tcslen(bd->pszValue),textlenght,pszCBText?(int)_tcslen(pszCBText):0);

 				if((bIsService=bd->bIsServName)&&ptszQValue)

 #ifdef _UNICODE

 						CallService(mir_u2a(ptszQValue),(WPARAM)cbcd->hContact,0);

@@ -302,7 +302,7 @@ static int CustomButtonPressed(WPARAM wParam,LPARAM lParam)
 			bd= (ButtonData *)sl->items[res-1];

 			bCTRL=(GetKeyState(VK_CONTROL)&0x8000)?1:0;

 			if(bd->pszValue){

-				ptszQValue=ParseString(cbcd->hContact,bd->pszValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),_tcslen(bd->pszValue),textlenght,pszCBText?_tcslen(pszCBText):0);

+				ptszQValue=ParseString(cbcd->hContact,bd->pszValue,pszText?pszText:_T(""),pszCBText?pszCBText:_T(""),(int)_tcslen(bd->pszValue),textlenght,pszCBText?(int)_tcslen(pszCBText):0);

 					if((bIsService=bd->bIsServName)&&ptszQValue)

 #ifdef _UNICODE

 						CallService(mir_u2a(ptszQValue),(WPARAM)cbcd->hContact,0);

@@ -352,12 +352,12 @@ static int PluginInit(WPARAM wparam,LPARAM lparam)
 		update.cbSize = sizeof(Update);

 		update.szComponentName = pluginInfo.shortName;

 		update.pbVersion = (BYTE *) CreateVersionString(pluginInfo.version, buffer);

-		update.cpbVersion = strlen((char *) update.pbVersion);

+		update.cpbVersion = (int)strlen((char *) update.pbVersion);

 		//update.szUpdateURL = UPDATER_AUTOREGISTER;

 		update.szBetaVersionURL = QMESSAGES_VERSION_URL;

 		update.szBetaUpdateURL = QMESSAGES_UPDATE_URL;

 		update.pbBetaVersionPrefix = (BYTE *) QMESSAGES_VERSION_PREFIX;

-		update.cpbBetaVersionPrefix = strlen(QMESSAGES_VERSION_PREFIX);

+		update.cpbBetaVersionPrefix = (int)strlen(QMESSAGES_VERSION_PREFIX);

 		update.szBetaChangelogURL=QMESSAGES_CHAGELOG_URL;

 		CallService(MS_UPDATE_REGISTER, 0, (LPARAM) &update);

 		}