- Another portion of _T replacement and fixes of previous commits (patch from person)

git-svn-id: http://svn.miranda-ng.org/main/trunk@3173 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 36 insertions, 36 deletions

diff --git a/plugins/SMS/src/SMSConstans.h b/plugins/SMS/src/SMSConstans.h
index 3b35bd0d04..2642a56c7d 100644
--- a/plugins/SMS/src/SMSConstans.h
+++ b/plugins/SMS/src/SMSConstans.h
@@ -63,7 +63,7 @@ struct FontOptionsList
 }

 

 static fontOptionsList[] = {

-	{ RGB(106, 106, 106), L"Arial",    0, -12},

+	{ RGB(106, 106, 106), _T("Arial"),    0, -12},

 };

 

 

diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp
index 2fc592a9ae..548d191827 100644
--- a/plugins/SMS/src/functions.cpp
+++ b/plugins/SMS/src/functions.cpp
@@ -411,10 +411,10 @@ return(bRet);
 	va_start(va,tag1);

 	while (TRUE)

 	{

-		lpwszTagStart=(LPWSTR)MemoryFind((lpwszTagEnd-lpwszXML),lpwszXML,dwXMLSize,L"<",2);

+		lpwszTagStart=(LPWSTR)MemoryFind((lpwszTagEnd-lpwszXML),lpwszXML,dwXMLSize,_T("<"),2);

 		if (lpwszTagStart)

 		{

-			lpwszTagEnd=(LPWSTR)MemoryFind((lpwszTagStart-lpwszXML),lpwszXML,dwXMLSize,L">",2);

+			lpwszTagEnd=(LPWSTR)MemoryFind((lpwszTagStart-lpwszXML),lpwszXML,dwXMLSize,_T(">"),2);

 			if (lpwszTagEnd)

 			{

 				lpwszTagStart++;

diff --git a/plugins/SMS/src/options.cpp b/plugins/SMS/src/options.cpp
index ba59c60204..3ad176f351 100644
--- a/plugins/SMS/src/options.cpp
+++ b/plugins/SMS/src/options.cpp
@@ -37,7 +37,7 @@ INT_PTR CALLBACK DlgProcEditorOptions(HWND hWndDlg, UINT msg, WPARAM wParam, LPA
 		TranslateDialogDefault(hWndDlg);

 

 		if (DB_SMS_GetStaticStringW(NULL,"Signature",wszSign,SIZEOF(wszSign),NULL)==FALSE)

-			mir_sntprintf(wszSign,SIZEOF(wszSign),TranslateW(L"From %s:\r\n\r\n"),GetContactNameW(NULL));

+			mir_sntprintf(wszSign,SIZEOF(wszSign),TranslateW(_T("From %s:\r\n\r\n")),GetContactNameW(NULL));

 

 		SET_DLG_ITEM_TEXTW(hWndDlg,IDC_SIGNATURE,wszSign);

 		{

diff --git a/plugins/SMS/src/receive.cpp b/plugins/SMS/src/receive.cpp
index 254eb9938a..2363b4dc31 100644
--- a/plugins/SMS/src/receive.cpp
+++ b/plugins/SMS/src/receive.cpp
@@ -170,7 +170,7 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam)
 						GetXMLFieldExBuff(lpszXML,dwXMLSize,szBuff,sizeof(szBuff),NULL,"sms_response","error","params","param",NULL);

 					}

 

-					mir_sntprintf(wszErrorMessage,SIZEOF(wszErrorMessage),TranslateW(L"SMS message didn't send by %S to %s because: %S"),szNetwork,wszPhone,lpszErrorDescription);

+					mir_sntprintf(wszErrorMessage,SIZEOF(wszErrorMessage),TranslateW(_T("SMS message didn't send by %S to %s because: %S")),szNetwork,wszPhone,lpszErrorDescription);

 					ShowWindow(hWndDlg,SW_SHOWNORMAL);

 					EnableWindow(hWndDlg,FALSE);

 					hwndTimeOut=CreateDialog(ssSMSSettings.hInstance,MAKEINTRESOURCE(IDD_SENDSMSTIMEDOUT),hWndDlg,SMSTimedOutDlgProc);

@@ -198,8 +198,8 @@ int handleAckSMS(WPARAM wParam,LPARAM lParam)
 									GetXMLFieldExBuff(lpszXML,dwXMLSize,szMessageID,sizeof(szMessageID),NULL,"sms_response","message_id",NULL);

 								}

 								else {

-									SET_DLG_ITEM_TEXTW(hwndAccepted,IDC_ST_SOURCE,TranslateW(L"From:"));

-									SET_DLG_ITEM_TEXTW(hwndAccepted,IDC_ST_MESSAGEID,TranslateW(L"To:"));

+									SET_DLG_ITEM_TEXTW(hwndAccepted,IDC_ST_SOURCE,TranslateW(_T("From:")));

+									SET_DLG_ITEM_TEXTW(hwndAccepted,IDC_ST_MESSAGEID,TranslateW(_T("To:")));

 									GetXMLFieldExBuff(lpszXML,dwXMLSize,szSource,sizeof(szSource),NULL,"sms_response","from",NULL);

 									GetXMLFieldExBuff(lpszXML,dwXMLSize,szMessageID,sizeof(szMessageID),NULL,"sms_response","to",NULL);

 								}

@@ -258,7 +258,7 @@ int handleNewMessage(WPARAM wParam,LPARAM lParam)
 						cle.hDbEvent=hDbEvent;

 						cle.hIcon=LoadSkinnedIcon(SKINICON_OTHER_SMS);

 						cle.pszService=szServiceFunction;

-						mir_sntprintf(szToolTip,SIZEOF(szToolTip),TranslateW(L"SMS Message from %s"),GetContactNameW(hContact));

+						mir_sntprintf(szToolTip,SIZEOF(szToolTip),TranslateW(_T("SMS Message from %s")),GetContactNameW(hContact));

 						cle.ptszTooltip=szToolTip;

 						CallService(MS_CLIST_ADDEVENT,0,(LPARAM)&cle);

 					}

@@ -286,7 +286,7 @@ int handleNewMessage(WPARAM wParam,LPARAM lParam)
 						cle.hDbEvent=hDbEvent;

 						cle.hIcon=(HICON)LoadImage(ssSMSSettings.hInstance,MAKEINTRESOURCE(iIcon),IMAGE_ICON,0,0,LR_SHARED);

 						cle.pszService=szServiceFunction;

-						mir_sntprintf(szToolTip,SIZEOF(szToolTip),TranslateW(L"SMS Confirmation from %s"),GetContactNameW(hContact));

+						mir_sntprintf(szToolTip,SIZEOF(szToolTip),TranslateW(_T("SMS Confirmation from %s")),GetContactNameW(hContact));

 						cle.ptszTooltip=szToolTip;

 						CallService(MS_CLIST_ADDEVENT,0,(LPARAM)&cle);

 					}

diff --git a/plugins/SMS/src/recvdlg.cpp b/plugins/SMS/src/recvdlg.cpp
index 33a1a3145a..cf76b4e3c5 100644
--- a/plugins/SMS/src/recvdlg.cpp
+++ b/plugins/SMS/src/recvdlg.cpp
@@ -199,16 +199,16 @@ HWND RecvSMSWindowAdd(HANDLE hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T
 

 					switch(dwEventType){

 					case ICQEVENTTYPE_SMS:

-						lpwszTitlepart=TranslateW(L"Received SMS");

+						lpwszTitlepart=TranslateW(_T("Received SMS"));

 						hIcon=LoadSkinnedIcon(SKINICON_OTHER_SMS);

 						break;

 					case ICQEVENTTYPE_SMSCONFIRMATION:

-						lpwszTitlepart=TranslateW(L"Received SMS Confirmation");

+						lpwszTitlepart=TranslateW(_T("Received SMS Confirmation"));

 						GetDataFromMessage(lpszMessage,dwMessageSize,NULL,NULL,0,NULL,&iIcon);

 						hIcon=(HICON)LoadImage(ssSMSSettings.hInstance,MAKEINTRESOURCE(iIcon),IMAGE_ICON,0,0,LR_SHARED);

 						break;

 					default:

-						lpwszTitlepart=L"Unknown event type";

+						lpwszTitlepart=_T("Unknown event type");

 					}

 

 					wszPhoneLocal[0]='+';

@@ -221,7 +221,7 @@ HWND RecvSMSWindowAdd(HANDLE hContact,DWORD dwEventType,LPWSTR lpwszPhone,SIZE_T
 					}

 

 					lpwszContactDisplayName=GetContactNameW(hContact);

-					mir_sntprintf(wszTitle,SIZEOF(wszTitle),L"%s - %s",lpwszContactDisplayName,lpwszTitlepart);

+					mir_sntprintf(wszTitle,SIZEOF(wszTitle),_T("%s - %s"),lpwszContactDisplayName,lpwszTitlepart);

 					MultiByteToWideChar(CP_UTF8,0,lpszMessage,dwMessageSize,lpwszMessage,(dwMessageSize+MAX_PATH));

 

 					SendMessageW(prswdWindowData->hWnd,WM_SETTEXT,NULL,(LPARAM)wszTitle);

diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp
index 237c2ec476..c3196bded9 100644
--- a/plugins/SMS/src/senddlg.cpp
+++ b/plugins/SMS/src/senddlg.cpp
@@ -119,19 +119,19 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 			ti.cbSize=sizeof(ti);

 			ti.uFlags=TTF_IDISHWND|TTF_SUBCLASS;

 			ti.uId=(UINT)GetDlgItem(hWndDlg,IDC_HISTORY);

-			ti.lpszText=TranslateW(L"View User's History");

+			ti.lpszText=TranslateW(_T("View User's History"));

 			SendMessage(hwndToolTips,TTM_ADDTOOL,0,(LPARAM)&ti);

 			ti.uId=(UINT)GetDlgItem(hWndDlg,IDC_ADDNUMBER);

-			ti.lpszText=TranslateW(L"Add Number To The Multiple List");

+			ti.lpszText=TranslateW(_T("Add Number To The Multiple List"));

 			SendMessage(hwndToolTips,TTM_ADDTOOL,0,(LPARAM)&ti);

 			ti.uId=(UINT)GetDlgItem(hWndDlg,IDC_SAVENUMBER);

-			ti.lpszText=TranslateW(L"Save Number To The User's Details Phonebook");

+			ti.lpszText=TranslateW(_T("Save Number To The User's Details Phonebook"));

 			SendMessage(hwndToolTips,TTM_ADDTOOL,0,(LPARAM)&ti);

 			ti.uId=(UINT)GetDlgItem(hWndDlg,IDC_MULTIPLE);

-			ti.lpszText=TranslateW(L"Show/Hide Multiple List");

+			ti.lpszText=TranslateW(_T("Show/Hide Multiple List"));

 			SendMessage(hwndToolTips,TTM_ADDTOOL,0,(LPARAM)&ti);

 			ti.uId=(UINT)GetDlgItem(hWndDlg,IDC_COUNT);

-			ti.lpszText=TranslateW(L"Shows How Much Chars You've Typed");

+			ti.lpszText=TranslateW(_T("Shows How Much Chars You've Typed"));

 			SendMessage(hwndToolTips,TTM_ADDTOOL,0,(LPARAM)&ti);

 		}

 		{

@@ -156,7 +156,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 				EnableWindow(GetDlgItem(hWndDlg,IDOK),dwSignLen);

 			}

 

-			mir_sntprintf(wszSign,SIZEOF(wszSign),L"%d/%d",dwSignLen,GetSMSMessageLenMax(hWndDlg));

+			mir_sntprintf(wszSign,SIZEOF(wszSign),_T("%d/%d"),dwSignLen,GetSMSMessageLenMax(hWndDlg));

 			SET_DLG_ITEM_TEXTW(hWndDlg,IDC_COUNT,wszSign);

 		}

 

@@ -224,7 +224,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 			}else{

 				GET_DLG_ITEM_TEXTW(hWndDlg,IDC_ADDRESS,wszPhone,SIZEOF(wszPhone));

 			}

-			mir_sntprintf(wszMessage,SIZEOF(wszMessage),TranslateW(L"The SMS message send to %s timed out."),wszPhone);

+			mir_sntprintf(wszMessage,SIZEOF(wszMessage),TranslateW(_T("The SMS message send to %s timed out.")),wszPhone);

 			KillTimer(hWndDlg,wParam);

 			ShowWindow(hWndDlg,SW_SHOWNORMAL);

 			EnableWindow(hWndDlg,FALSE);

@@ -317,7 +317,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 					tvis.item.pszText = wszPhone;

 					TreeView_InsertItem( GetDlgItem(hWndDlg,IDC_NUMBERSLIST), &tvis);

 				}

-				else MessageBox(hWndDlg,TranslateW(L"The phone szPhone should start with a + and consist of numbers, spaces, brackets and hyphens only."),TranslateW(L"Invalid Phone Number"),MB_OK);

+				else MessageBox(hWndDlg,TranslateW(_T("The phone szPhone should start with a + and consist of numbers, spaces, brackets and hyphens only.")),TranslateW(_T("Invalid Phone Number")),MB_OK);

 			}

 			break;

 

@@ -328,7 +328,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 		case IDOK:

 			if ((SIZE_T)GET_DLG_ITEM_TEXT_LENGTH(hWndDlg,IDC_MESSAGE) > GetSMSMessageLenMax(hWndDlg))

 			{

-				MessageBox(hWndDlg,TranslateW(L"Message is too long, press OK to continue."),TranslateW(L"Error - Message too long"),MB_OK);

+				MessageBox(hWndDlg,TranslateW(_T("Message is too long, press OK to continue.")),TranslateW(_T("Error - Message too long")),MB_OK);

 			}else{

 				if (psswdWindowData->bMultiple)

 				{

@@ -348,7 +348,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 						EnableWindow(GetDlgItem(hWndDlg,IDC_ADDRESS),FALSE);

 						SendSMSWindowNext(hWndDlg);

 					}else{

-						MessageBox(hWndDlg,TranslateW(L"There must be numbers in the list first."),TranslateW(L"No Numbers"),MB_OK);

+						MessageBox(hWndDlg,TranslateW(_T("There must be numbers in the list first.")),TranslateW(_T("No Numbers")),MB_OK);

 					}

 				}else{

 					WCHAR wszPhone[MAX_PHONE_LEN];

@@ -380,7 +380,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 							MEMFREE(lpwszMessage);

 						}

 					}else{

-						MessageBox(hWndDlg,TranslateW(L"Valid phone numbers are of the form '+(country code)(phone szPhone)'. The contents of the phone szPhone portion is dependent on the national layout of phone numbers, but often omits the leading zero."),TranslateW(L"Invalid phone number"),MB_OK);

+						MessageBox(hWndDlg,TranslateW(_T("Valid phone numbers are of the form '+(country code)(phone szPhone)'. The contents of the phone szPhone portion is dependent on the national layout of phone numbers, but often omits the leading zero.")),TranslateW(_T("Invalid phone number")),MB_OK);

 						SetFocus(GetDlgItem(hWndDlg,IDC_ADDRESS));

 						SEND_DLG_ITEM_MESSAGE(hWndDlg,IDC_ADDRESS,CB_SETEDITSEL,0,MAKELPARAM(0,-1));

 					}

@@ -399,7 +399,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 				SIZE_T dwMessageSize=GET_DLG_ITEM_TEXT_LENGTH(hWndDlg,IDC_MESSAGE);

 

 				EnableWindow(GetDlgItem(hWndDlg,IDOK),dwMessageSize);

-				mir_sntprintf(wszBuff,SIZEOF(wszBuff),L"%d/%d",dwMessageSize,GetSMSMessageLenMax(hWndDlg));

+				mir_sntprintf(wszBuff, SIZEOF(wszBuff), _T("%d/%d"), dwMessageSize,GetSMSMessageLenMax(hWndDlg));

 				SET_DLG_ITEM_TEXTW(hWndDlg,IDC_COUNT,wszBuff);

 			}

 			break;

@@ -416,7 +416,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 				{

 					if (IsContactPhone(psswdWindowData->hMyContact,wszPhone,dwPhoneSize)==FALSE)

 					{

-						lstrcatW(wszPhone,L" SMS");

+						lstrcatW(wszPhone, _T(" SMS"));

 						for(DWORD i=0;bCont;i++)

 						{

 							mir_snprintf(szBuff,SIZEOF(szBuff),"MyPhone%d",i);

@@ -426,7 +426,7 @@ INT_PTR CALLBACK SendSmsDlgProc(HWND hWndDlg,UINT message,WPARAM wParam,LPARAM l
 						DB_SetStringW(psswdWindowData->hMyContact,"UserInfo",szBuff,wszPhone);

 					}

 				}else{

-					MessageBox(hWndDlg,TranslateW(L"The phone szPhone should start with a + and consist of numbers, spaces, brackets and hyphens only."),TranslateW(L"Invalid Phone Number"),MB_OK);

+					MessageBox(hWndDlg, TranslateW(_T("The phone szPhone should start with a + and consist of numbers, spaces, brackets and hyphens only.")),TranslateW(_T("Invalid Phone Number")),MB_OK);

 				}

 			}

 			break;

@@ -584,7 +584,7 @@ HWND SendSMSWindowAdd(HANDLE hContact)
 			ListMTUnLock(&ssSMSSettings.lmtSendSMSWindowsListMT);

 

 			lpwszContactDisplayName=GetContactNameW(hContact);

-			mir_sntprintf(wszTitle,SIZEOF(wszTitle),L"%s - %s",lpwszContactDisplayName,TranslateW(L"Send SMS"));

+			mir_sntprintf(wszTitle, SIZEOF(wszTitle), _T("%s - %s"), lpwszContactDisplayName, TranslateW(_T("Send SMS")));

 			SendMessageW(psswdWindowData->hWnd,WM_SETTEXT,NULL,(LPARAM)wszTitle);

 			SEND_DLG_ITEM_MESSAGEW(psswdWindowData->hWnd,IDC_NAME,CB_ADDSTRING,0,(LPARAM)lpwszContactDisplayName);

 			SEND_DLG_ITEM_MESSAGE(psswdWindowData->hWnd,IDC_NAME,CB_SETCURSEL,0,0);

@@ -702,22 +702,22 @@ void SendSMSWindowMultipleSet(HWND hWndDlg,BOOL bMultiple)
 			SendSMSWindowFillTreeView(hWndDlg);

 

 			EnableWindow(GetDlgItem(hWndDlg,IDC_SAVENUMBER),FALSE);

-			SET_DLG_ITEM_TEXTW(hWndDlg,IDC_MULTIPLE,TranslateW(L"<< Single"));

-			if (wp.showCmd==SW_MAXIMIZE) SetWindowPos(hWndDlg,0,0,0,rcWin.right - rcWin.left - (rcList.right - rcList.left + 11) ,rcWin.bottom - rcWin.top,SWP_NOZORDER|SWP_NOMOVE);

-			SetWindowPos(hWndDlg,0,rcWin.left,rcWin.top,rcWin.right - rcWin.left + (rcList.right-rcList.left) + 11,rcWin.bottom - rcWin.top,SWP_NOZORDER|SWP_NOMOVE);

+			SET_DLG_ITEM_TEXTW(hWndDlg, IDC_MULTIPLE, TranslateW(_T("<< Single")));

+			if (wp.showCmd==SW_MAXIMIZE) SetWindowPos(hWndDlg, 0, 0, 0, rcWin.right - rcWin.left - (rcList.right - rcList.left + 11), rcWin.bottom - rcWin.top, SWP_NOZORDER | SWP_NOMOVE);

+			SetWindowPos(hWndDlg, 0 ,rcWin.left, rcWin.top, rcWin.right - rcWin.left + (rcList.right-rcList.left) + 11, rcWin.bottom - rcWin.top, SWP_NOZORDER | SWP_NOMOVE);

 		}else{

 			if (psswdWindowData->hMyContact) AddContactPhonesToCombo(hWndDlg,psswdWindowData->hMyContact);

 

-			EnableWindow(GetDlgItem(hWndDlg,IDC_SAVENUMBER),TRUE);

-			SET_DLG_ITEM_TEXTW(hWndDlg,IDC_MULTIPLE,TranslateW(L"Multiple >>"));

-			SetWindowPos(hWndDlg,0,rcWin.left,rcWin.top,rcWin.right-rcWin.left - (rcList.right-rcList.left) - 11,rcWin.bottom - rcWin.top,SWP_NOZORDER|SWP_NOMOVE);

-			if (wp.showCmd==SW_MAXIMIZE) SetWindowPos(hWndDlg,0,0,0,rcWin.right - rcWin.left + (rcList.right - rcList.left + 11) ,rcWin.bottom - rcWin.top,SWP_NOZORDER|SWP_NOMOVE);

+			EnableWindow(GetDlgItem(hWndDlg, IDC_SAVENUMBER), TRUE);

+			SET_DLG_ITEM_TEXTW(hWndDlg, IDC_MULTIPLE, TranslateW(_T("Multiple >>")));

+			SetWindowPos(hWndDlg, 0, rcWin.left, rcWin.top, rcWin.right-rcWin.left - (rcList.right-rcList.left) - 11, rcWin.bottom - rcWin.top,SWP_NOZORDER | SWP_NOMOVE);

+			if (wp.showCmd==SW_MAXIMIZE) SetWindowPos(hWndDlg, 0, 0, 0, rcWin.right - rcWin.left + (rcList.right - rcList.left + 11), rcWin.bottom - rcWin.top, SWP_NOZORDER | SWP_NOMOVE);

 		}

 	}

 }

 

 //

-void SendSMSWindowNumberSet(HWND hWndDlg,LPWSTR lpwszPhone,SIZE_T dwPhoneSize)

+void SendSMSWindowNumberSet(HWND hWndDlg, LPWSTR lpwszPhone, SIZE_T dwPhoneSize)

 {

 	SEND_SMS_WINDOW_DATA *psswdWindowData=GET_WINDOW_DATA(hWndDlg);