From b4b33384b4bce30863d9d01aa6e0b60f588d281d Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 19 Jan 2013 17:02:36 +0000 Subject: - 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 --- plugins/SMS/src/SMSConstans.h | 2 +- plugins/SMS/src/functions.cpp | 4 +- plugins/SMS/src/options.cpp | 2 +- plugins/SMS/src/receive.cpp | 10 ++-- plugins/SMS/src/recvdlg.cpp | 8 +-- plugins/SMS/src/senddlg.cpp | 46 ++++++++--------- plugins/Sessions/Src/Main.cpp | 12 ++--- plugins/SimpleAR/src/Main.cpp | 28 +++++------ plugins/SimpleStatusMsg/src/main.cpp | 4 +- plugins/SmileyAdd/src/dlgboxsubclass.cpp | 20 ++++---- plugins/SmileyAdd/src/general.cpp | 18 +++---- plugins/SmileyAdd/src/main.cpp | 4 +- plugins/SmileyAdd/src/options.cpp | 18 +++---- plugins/SmileyAdd/src/services.cpp | 18 +++---- plugins/SmileyAdd/src/smileyroutines.cpp | 8 +-- plugins/SmileyAdd/src/smileys.cpp | 84 +++++++++++++++---------------- plugins/SpellChecker/src/dictionary.cpp | 34 ++++++------- plugins/SpellChecker/src/spellchecker.cpp | 12 ++--- plugins/SplashScreen/src/bitmap_funcs.cpp | 6 +-- plugins/SplashScreen/src/debug.h | 6 +-- plugins/SplashScreen/src/main.cpp | 70 +++++++++++++------------- plugins/SplashScreen/src/options.cpp | 22 ++++---- plugins/SplashScreen/src/services.cpp | 6 +-- plugins/SplashScreen/src/splash.cpp | 38 +++++++------- 24 files changed, 240 insertions(+), 240 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); diff --git a/plugins/Sessions/Src/Main.cpp b/plugins/Sessions/Src/Main.cpp index 05674e29a7..3372bb2bb0 100644 --- a/plugins/Sessions/Src/Main.cpp +++ b/plugins/Sessions/Src/Main.cpp @@ -937,7 +937,7 @@ static int PluginInit(WPARAM wparam,LPARAM lparam) // Hotkeys HOTKEYDESC hkd = { sizeof(hkd) }; hkd.dwFlags = HKD_TCHAR; - hkd.ptszSection = _T("Sessions"); + hkd.ptszSection = LPGENT("Sessions"); hkd.pszName = "OpenSessionsManager"; hkd.ptszDescription = LPGENT("Open Sessions Manager"); hkd.pszService = MS_SESSIONS_OPENMANAGER; @@ -966,23 +966,23 @@ static int PluginInit(WPARAM wparam,LPARAM lparam) cl.position = 1000000000; cl.flags = CMIM_ALL | CMIF_TCHAR | CMIF_ICONFROMICOLIB; - cl.ptszName = _T("Save session..."); - cl.ptszPopupName = _T("Sessions Manager"); + cl.ptszName = LPGENT("Save session..."); + cl.ptszPopupName = LPGENT("Sessions Manager"); cl.icolibItem = iconList[0].hIcolib; cl.pszService = MS_SESSIONS_SAVEUSERSESSION; hmSaveCurrentSession = Menu_AddMainMenuItem(&cl); - cl.ptszName = _T("Load session..."); + cl.ptszName = LPGENT("Load session..."); cl.pszService = MS_SESSIONS_OPENMANAGER; cl.icolibItem = iconList[3].hIcolib; hmLoadLastSession = Menu_AddMainMenuItem(&cl); - cl.ptszName = _T("Close session"); + cl.ptszName = LPGENT("Close session"); cl.pszService = MS_SESSIONS_CLOSESESSION; cl.icolibItem = 0; hmLoadSession = Menu_AddMainMenuItem(&cl); - cl.ptszName = _T("Load last session"); + cl.ptszName = LPGENT("Load last session"); cl.pszService = MS_SESSIONS_RESTORELASTSESSION; cl.icolibItem = iconList[5].hIcolib; cl.position = 10100000; diff --git a/plugins/SimpleAR/src/Main.cpp b/plugins/SimpleAR/src/Main.cpp index fc9059c197..fd81787221 100644 --- a/plugins/SimpleAR/src/Main.cpp +++ b/plugins/SimpleAR/src/Main.cpp @@ -25,12 +25,12 @@ INT interval; int hLangpack; TCHAR* ptszDefaultMsg[]={ - _T("I am currently away. I will reply to you when I am back."), - _T("I am currently very busy and can't spare any time to talk with you. Sorry..."), - _T("I am not available right now."), - _T("I am now doing something, I will talk to you later."), - _T("I am on the phone right now. I will get back to you very soon."), - _T("I am having meal right now. I will get back to you very soon.") + TranslateT("I am currently away. I will reply to you when I am back."), + TranslateT("I am currently very busy and can't spare any time to talk with you. Sorry..."), + TranslateT("I am not available right now."), + TranslateT("I am now doing something, I will talk to you later."), + TranslateT("I am on the phone right now. I will get back to you very soon."), + TranslateT("I am having meal right now. I will get back to you very soon.") }; PLUGININFOEX pluginInfoEx = { @@ -64,11 +64,11 @@ INT_PTR ToggleEnable(WPARAM wParam, LPARAM lParam) mi.flags = CMIM_NAME|CMIM_ICON|CMIF_TCHAR; fEnabled = !fEnabled; if (fEnabled) { - mi.ptszName = _T("Disable Auto&reply"); + mi.ptszName = LPGENT("Disable Auto&reply"); mi.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDI_ON)); } else { - mi.ptszName = _T("Enable Auto&reply"); + mi.ptszName = LPGENT("Enable Auto&reply"); mi.hIcon = LoadIcon(hinstance, MAKEINTRESOURCE(IDI_OFF)); } CallService(MS_CLIST_MODIFYMENUITEM,(WPARAM)hEnableMenu,(LPARAM)&mi); @@ -80,13 +80,13 @@ INT_PTR Toggle(WPARAM w, LPARAM l) HANDLE hContact = (HANDLE)w; BOOL on = 0; on = !DBGetContactSettingByte(hContact, protocolname, "TurnedOn", 0); - DBWriteContactSettingByte(hContact, protocolname, "TurnedOn", on?1:0); + DBWriteContactSettingByte(hContact, protocolname, "TurnedOn", on ? 1 : 0); on = on?0:1; CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIM_NAME |CMIM_ICON | CMIF_TCHAR; - mi.ptszName=on?_T("Turn off Autoanswer"):_T("Turn on Autoanswer"); - mi.hIcon = on?LoadIcon(hinstance, MAKEINTRESOURCE(IDI_OFF)):LoadIcon(hinstance, MAKEINTRESOURCE(IDI_ON)); + mi.ptszName = on ? LPGENT("Turn off Autoanswer") : LPGENT("Turn on Autoanswer"); + mi.hIcon = on ? LoadIcon(hinstance, MAKEINTRESOURCE(IDI_OFF)) : LoadIcon(hinstance, MAKEINTRESOURCE(IDI_ON)); CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggle, (LPARAM)&mi); return 0; } @@ -98,7 +98,7 @@ INT OnPreBuildContactMenu(WPARAM w, LPARAM l) CLISTMENUITEM mi = { sizeof(mi) }; mi.flags = CMIM_NAME | CMIM_ICON | CMIF_TCHAR; BOOL on = !DBGetContactSettingByte(hContact, protocolname, "TurnedOn", 0); - mi.ptszName = on?_T("Turn off Autoanswer"):_T("Turn on Autoanswer"); + mi.ptszName = on ? LPGENT("Turn off Autoanswer") : LPGENT("Turn on Autoanswer"); mi.hIcon = on?LoadIcon(hinstance, MAKEINTRESOURCE(IDI_OFF)):LoadIcon(hinstance, MAKEINTRESOURCE(IDI_ON)); CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggle, (LPARAM)&mi); return 0; @@ -132,9 +132,9 @@ INT CheckDefaults(WPARAM, LPARAM) { if (c < 40077) // This mode does not have a preset message - ptszDefault=TranslateTS(ptszDefaultMsg[c-ID_STATUS_ONLINE-1]); + ptszDefault=ptszDefaultMsg[c-ID_STATUS_ONLINE-1]; else if(c > 40078) - ptszDefault=TranslateTS(ptszDefaultMsg[c-ID_STATUS_ONLINE-3]); + ptszDefault=ptszDefaultMsg[c-ID_STATUS_ONLINE-3]; if (ptszDefault) DBWriteContactSettingTString(NULL,protocolname,szStatus,ptszDefault); } diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index acabd42297..e1b1ce5161 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1612,8 +1612,8 @@ void RegisterHotkey(void) hkd.cbSize = sizeof(hkd); hkd.dwFlags = HKD_TCHAR; hkd.pszName = "SimpleStatusMsg_OpenDialog"; - hkd.ptszDescription = _T("Open Status Message Dialog"); - hkd.ptszSection = _T("Status Message"); + hkd.ptszDescription = LPGENT("Open Status Message Dialog"); + hkd.ptszSection = LPGENT("Status Message"); hkd.pszService = MS_SIMPLESTATUSMSG_SHOWDIALOGINT; hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL, VK_OEM_3); Hotkey_Register(&hkd); diff --git a/plugins/SmileyAdd/src/dlgboxsubclass.cpp b/plugins/SmileyAdd/src/dlgboxsubclass.cpp index 31ccc22f6d..1970577b48 100644 --- a/plugins/SmileyAdd/src/dlgboxsubclass.cpp +++ b/plugins/SmileyAdd/src/dlgboxsubclass.cpp @@ -158,27 +158,27 @@ public: //identifies the message dialog bool IsMessageSendDialog(HWND hwnd) { - TCHAR szClassName[32] = L""; + TCHAR szClassName[32] = _T(""); GetClassName(hwnd, szClassName, SIZEOF(szClassName)); - if (_tcscmp(szClassName, L"#32770")) return false; + if (_tcscmp(szClassName, _T("#32770"))) return false; if ((REdit = GetDlgItem(hwnd, MI_IDC_LOG)) != NULL) { GetClassName(REdit, szClassName, SIZEOF(szClassName)); - if (_tcscmp(szClassName, L"RichEdit20A") != 0 && - _tcscmp(szClassName, L"RichEdit20W") != 0 && - _tcscmp(szClassName, L"RICHEDIT50W") != 0) return false; + if (_tcscmp(szClassName, _T("RichEdit20A")) != 0 && + _tcscmp(szClassName, _T("RichEdit20W")) != 0 && + _tcscmp(szClassName, _T("RICHEDIT50W")) != 0) return false; } else return false; if ((MEdit = GetDlgItem(hwnd, MI_IDC_MESSAGE)) != NULL) { GetClassName(MEdit, szClassName, SIZEOF(szClassName)); - if (_tcscmp(szClassName, L"Edit") != 0 && - _tcscmp(szClassName, L"RichEdit20A") != 0 && - _tcscmp(szClassName, L"RichEdit20W") != 0 && - _tcscmp(szClassName, L"RICHEDIT50W") != 0) return false; + if (_tcscmp(szClassName, _T("Edit")) != 0 && + _tcscmp(szClassName, _T("RichEdit20A")) != 0 && + _tcscmp(szClassName, _T("RichEdit20W")) != 0 && + _tcscmp(szClassName, _T("RICHEDIT50W")) != 0) return false; } else return false; @@ -236,7 +236,7 @@ public: hSmlButton = CreateWindowEx( WS_EX_LEFT | WS_EX_NOPARENTNOTIFY | WS_EX_TOPMOST, MIRANDABUTTONCLASS, - L"S", + _T("S"), WS_CHILD|WS_VISIBLE|WS_TABSTOP, // window style rect.left, // horizontal position of window rect.top, // vertical position of window diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp index 6810934d11..8b0b306998 100644 --- a/plugins/SmileyAdd/src/general.cpp +++ b/plugins/SmileyAdd/src/general.cpp @@ -46,7 +46,7 @@ int CalculateTextHeight(HDC hdc, CHARFORMAT2* chf) SelectObject(hcdc, hFont); SIZE fontSize; - GetTextExtentPoint32(hcdc, L")", 1, &fontSize); + GetTextExtentPoint32(hcdc, _T(")"), 1, &fontSize); DeleteObject(hFont); DeleteDC(hcdc); @@ -78,7 +78,7 @@ HICON GetDefaultIcon(bool copy) const TCHAR* GetImageExt(bkstring &fname) { - const TCHAR* ext = L""; + const TCHAR* ext = _T(""); int fileId = _topen(fname.c_str(), O_RDONLY | _O_BINARY); if (fileId != -1) @@ -89,13 +89,13 @@ const TCHAR* GetImageExt(bkstring &fname) if (bytes > 4) { if ( *(unsigned short*)buf == 0xd8ff ) - ext = L"jpg"; + ext = _T("jpg"); else if ( *(unsigned short*)buf == 0x4d42 ) - ext = L"bmp"; + ext = _T("bmp"); else if ( *(unsigned*)buf == 0x474e5089 ) - ext = L"png"; + ext = _T("png"); else if ( *(unsigned*)buf == 0x38464947 ) - ext = L"gif"; + ext = _T("gif"); } _close(fileId); } @@ -216,8 +216,8 @@ bool InitGdiPlus(void) { Gdiplus::GdiplusStartupInput gdiplusStartupInput; - static const TCHAR errmsg[] = L"GDI+ not installed.\n" - L"GDI+ can be downloaded here: http://www.microsoft.com/downloads"; + static const TCHAR errmsg[] = _T("GDI+ not installed.\n") + _T("GDI+ can be downloaded here: http://www.microsoft.com/downloads"); #ifdef _MSC_VER __try @@ -273,7 +273,7 @@ bool IsSmileyProto(char* proto) void ReportError(const TCHAR* errmsg) { - static const TCHAR title[] = L"Miranda SmileyAdd"; + static const TCHAR title[] = _T("Miranda SmileyAdd"); /* POPUPDATAW pd = {0}; diff --git a/plugins/SmileyAdd/src/main.cpp b/plugins/SmileyAdd/src/main.cpp index d6833684b4..60105db465 100644 --- a/plugins/SmileyAdd/src/main.cpp +++ b/plugins/SmileyAdd/src/main.cpp @@ -100,8 +100,8 @@ extern "C" __declspec(dllexport) int Load(void) mir_getLP(&pluginInfoEx); if (ServiceExists(MS_SMILEYADD_REPLACESMILEYS)) { - static const TCHAR errmsg[] = L"Only one instance of SmileyAdd could be executed.\n" - L"Remove duplicate instances from 'Plugins' directory"; + static const TCHAR errmsg[] = LPGENT("Only one instance of SmileyAdd could be executed.\n") + LPGENT("Remove duplicate instances from 'Plugins' directory"); ReportError(TranslateTS(errmsg)); return 1; diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index 2ca4e7ed29..b485c5ca99 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -529,7 +529,7 @@ bool OptionsDialogType::BrowseForSmileyPacks(int item) { OPENFILENAME ofn = {0}; - TCHAR filename[MAX_PATH] = L""; + TCHAR filename[MAX_PATH] = _T(""); ofn.lpstrFile = filename; ofn.nMaxFile = SIZEOF(filename); @@ -537,7 +537,7 @@ bool OptionsDialogType::BrowseForSmileyPacks(int item) SmileyCategoryType* smc = tmpsmcat.GetSmileyCategory(item); if (smc->GetFilename().empty()) { - pathToAbsolute(L"Smileys", inidir); + pathToAbsolute(_T("Smileys"), inidir); } else { @@ -551,21 +551,21 @@ bool OptionsDialogType::BrowseForSmileyPacks(int item) TCHAR filter[512], *pfilter; _tcscpy(filter, TranslateT("Smiley Packs")); - lstrcat(filter, L" (*.msl;*.asl;*.xep)"); + lstrcat(filter, _T(" (*.msl;*.asl;*.xep)")); pfilter = filter + _tcslen(filter) + 1; - _tcscpy(pfilter, L"*.msl;*.asl;*.xep"); + _tcscpy(pfilter, _T("*.msl;*.asl;*.xep")); pfilter = pfilter + _tcslen(pfilter) + 1; _tcscpy(pfilter, TranslateT("All Files")); - lstrcat(pfilter, L" (*.*)"); + lstrcat(pfilter, _T(" (*.*)")); pfilter = pfilter + _tcslen(pfilter) + 1; - _tcscpy(pfilter, L"*.*"); + _tcscpy(pfilter, _T("*.*")); pfilter = pfilter + _tcslen(pfilter) + 1; *pfilter = '\0'; ofn.lpstrFilter = filter; ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY | OFN_READONLY | OFN_EXPLORER | OFN_LONGNAMES | OFN_NOCHANGEDIR; - ofn.lpstrDefExt = L"msl"; + ofn.lpstrDefExt = _T("msl"); if (GetOpenFileName(&ofn)) { @@ -663,7 +663,7 @@ void OptionsType::ReadPackFileName(bkstring& filename, const bkstring& name, const bkstring& defaultFilename) { DBVARIANT dbv; - bkstring settingKey = name + L"-filename"; + bkstring settingKey = name + _T("-filename"); INT_PTR res = DBGetContactSettingTString(NULL, "SmileyAdd", T2A_SM(settingKey.c_str()), &dbv); if (res == 0) @@ -678,7 +678,7 @@ void OptionsType::ReadPackFileName(bkstring& filename, const bkstring& name, void OptionsType::WritePackFileName(const bkstring& filename, const bkstring& name) { - bkstring settingKey = name + L"-filename"; + bkstring settingKey = name + _T("-filename"); DBWriteContactSettingTString(NULL, "SmileyAdd", T2A_SM(settingKey.c_str()), filename.c_str()); } diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp index cfe069f731..b2e749305b 100644 --- a/plugins/SmileyAdd/src/services.cpp +++ b/plugins/SmileyAdd/src/services.cpp @@ -43,7 +43,7 @@ SmileyPackType* GetSmileyPack(const char* proto, HANDLE hContact, SmileyPackCTyp if (hContact != NULL) { opt.ReadContactCategory(hContact, categoryName); - if (categoryName == L"") return NULL; + if (categoryName == _T("")) return NULL; if (!categoryName.empty() && g_SmileyCategories.GetSmileyCategory(categoryName) == NULL) { @@ -72,7 +72,7 @@ SmileyPackType* GetSmileyPack(const char* proto, HANDLE hContact, SmileyPackCTyp { if (proto == NULL || proto[0] == 0) { - categoryName = L"Standard"; + categoryName = _T("Standard"); } else { @@ -80,7 +80,7 @@ SmileyPackType* GetSmileyPack(const char* proto, HANDLE hContact, SmileyPackCTyp if (opt.UseOneForAll) { SmileyCategoryType *smc = g_SmileyCategories.GetSmileyCategory(categoryName); - if (smc == NULL || smc->IsProto()) categoryName = L"Standard"; + if (smc == NULL || smc->IsProto()) categoryName = _T("Standard"); } } } @@ -386,7 +386,7 @@ INT_PTR CustomCatMenu(WPARAM wParam, LPARAM lParam) else { bkstring empty; - if (lParam == 1) empty = L""; + if (lParam == 1) empty = _T(""); opt.WriteContactCategory(hContact, empty); } NotifyEventHooks(hEvent1, (WPARAM)hContact, 0); @@ -457,8 +457,8 @@ int RebuildContactMenu(WPARAM wParam, LPARAM) mi.position = 1; mi.popupPosition = 1; - mi.ptszName = L""; - if (cat == L"") { + mi.ptszName = _T(""); + if (cat == _T("")) { mi.flags |= CMIF_CHECKED; nonecheck = false; } @@ -523,7 +523,7 @@ int AccountListChanged(WPARAM wParam, LPARAM lParam) case PRAC_ADDED: if (acc != NULL) { - bkstring catname(L"Standard"); + bkstring catname(_T("Standard")); const bkstring& defaultFile = g_SmileyCategories.GetSmileyCategory(catname)->GetFilename(); g_SmileyCategories.AddAccountAsCategory(acc, defaultFile); } @@ -551,7 +551,7 @@ int AccountListChanged(WPARAM wParam, LPARAM lParam) { if (acc->bIsEnabled) { - bkstring catname(L"Standard"); + bkstring catname(_T("Standard")); const bkstring& defaultFile = g_SmileyCategories.GetSmileyCategory(catname)->GetFilename(); g_SmileyCategories.AddAccountAsCategory(acc, defaultFile); } @@ -575,7 +575,7 @@ int DbSettingChanged(WPARAM wParam, LPARAM lParam) if (strcmp(cws->szSetting, "Transport") == 0) { - bkstring catname(L"Standard"); + bkstring catname(_T("Standard")); SmileyCategoryType *smc = g_SmileyCategories.GetSmileyCategory(catname); if (smc != NULL) g_SmileyCategories.AddContactTransportAsCategory(hContact, smc->GetFilename()); diff --git a/plugins/SmileyAdd/src/smileyroutines.cpp b/plugins/SmileyAdd/src/smileyroutines.cpp index 98bd40b959..5175309d1b 100644 --- a/plugins/SmileyAdd/src/smileyroutines.cpp +++ b/plugins/SmileyAdd/src/smileyroutines.cpp @@ -281,7 +281,7 @@ void ReplaceSmileys(HWND hwnd, SmileyPackType* smp, SmileyPackCType* smcp, const TCHAR classname[20]; GetClassName(hwnd, classname, SIZEOF(classname)); - bool ishpp = (_tcsncmp(classname, L"THppRichEdit", 12) == 0) || fireView; + bool ishpp = (_tcsncmp(classname, _T("THppRichEdit"), 12) == 0) || fireView; SetRichCallback(hwnd, NULL, false, true); @@ -323,7 +323,7 @@ void ReplaceSmileys(HWND hwnd, SmileyPackType* smp, SmileyPackCType* smcp, const unsigned numBTBSm = 0; - BSTR spaceb = SysAllocString(L" "); + BSTR spaceb = SysAllocString(_T(" ")); // Replace smileys specified in the list in RichEdit for (int j = smllist.getCount(); j--; ) @@ -526,8 +526,8 @@ void ReplaceSmileys(HWND hwnd, SmileyPackType* smp, SmileyPackCType* smcp, const QueryPerformanceCounter(&end); unsigned dif = (end.QuadPart - strt.QuadPart)/(freq.QuadPart/1000); TCHAR mess[300]; - wsprintf(mess, L"Time elapsed: %u", dif); - MessageBox(NULL, mess, L"", MB_OK); + wsprintf(mess, _T("Time elapsed: %u"), dif); + MessageBox(NULL, mess, _T(""), MB_OK); */ } diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index 11077b93c6..e7a80280e7 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -163,7 +163,7 @@ static DWORD_PTR ConvertServiceParam(HANDLE hContact, const TCHAR *param) DWORD_PTR ret; if (param == NULL) ret = 0; - else if (_tcsicmp(L"hContact", param) == 0) + else if (_tcsicmp(_T("hContact"), param) == 0) ret = (DWORD_PTR)hContact; else if (_istdigit(*param)) ret = _ttoi(param); @@ -176,7 +176,7 @@ static DWORD_PTR ConvertServiceParam(HANDLE hContact, const TCHAR *param) void SmileyType::CallSmileyService(HANDLE hContact) { - _TPattern * srvsplit = _TPattern::compile(L"(.*)\\|(.*)\\|(.*)"); + _TPattern * srvsplit = _TPattern::compile(_T("(.*)\\|(.*)\\|(.*)")); _TMatcher * m0 = srvsplit->createTMatcher(GetTriggerText()); m0->findFirstMatch(); @@ -209,13 +209,13 @@ SmileyPackType::~SmileyPackType() } static const TCHAR urlRegEx[] = - L"(?:ftp|https|http|file|aim|webcal|irc|msnim|xmpp|gopher|mailto|news|nntp|telnet|wais|prospero)://?[\\w.?%:/$+;]*"; -static const TCHAR pathRegEx[] = L"[\\s\"][a-zA-Z]:[\\\\/][\\w.\\-\\\\/]*"; -static const TCHAR timeRegEx[] = L"\\d{1,2}:\\d{2}:\\d{2}|\\d{1,2}:\\d{2}"; + _T("(?:ftp|https|http|file|aim|webcal|irc|msnim|xmpp|gopher|mailto|news|nntp|telnet|wais|prospero)://?[\\w.?%:/$+;]*"); +static const TCHAR pathRegEx[] = _T("[\\s\"][a-zA-Z]:[\\\\/][\\w.\\-\\\\/]*"); +static const TCHAR timeRegEx[] = _T("\\d{1,2}:\\d{2}:\\d{2}|\\d{1,2}:\\d{2}"); void SmileyPackType::AddTriggersToSmileyLookup(void) { - _TPattern * p = _TPattern::compile(L"\\s+"); + _TPattern * p = _TPattern::compile(_T("\\s+")); { bkstring emptystr; @@ -286,8 +286,8 @@ void SmileyPackType::AddTriggersToSmileyLookup(void) void SmileyPackType::ReplaceAllSpecials(const bkstring& Input, bkstring& Output) { - Output = _TPattern::replace(L"%%_{1,2}%%", Input, L" "); - Output = _TPattern::replace(L"%%''%%", Output, L"\""); + Output = _TPattern::replace(_T("%%_{1,2}%%"), Input, _T(" ")); + Output = _TPattern::replace(_T("%%''%%"), Output, _T("\"")); } @@ -312,7 +312,7 @@ bool SmileyPackType::LoadSmileyFile(const bkstring& filename, bool onlyInfo, boo if (filename.empty()) { - m_Name = L"Nothing loaded"; + m_Name = _T("Nothing loaded"); return false; } @@ -331,7 +331,7 @@ bool SmileyPackType::LoadSmileyFile(const bkstring& filename, bool onlyInfo, boo ReportError(msgtxt); } - m_Name = L"Nothing loaded"; + m_Name = _T("Nothing loaded"); return false; } @@ -368,7 +368,7 @@ bool SmileyPackType::LoadSmileyFile(const bkstring& filename, bool onlyInfo, boo delete[] buf; bool res; - if (filename.find(L".xep") == filename.npos) + if (filename.find(_T(".xep")) == filename.npos) res = LoadSmileyFileMSL(tbuf, onlyInfo, modpath); else res = LoadSmileyFileXEP(tbuf, onlyInfo, modpath); @@ -380,7 +380,7 @@ bool SmileyPackType::LoadSmileyFile(const bkstring& filename, bool onlyInfo, boo bool SmileyPackType::LoadSmileyFileMSL(bkstring& tbuf, bool onlyInfo, bkstring& modpath) { - _TPattern * pathsplit = _TPattern::compile(L"(.*\\\\)(.*)\\.|$"); + _TPattern * pathsplit = _TPattern::compile(_T("(.*\\\\)(.*)\\.|$")); _TMatcher * m0 = pathsplit->createTMatcher(modpath); m0->findFirstMatch(); @@ -391,18 +391,18 @@ bool SmileyPackType::LoadSmileyFileMSL(bkstring& tbuf, bool onlyInfo, bkstring& delete pathsplit; _TPattern * otherf = _TPattern::compile( - L"^\\s*(Name|Author|Date|Version|ButtonSmiley)\\s*=\\s*\"(.*)\"", + _T("^\\s*(Name|Author|Date|Version|ButtonSmiley)\\s*=\\s*\"(.*)\""), _TPattern::MULTILINE_MATCHING); m0 = otherf->createTMatcher(tbuf); while (m0->findNextMatch()) { - if (m0->getGroup(1) == L"Name") m_Name = m0->getGroup(2); - if (m0->getGroup(1) == L"Author") m_Author = m0->getGroup(2); - if (m0->getGroup(1) == L"Date") m_Date = m0->getGroup(2); - if (m0->getGroup(1) == L"Version") m_Version = m0->getGroup(2); - if (m0->getGroup(1) == L"ButtonSmiley") m_ButtonSmiley = m0->getGroup(2); + if (m0->getGroup(1) == _T("Name")) m_Name = m0->getGroup(2); + if (m0->getGroup(1) == _T("Author")) m_Author = m0->getGroup(2); + if (m0->getGroup(1) == _T("Date")) m_Date = m0->getGroup(2); + if (m0->getGroup(1) == _T("Version")) m_Version = m0->getGroup(2); + if (m0->getGroup(1) == _T("ButtonSmiley")) m_ButtonSmiley = m0->getGroup(2); } delete m0; delete otherf; @@ -415,7 +415,7 @@ bool SmileyPackType::LoadSmileyFileMSL(bkstring& tbuf, bool onlyInfo, bkstring& win.y = 0; { _TPattern * pat = _TPattern::compile( - L"^\\s*(Selection|Window)Size\\s*=\\s*(\\d+)\\s*,\\s*(\\d+)", + _T("^\\s*(Selection|Window)Size\\s*=\\s*(\\d+)\\s*,\\s*(\\d+)"), _TPattern::MULTILINE_MATCHING); _TMatcher * m0 = pat->createTMatcher(tbuf); while (m0->findNextMatch()) @@ -424,9 +424,9 @@ bool SmileyPackType::LoadSmileyFileMSL(bkstring& tbuf, bool onlyInfo, bkstring& tpt.x = _ttol(m0->getGroup(2).c_str()); tpt.y = _ttol(m0->getGroup(3).c_str()); - if (m0->getGroup(1) == L"Selection") + if (m0->getGroup(1) == _T("Selection")) selec = tpt; - else if (m0->getGroup(1) == L"Window") + else if (m0->getGroup(1) == _T("Window")) win = tpt; } delete m0; @@ -434,12 +434,12 @@ bool SmileyPackType::LoadSmileyFileMSL(bkstring& tbuf, bool onlyInfo, bkstring& } _TPattern * smiley = _TPattern::compile( - L"^\\s*Smiley(\\*)?\\s*=" // Is Hidden - L"(?:\\s*\"(.*)\")" // Smiley file name - L"(?:[\\s,]+(\\-?\\d+))" // Icon resource id - L"(?:[\\s,]+(R|S)?\"(.*?)\")" // Trigger text - L"(?:[\\s,]+\"(.*?)\")?" // Tooltip or insert text - L"(?:[\\s,]+\"(.*?)\")?", // Tooltip text + _T("^\\s*Smiley(\\*)?\\s*=") // Is Hidden + _T("(?:\\s*\"(.*)\")") // Smiley file name + _T("(?:[\\s,]+(\\-?\\d+))") // Icon resource id + _T("(?:[\\s,]+(R|S)?\"(.*?)\")") // Trigger text + _T("(?:[\\s,]+\"(.*?)\")?") // Tooltip or insert text + _T("(?:[\\s,]+\"(.*?)\")?"), // Tooltip text _TPattern::MULTILINE_MATCHING); _TMatcher * m0 = smiley->createTMatcher(tbuf); @@ -450,7 +450,7 @@ bool SmileyPackType::LoadSmileyFileMSL(bkstring& tbuf, bool onlyInfo, bkstring& while (m0->findNextMatch()) { bkstring resname = m0->getGroup(2); - if (resname.find(L"http://") != resname.npos) + if (resname.find(_T("http://")) != resname.npos) { if (GetSmileyFile(resname, packstr)) continue; } @@ -466,8 +466,8 @@ bool SmileyPackType::LoadSmileyFileMSL(bkstring& tbuf, bool onlyInfo, bkstring& dat->SetHidden(m0->getStartingIndex(1) >= 0); if (m0->getStartingIndex(4) >= 0) { - dat->SetRegEx(m0->getGroup(4) == L"R"); - dat->SetService(m0->getGroup(4) == L"S"); + dat->SetRegEx(m0->getGroup(4) == _T("R")); + dat->SetService(m0->getGroup(4) == _T("S")); } dat->m_TriggerText = m0->getGroup(5); if (dat->IsRegEx()) @@ -531,8 +531,8 @@ static void DecodeHTML(bkstring& str) { if (str.find('&') != str.npos) { - str = _TPattern::replace(bkstring(L"<"), str, bkstring(L"<")); - str = _TPattern::replace(bkstring(L">"), str, bkstring(L">")); + str = _TPattern::replace(bkstring(_T("<")), str, bkstring(_T("<"))); + str = _TPattern::replace(bkstring(_T(">")), str, bkstring(_T(">"))); } } @@ -565,11 +565,11 @@ bool SmileyPackType::LoadSmileyFileXEP(bkstring& tbuf, bool onlyInfo, bkstring& { _TMatcher *m0, *m1, *m2; - _TPattern * dbname_re = _TPattern::compile(L"\\s*\"(.*?)\"\\s*", + _TPattern * dbname_re = _TPattern::compile(_T("\\s*\"(.*?)\"\\s*"), _TPattern::MULTILINE_MATCHING); - _TPattern * author_re = _TPattern::compile(L"\\s*\"(.*?)\"\\s*", + _TPattern * author_re = _TPattern::compile(_T("\\s*\"(.*?)\"\\s*"), _TPattern::MULTILINE_MATCHING); - _TPattern * settings_re = _TPattern::compile(L"(.*?)", + _TPattern * settings_re = _TPattern::compile(_T("(.*?)"), _TPattern::MULTILINE_MATCHING | _TPattern::DOT_MATCHES_ALL); m0 = settings_re->createTMatcher(tbuf); @@ -601,17 +601,17 @@ bool SmileyPackType::LoadSmileyFileXEP(bkstring& tbuf, bool onlyInfo, bkstring& if (!onlyInfo) { - _TPattern * record_re = _TPattern::compile(L"(?:\\s*\"(.*?)\")?(.*?)", + _TPattern * record_re = _TPattern::compile(_T("(?:\\s*\"(.*?)\")?(.*?)"), _TPattern::MULTILINE_MATCHING | _TPattern::DOT_MATCHES_ALL); - _TPattern * expression_re = _TPattern::compile(L"\\s*\"(.*?)\"\\s*", + _TPattern * expression_re = _TPattern::compile(_T("\\s*\"(.*?)\"\\s*"), _TPattern::MULTILINE_MATCHING); - _TPattern * pastetext_re = _TPattern::compile(L"\\s*\"(.*?)\"\\s*", + _TPattern * pastetext_re = _TPattern::compile(_T("\\s*\"(.*?)\"\\s*"), _TPattern::MULTILINE_MATCHING); - _TPattern * images_re = _TPattern::compile(L"(.*?)", + _TPattern * images_re = _TPattern::compile(_T("(.*?)"), _TPattern::MULTILINE_MATCHING | _TPattern::DOT_MATCHES_ALL); - _TPattern * image_re = _TPattern::compile(L"(.*?)", + _TPattern * image_re = _TPattern::compile(_T("(.*?)"), _TPattern::MULTILINE_MATCHING | _TPattern::DOT_MATCHES_ALL); - _TPattern * imagedt_re = _TPattern::compile(L"", + _TPattern * imagedt_re = _TPattern::compile(_T(""), _TPattern::MULTILINE_MATCHING ); m0 = images_re->createTMatcher(tbuf); @@ -1036,7 +1036,7 @@ SmileyLookup::SmileyLookup(const bkstring& str, const bool regexs, const int ind m_ind = ind; if (regexs) { - static const bkstring testString(L"Test String"); + static const bkstring testString(_T("Test String")); m_pattern = _TPattern::compile(str); m_valid = m_pattern != NULL; if (m_valid) diff --git a/plugins/SpellChecker/src/dictionary.cpp b/plugins/SpellChecker/src/dictionary.cpp index b6bf37a655..88ffde5215 100644 --- a/plugins/SpellChecker/src/dictionary.cpp +++ b/plugins/SpellChecker/src/dictionary.cpp @@ -56,9 +56,9 @@ protected: void loadCustomDict() { TCHAR filename[1024]; - mir_sntprintf(filename, SIZEOF(filename), L"%s\\%s.cdic", userPath, language); + mir_sntprintf(filename, SIZEOF(filename), _T("%s\\%s.cdic"), userPath, language); - FILE *file = _tfopen(filename, L"rb"); + FILE *file = _tfopen(filename, _T("rb")); if (file != NULL) { char tmp[1024]; @@ -91,9 +91,9 @@ protected: CreateDirectoryTreeT(userPath); TCHAR filename[1024]; - mir_sntprintf(filename, SIZEOF(filename), L"%s\\%s.cdic", userPath, language); + mir_sntprintf(filename, SIZEOF(filename), _T("%s\\%s.cdic"), userPath, language); - FILE *file = _tfopen(filename, L"ab"); + FILE *file = _tfopen(filename, _T("ab")); if (file != NULL) { char tmp[1024]; @@ -458,7 +458,7 @@ BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString) GetLocaleInfo(MAKELCID(langID, 0), LOCALE_SISO3166CTRYNAME, end, SIZEOF(end)); TCHAR name[64]; - mir_sntprintf(name, SIZEOF(name), L"%s_%s", ini, end); + mir_sntprintf(name, SIZEOF(name), _T("%s_%s"), ini, end); for(int i = 0; i < tmp_dicts->getCount(); i++) { @@ -482,7 +482,7 @@ BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString) TCHAR name[1024]; if (country[0] != 0) - mir_sntprintf(name, SIZEOF(name), L"%s (%s)", dict->english_name, country); + mir_sntprintf(name, SIZEOF(name), _T("%s (%s)"), dict->english_name, country); else lstrcpyn(name, dict->english_name, SIZEOF(name)); @@ -491,7 +491,7 @@ BOOL CALLBACK EnumLocalesProc(LPTSTR lpLocaleString) if (dict->localized_name[0] != 0) { - mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), L"%s [%s]", dict->localized_name, dict->language); + mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), _T("%s [%s]"), dict->localized_name, dict->language); } break; } @@ -537,7 +537,7 @@ void GetDictsInfo(LIST &dicts) if (dict->localized_name[0] != _T('\0')) { - mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), L"%s [%s]", dict->localized_name, dict->language); + mir_sntprintf(dict->full_name, SIZEOF(dict->full_name), _T("%s [%s]"), dict->localized_name, dict->language); } else { @@ -552,7 +552,7 @@ void GetHunspellDictionariesFromFolder(LIST &dicts, TCHAR *path, TCH { // Load the language files and create an array with then TCHAR file[1024]; - mir_sntprintf(file, SIZEOF(file), L"%s\\*.dic", path); + mir_sntprintf(file, SIZEOF(file), _T("%s\\*.dic"), path); BOOL found = FALSE; @@ -562,7 +562,7 @@ void GetHunspellDictionariesFromFolder(LIST &dicts, TCHAR *path, TCH { do { - mir_sntprintf(file, SIZEOF(file), L"%s\\%s", path, ffd.cFileName); + mir_sntprintf(file, SIZEOF(file), _T("%s\\%s"), path, ffd.cFileName); // Check .dic DWORD attrib = GetFileAttributes(file); @@ -570,7 +570,7 @@ void GetHunspellDictionariesFromFolder(LIST &dicts, TCHAR *path, TCH continue; // See if .aff exists too - lstrcpy(&file[lstrlen(file) - 4], L".aff"); + lstrcpy(&file[lstrlen(file) - 4], _T(".aff")); attrib = GetFileAttributes(file); if (attrib == 0xFFFFFFFF || (attrib & FILE_ATTRIBUTE_DIRECTORY)) continue; @@ -613,11 +613,11 @@ void GetAvaibleDictionaries(LIST &dicts, TCHAR *path, TCHAR *user_pa if (opts.use_other_apps_dicts) { - TCHAR *otherHunspellApps[] = { L"Thunderbird", L"thunderbird.exe", - L"Firefox", L"firefox.exe" }; + TCHAR *otherHunspellApps[] = { _T("Thunderbird"), _T("thunderbird.exe"), + _T("Firefox"), _T("firefox.exe") }; -#define APPPATH L"SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s" -#define MUICACHE L"Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache" +#define APPPATH _T("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\%s") +#define MUICACHE _T("Software\\Microsoft\\Windows\\ShellNoRoam\\MUICache") // Get other apps dicts for (int i = 0; i < SIZEOF(otherHunspellApps); i += 2) @@ -630,7 +630,7 @@ void GetAvaibleDictionaries(LIST &dicts, TCHAR *path, TCHAR *user_pa if (ERROR_SUCCESS == RegOpenKeyEx(HKEY_LOCAL_MACHINE, key, 0, KEY_QUERY_VALUE, &hKey)) { DWORD size = SIZEOF(key); - lResult = RegQueryValueEx(hKey, L"Path", NULL, NULL, (LPBYTE)key, &size); + lResult = RegQueryValueEx(hKey, _T("Path"), NULL, NULL, (LPBYTE)key, &size); RegCloseKey(hKey); } else @@ -668,7 +668,7 @@ void GetAvaibleDictionaries(LIST &dicts, TCHAR *path, TCHAR *user_pa if (ERROR_SUCCESS == lResult) { TCHAR folder[1024]; - mir_sntprintf(folder, SIZEOF(folder), L"%s\\Dictionaries", key); + mir_sntprintf(folder, SIZEOF(folder), _T("%s\\Dictionaries"), key); GetHunspellDictionariesFromFolder(languages, folder, user_path, otherHunspellApps[i]); } diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp index fa3fee8bad..e4a6ec0855 100644 --- a/plugins/SpellChecker/src/spellchecker.cpp +++ b/plugins/SpellChecker/src/spellchecker.cpp @@ -127,17 +127,17 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) hDictionariesFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Dictionaries"), DICTIONARIES_FOLDER); dictionariesFolder = (TCHAR *) mir_alloc(sizeof(TCHAR) * MAX_PATH); - FoldersGetCustomPathT(hDictionariesFolder, dictionariesFolder, MAX_PATH, L"."); + FoldersGetCustomPathT(hDictionariesFolder, dictionariesFolder, MAX_PATH, _T(".")); hCustomDictionariesFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Custom Dictionaries"), CUSTOM_DICTIONARIES_FOLDER); customDictionariesFolder = (TCHAR *) mir_alloc(sizeof(TCHAR) * MAX_PATH); - FoldersGetCustomPathT(hCustomDictionariesFolder, customDictionariesFolder, MAX_PATH, L"."); + FoldersGetCustomPathT(hCustomDictionariesFolder, customDictionariesFolder, MAX_PATH, _T(".")); hFlagsDllFolder = FoldersRegisterCustomPathT(LPGEN("Spell Checker"), LPGEN("Flags DLL"), FLAGS_DLL_FOLDER); flagsDllFolder = (TCHAR *) mir_alloc(sizeof(TCHAR) * MAX_PATH); - FoldersGetCustomPathT(hFlagsDllFolder, flagsDllFolder, MAX_PATH, L"."); + FoldersGetCustomPathT(hFlagsDllFolder, flagsDllFolder, MAX_PATH, _T(".")); } else { dictionariesFolder = Utils_ReplaceVarsT(DICTIONARIES_FOLDER); @@ -154,7 +154,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) if (opts.use_flags) { // Load flags dll TCHAR flag_file[MAX_PATH]; - mir_sntprintf(flag_file, SIZEOF(flag_file), L"%s\\flags_icons.dll", flagsDllFolder); + mir_sntprintf(flag_file, SIZEOF(flag_file), _T("%s\\flags_icons.dll"), flagsDllFolder); HMODULE hFlagsDll = LoadLibraryEx(flag_file, NULL, LOAD_LIBRARY_AS_DATAFILE); TCHAR path[MAX_PATH]; @@ -162,7 +162,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) SKINICONDESC sid = { sizeof(sid) }; sid.flags = SIDF_ALL_TCHAR | SIDF_SORTED; - sid.ptszSection = L"Spell Checker/Flags"; + sid.ptszSection = _T("Spell Checker/Flags"); // Get language flags for(int i = 0; i < languages.getCount(); i++) { @@ -203,7 +203,7 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam) Dictionary *dict = languages[j]; TCHAR filename[MAX_PATH]; - mir_sntprintf(filename, MAX_PATH, L"%s\\%s.ar", customDictionariesFolder, dict->language); + mir_sntprintf(filename, MAX_PATH, _T("%s\\%s.ar"), customDictionariesFolder, dict->language); dict->autoReplace = new AutoReplaceMap(filename, dict); if (lstrcmp(dict->language, opts.default_language) == 0) diff --git a/plugins/SplashScreen/src/bitmap_funcs.cpp b/plugins/SplashScreen/src/bitmap_funcs.cpp index 46792eed26..f6f2ce5f4b 100644 --- a/plugins/SplashScreen/src/bitmap_funcs.cpp +++ b/plugins/SplashScreen/src/bitmap_funcs.cpp @@ -210,7 +210,7 @@ bool MyBitmap::loadFromFile(TCHAR *fn, TCHAR *fnAlpha) TCHAR *ext; ext = &fn[lstrlen(fn)-4]; - if (!lstrcmpi(ext, L".png")) + if (!lstrcmpi(ext, _T(".png"))) { HANDLE hFile, hMap = NULL; BYTE* ppMap = NULL; @@ -238,7 +238,7 @@ bool MyBitmap::loadFromFile(TCHAR *fn, TCHAR *fnAlpha) else cbFileSize = 0; #ifdef _DEBUG - logMessage(L"Loading splash file", L"done"); + logMessage(_T("Loading splash file"), _T("done")); #endif } @@ -301,7 +301,7 @@ bool MyBitmap::loadFromFile(TCHAR *fn, TCHAR *fnAlpha) if (!hBmpLoaded) { #ifdef _DEBUG - logMessage(L"MyBitmap::loadFromFile", L"Bitmap load failed"); + logMessage(_T("MyBitmap::loadFromFile"), _T("Bitmap load failed")); #endif return false; } diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h index 62c1a0a7d8..70e36dfaed 100644 --- a/plugins/SplashScreen/src/debug.h +++ b/plugins/SplashScreen/src/debug.h @@ -43,7 +43,7 @@ int inline _DebugPopup(HANDLE hContact, TCHAR *fmt, ...) int inline initLog() { - fclose(_tfopen(szLogFile, L"w")); + fclose(_tfopen(szLogFile, _T("w"))); return 0; } @@ -53,8 +53,8 @@ int inline initLog() void inline logMessage(TCHAR *func, TCHAR *msg) { - FILE *f = _tfopen(szLogFile, L"a"); - _ftprintf(f, L"%s:\t\t%s\n", func, msg); + FILE *f = _tfopen(szLogFile, _T("a")); + _ftprintf(f, _T("%s:\t\t%s\n"), func, msg); fclose(f); } diff --git a/plugins/SplashScreen/src/main.cpp b/plugins/SplashScreen/src/main.cpp index 9b55118edc..4aeeb26813 100644 --- a/plugins/SplashScreen/src/main.cpp +++ b/plugins/SplashScreen/src/main.cpp @@ -73,18 +73,18 @@ void SplashMain() if (bstartup) { // Retrive path to exe of current running Miranda is located - szMirDir = Utils_ReplaceVarsT(L"%miranda_path%"); - mir_sntprintf(szhAdvaimgPath, SIZEOF(szhAdvaimgPath), L"%s\\plugins\\advaimg.dll", szMirDir); + szMirDir = Utils_ReplaceVarsT(_T("%miranda_path%")); + mir_sntprintf(szhAdvaimgPath, SIZEOF(szhAdvaimgPath), _T("%s\\plugins\\advaimg.dll"), szMirDir); CallService(MS_SYSTEM_GETVERSIONTEXT, MAX_PATH, (LPARAM)szVersion); #ifdef _DEBUG - mir_sntprintf(szLogFile, SIZEOF(szLogFile), L"%s\\%s.log", szMirDir, _T(__PLUGIN_NAME)); + mir_sntprintf(szLogFile, SIZEOF(szLogFile), _T("%s\\%s.log"), szMirDir, _T(__PLUGIN_NAME)); initLog(); TCHAR* mirandaVerString = mir_a2t(szVersion); - logMessage(L"Miranda version", mirandaVerString); + logMessage(_T("Miranda version"), mirandaVerString); mir_free(mirandaVerString); - logMessage(L"Dll Name", _T(__FILENAME)); - logMessage(L"Advaimg path", szhAdvaimgPath); + logMessage(_T("Dll Name"), _T(__FILENAME)); + logMessage(_T("Advaimg path"), szhAdvaimgPath); #endif ReadIniConfig(); @@ -100,7 +100,7 @@ void SplashMain() if (hUserDll == NULL) { - hUserDll = LoadLibrary(L"user32.dll"); + hUserDll = LoadLibrary(_T("user32.dll")); if (hUserDll) MyUpdateLayeredWindow = (BOOL (WINAPI *)(HWND, HDC, POINT *, SIZE *, HDC, POINT *, COLORREF, BLENDFUNCTION *, DWORD))GetProcAddress(hUserDll, "UpdateLayeredWindow"); } @@ -126,7 +126,7 @@ void SplashMain() } #ifdef _DEBUG if (png2dibConvertor) - logMessage(L"Loading advaimg", L"done"); + logMessage(_T("Loading advaimg"), _T("done")); #endif } } @@ -136,7 +136,7 @@ void SplashMain() DBGetContactSettingTString(NULL, MODNAME, "VersionPrefix", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(szPrefix, L""); + _tcscpy_s(szPrefix, _T("")); DBFreeVariant(&dbv); } else @@ -146,7 +146,7 @@ void SplashMain() DBGetContactSettingTString(NULL, MODNAME, "Path", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, L"splash\\splash.png"); + _tcscpy_s(inBuf, _T("splash\\splash.png")); DBFreeVariant(&dbv); } else @@ -160,14 +160,14 @@ void SplashMain() TCHAR *pos3 = 0; pos3 = _tcsrchr(inBuf, _T(':')); if (pos3 == NULL) - mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), L"%s\\%s", szMirDir, inBuf); + mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%s\\%s"), szMirDir, inBuf); else lstrcpy(szSplashFile, inBuf); DBGetContactSettingTString(NULL, MODNAME, "Sound", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, L"sounds\\startup.wav"); + _tcscpy_s(inBuf, _T("sounds\\startup.wav")); DBFreeVariant(&dbv); } else @@ -180,12 +180,12 @@ void SplashMain() TCHAR *pos2; pos2 = _tcschr(inBuf, _T(':')); if (pos2 == NULL) - mir_sntprintf(szSoundFile, SIZEOF(szSoundFile), L"%s\\%s", szMirDir, inBuf); + mir_sntprintf(szSoundFile, SIZEOF(szSoundFile), _T("%s\\%s"), szMirDir, inBuf); else lstrcpy(szSoundFile, inBuf); #ifdef _DEBUG - logMessage(L"SoundFilePath", szSoundFile); + logMessage(_T("SoundFilePath"), szSoundFile); #endif TCHAR szOldPath[MAX_PATH] = {0}; @@ -203,7 +203,7 @@ void SplashMain() p = _tcsrchr(szSplashDir, _T('\\')); if (p) *p = 0; // create the search filter - mir_sntprintf(szSearch, SIZEOF(szSearch), L"%s\\*.*", szSplashDir); + mir_sntprintf(szSearch, SIZEOF(szSearch), _T("%s\\*.*"), szSplashDir); // FFFN will return filenames HANDLE hFind = INVALID_HANDLE_VALUE; WIN32_FIND_DATA ffd; @@ -215,7 +215,7 @@ void SplashMain() if (!(ffd.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)) { #ifdef _DEBUG - logMessage(L"Found file", ffd.cFileName); + logMessage(_T("Found file"), ffd.cFileName); #endif //files = new char[strlen(ffd.cFileName)]; //files[filescount] = new char[strlen(ffd.cFileName)]; @@ -223,14 +223,14 @@ void SplashMain() tmemcpy(ext, ffd.cFileName + (_tcslen(ffd.cFileName)-4), 5); #ifdef _DEBUG - logMessage(L"Extention", ext); + logMessage(_T("Extention"), ext); #endif - if (lstrcmpi(ext, L".png") & lstrcmpi(ext, L".bmp")) + if (lstrcmpi(ext, _T(".png")) & lstrcmpi(ext, _T(".bmp"))) continue; #ifdef _DEBUG - logMessage(L"File has valid ext", ext); + logMessage(_T("File has valid ext"), ext); #endif _tcscpy_s(files[filescount++], ffd.cFileName); } //if @@ -240,10 +240,10 @@ void SplashMain() int r = 0; if (filescount) r = (rand() % filescount) + 1; - mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), L"%s\\%s", szSplashDir, files[r-1]); + mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%s\\%s"), szSplashDir, files[r-1]); #ifdef _DEBUG - logMessage(L"final file", szSplashFile); + logMessage(_T("final file"), szSplashFile); #endif FindClose(hFind); } //if @@ -280,25 +280,25 @@ int PlugDisableHook(WPARAM wParam, LPARAM lParam) TCHAR * tszModule= mir_a2t(cws->szModule), *tszSetting = mir_a2t(cws->szSetting); if(options.inheritGS) { - if (!lstrcmp(tszModule, L"Skin") & !lstrcmp(tszSetting, L"UseSound")) + if (!lstrcmp(tszModule, _T("Skin")) & !lstrcmp(tszSetting, _T("UseSound"))) { DBWriteContactSettingByte(NULL, MODNAME, "PlaySound", cws->value.bVal); #ifdef _DEBUG - cws->value.bVal ? _DebugPopup(NULL, L"Sounds enabled.", L"") : _DebugPopup(NULL, L"Sounds disabled.", L""); - logMessage(L"Module", tszModule); - logMessage(L"Setting", tszSetting); - logMessage(L"Value", _itot(cws->value.bVal, buf, 10)); + cws->value.bVal ? _DebugPopup(NULL, _T("Sounds enabled."), _T("")) : _DebugPopup(NULL, _T("Sounds disabled."), _T("")); + logMessage(_T("Module"), tszModule); + logMessage(_T("Setting"), tszSetting); + logMessage(_T("Value"), _itot(cws->value.bVal, buf, 10)); #endif } - if (!lstrcmp(tszModule, L"PluginDisable") & (!lstrcmp(tszSetting, szDllName))) + if (!lstrcmp(tszModule, _T("PluginDisable")) & (!lstrcmp(tszSetting, szDllName))) { DBWriteContactSettingByte(NULL, MODNAME, "Active", cws->value.bVal); #ifdef _DEBUG - cws->value.bVal ? _DebugPopup(NULL, L"Disabled.", "") : _DebugPopup(NULL, L"Enabled.", L""); - logMessage(L"PlugDisableHook", L"Triggered"); - logMessage(L"Module", tszModule); - logMessage(L"Setting", tszSetting); - logMessage(L"Value", _itot(cws->value.bVal, buf, 10)); + cws->value.bVal ? _DebugPopup(NULL, _T("Disabled."), "") : _DebugPopup(NULL, _T("Enabled."), _T("")); + logMessage(_T("PlugDisableHook"), _T("Triggered")); + logMessage(_T("Module"), tszModule); + logMessage(_T("Setting"), tszSetting); + logMessage(_T("Value"), _itot(cws->value.bVal, buf, 10)); #endif } } @@ -317,7 +317,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) if (PostMessage(hwndSplash, WM_LOADED, 0, 0)) { #ifdef _DEBUG - logMessage(L"Posted WM_LOADED message", L"done"); + logMessage(_T("Posted WM_LOADED message"), _T("done")); #endif } } @@ -344,7 +344,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) #endif #ifdef _DEBUG - logMessage(L"Loading modules", L"done"); + logMessage(_T("Loading modules"), _T("done")); #endif return 0; @@ -380,7 +380,7 @@ extern "C" int __declspec(dllexport) Unload(void) if (hAdvaimg) FreeLibrary(hAdvaimg); #ifdef _DEBUG - logMessage(L"Unload", L"Job done"); + logMessage(_T("Unload"), _T("Job done")); #endif return 0; diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index d88b6938ee..6d5cf7c553 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -63,7 +63,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBGetContactSettingTString(NULL, MODNAME, "Path", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, L"splash\\splash.png"); + _tcscpy_s(inBuf, _T("splash\\splash.png")); DBFreeVariant(&dbv); } else @@ -73,7 +73,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBGetContactSettingTString(NULL, MODNAME, "Sound", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, L"sounds\\startup.wav"); + _tcscpy_s(inBuf, _T("sounds\\startup.wav")); DBFreeVariant(&dbv); } else @@ -83,7 +83,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBGetContactSettingTString(NULL, MODNAME, "VersionPrefix", &dbv); if (lstrcmp(dbv.ptszVal, NULL) == 0) { - _tcscpy_s(inBuf, L""); + _tcscpy_s(inBuf, _T("")); DBFreeVariant(&dbv); } else @@ -178,7 +178,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } else { - szMirDir = Utils_ReplaceVarsT(L"%miranda_path%"); + szMirDir = Utils_ReplaceVarsT(_T("%miranda_path%")); lstrcpy(initDir, szMirDir); mir_free(szMirDir); } @@ -186,7 +186,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP OPENFILENAME ofn = {0}; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; TCHAR tmp[MAX_PATH]; - mir_sntprintf(tmp, SIZEOF(tmp), L"%s (*.png, *.bmp)%c*.png;*.bmp%c%c", TranslateT("Graphic files"), 0, 0, 0); + mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.png, *.bmp)%c*.png;*.bmp%c%c"), TranslateT("Graphic files"), 0, 0, 0); ofn.lpstrFilter = tmp; ofn.hwndOwner = 0; ofn.lpstrFile = szTempPath; @@ -195,14 +195,14 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP ofn.Flags = OFN_HIDEREADONLY; ofn.lpstrInitialDir = initDir; *szTempPath = '\0'; - ofn.lpstrDefExt = L""; + ofn.lpstrDefExt = _T(""); if (GetOpenFileName(&ofn)) { lstrcpy(szSplashFile, szTempPath); #ifdef _DEBUG - logMessage(L"Set path", szSplashFile); + logMessage(_T("Set path"), szSplashFile); #endif // Make path relative @@ -243,7 +243,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP } else { - szMirDir = Utils_ReplaceVarsT(L"%miranda_path%"); + szMirDir = Utils_ReplaceVarsT(_T("%miranda_path%")); lstrcpy(initDir, szMirDir); mir_free(szMirDir); } @@ -251,7 +251,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP OPENFILENAME ofn = {0}; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; TCHAR tmp[MAX_PATH]; - mir_sntprintf(tmp, SIZEOF(tmp), L"%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c", TranslateT("Sound Files"), 0, 0, 0); + mir_sntprintf(tmp, SIZEOF(tmp), _T("%s (*.wav, *.mp3)%c*.wav;*.mp3%c%c"), TranslateT("Sound Files"), 0, 0, 0); ofn.lpstrFilter = tmp; ofn.hwndOwner = 0; ofn.lpstrFile = szTempPath; @@ -260,14 +260,14 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP ofn.Flags = OFN_HIDEREADONLY; ofn.lpstrInitialDir = initDir; *szTempPath = '\0'; - ofn.lpstrDefExt = L""; + ofn.lpstrDefExt = _T(""); if (GetOpenFileName(&ofn)) { lstrcpy(szSoundFile,szTempPath); #ifdef _DEBUG - logMessage(L"Set sound path", szSoundFile); + logMessage(_T("Set sound path"), szSoundFile); #endif // Make path relative diff --git a/plugins/SplashScreen/src/services.cpp b/plugins/SplashScreen/src/services.cpp index 1dfe6ee5fb..f38c8eeb8f 100644 --- a/plugins/SplashScreen/src/services.cpp +++ b/plugins/SplashScreen/src/services.cpp @@ -32,7 +32,7 @@ INT_PTR ShowSplashService(WPARAM wparam,LPARAM lparam) pos = _tcsrchr(filename, _T(':')); if (pos == NULL) - mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), L"%s\\%s", szMirDir, filename); + mir_sntprintf(szSplashFile, SIZEOF(szSplashFile), _T("%s\\%s"), szMirDir, filename); else lstrcpy(szSplashFile, filename); @@ -50,7 +50,7 @@ INT_PTR TestService(WPARAM wParam,LPARAM lParam) OPENFILENAME ofn={0}; ofn.lStructSize = OPENFILENAME_SIZE_VERSION_400; - ofn.lpstrFilter = L"PNG and BMP files\0*.png;*.bmp\0\0"; + ofn.lpstrFilter = _T("PNG and BMP files\0*.png;*.bmp\0\0"); ofn.hwndOwner=0; ofn.lpstrFile = szTempPath; ofn.nMaxFile = MAX_PATH; @@ -58,7 +58,7 @@ INT_PTR TestService(WPARAM wParam,LPARAM lParam) ofn.Flags = OFN_HIDEREADONLY; ofn.lpstrInitialDir = szSplashFile; *szTempPath = '\0'; - ofn.lpstrDefExt = L""; + ofn.lpstrDefExt = _T(""); if (GetOpenFileName(&ofn)) CallService(MS_SHOWSPLASH,(WPARAM)szTempPath,0); diff --git a/plugins/SplashScreen/src/splash.cpp b/plugins/SplashScreen/src/splash.cpp index aa7e4eba6e..196c4adedd 100644 --- a/plugins/SplashScreen/src/splash.cpp +++ b/plugins/SplashScreen/src/splash.cpp @@ -29,7 +29,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_LOADED: { #ifdef _DEBUG - logMessage(L"WM_LOADED", L"called"); + logMessage(_T("WM_LOADED"), _T("called")); #endif if (!MyUpdateLayeredWindow) ShowWindow(hwndSplash, SW_SHOWNORMAL); @@ -46,10 +46,10 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM #ifdef _DEBUG TCHAR b [40]; - mir_sntprintf(b, SIZEOF(b), L"%d", wParam); - logMessage(L"Timer ID", b); - mir_sntprintf(b, SIZEOF(b), L"%d", options.showtime); - logMessage(L"ShowTime value", b); + mir_sntprintf(b, SIZEOF(b), _T("%d"), wParam); + logMessage(_T("Timer ID"), b); + mir_sntprintf(b, SIZEOF(b), _T("%d"), options.showtime); + logMessage(_T("ShowTime value"), b); #endif if (options.showtime > 0) //TimeToShow enabled @@ -58,7 +58,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM { PostMessage(hwnd, WM_CLOSE, 0, 0); #ifdef _DEBUG - logMessage(L"Showtime timer"), L"triggered"); + logMessage(_T("Showtime timer"), _T("triggered")); #endif } } @@ -68,13 +68,13 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM if (wParam == 7) { #ifdef _DEBUG - logMessage(L"On Modules Loaded timer", L"triggered"); + logMessage(_T("On Modules Loaded timer"), _T("triggered")); #endif } if (wParam == 8) { #ifdef _DEBUG - logMessage(L"On Modules Loaded workaround", L"triggered"); + logMessage(_T("On Modules Loaded workaround"), _T("triggered")); #endif } } @@ -133,7 +133,7 @@ LRESULT CALLBACK SplashWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM { PostQuitMessage(0); #ifdef _DEBUG - logMessage(L"WM_DESTROY", L"called"); + logMessage(_T("WM_DESTROY"), _T("called")); #endif break; } @@ -262,11 +262,11 @@ int SplashThread(void *arg) TCHAR verString[256] = {0}; TCHAR* mirandaVerString = mir_a2t(szVersion); - mir_sntprintf(verString, SIZEOF(verString), L"%s%s", szPrefix, mirandaVerString); + mir_sntprintf(verString, SIZEOF(verString), _T("%s%s"), szPrefix, mirandaVerString); mir_free(mirandaVerString); LOGFONT lf = {0}; lf.lfHeight = 14; - _tcscpy_s(lf.lfFaceName, L"Verdana"); + _tcscpy_s(lf.lfFaceName, _T("Verdana")); SelectObject(SplashBmp->getDC(), CreateFontIndirect(&lf)); if (!splashWithMarkers) { @@ -317,7 +317,7 @@ int SplashThread(void *arg) if (SetTimer(hwndSplash, 6, DWORD(arg), 0)) { #ifdef _DEBUG - logMessage(L"Timer TimeToShow", L"set"); + logMessage(_T("Timer TimeToShow"), _T("set")); #endif } } @@ -327,7 +327,7 @@ int SplashThread(void *arg) if (SetTimer(hwndSplash, 8, 2000, 0)) { #ifdef _DEBUG - logMessage(L"Timer Modules loaded", L"set"); + logMessage(_T("Timer Modules loaded"), _T("set")); #endif } } @@ -361,7 +361,7 @@ BOOL ShowSplash(BOOL bpreview) SplashBmp = new MyBitmap; #ifdef _DEBUG - logMessage(L"Loading splash file", szSplashFile); + logMessage(_T("Loading splash file"), szSplashFile); #endif SplashBmp->loadFromFile(szSplashFile, NULL); @@ -369,7 +369,7 @@ BOOL ShowSplash(BOOL bpreview) DWORD threadID; #ifdef _DEBUG - logMessage(L"Thread", L"start"); + logMessage(_T("Thread"), _T("start")); #endif if (bpreview) @@ -379,7 +379,7 @@ BOOL ShowSplash(BOOL bpreview) timeout = 2000; #ifdef _DEBUG - logMessage(L"Preview", L"yes"); + logMessage(_T("Preview"), _T("yes")); #endif } else @@ -387,15 +387,15 @@ BOOL ShowSplash(BOOL bpreview) timeout = options.showtime; #ifdef _DEBUG TCHAR b [40]; - mir_sntprintf(b, SIZEOF(b), L"%d", options.showtime); - logMessage(L"Timeout", b); + mir_sntprintf(b, SIZEOF(b), _T("%d"), options.showtime); + logMessage(_T("Timeout"), b); #endif } hSplashThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)SplashThread, (LPVOID)timeout, 0, &threadID); #ifdef _DEBUG - logMessage(L"Thread", L"end"); + logMessage(_T("Thread"), _T("end")); #endif CloseHandle(hSplashThread); -- cgit v1.2.3