From c09aa99a7e9915c503064d6eb5e9dd1bdd2a673f Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 22 May 2015 20:07:58 +0000 Subject: replace _tcscpy to mir_tstrcpy git-svn-id: http://svn.miranda-ng.org/main/trunk@13764 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/TipperYM/src/popwin.cpp | 12 ++++----- plugins/TipperYM/src/skin_parser.cpp | 2 +- plugins/TipperYM/src/tipper.cpp | 52 ++++++++++++++++++------------------ 3 files changed, 33 insertions(+), 33 deletions(-) (limited to 'plugins/TipperYM/src') diff --git a/plugins/TipperYM/src/popwin.cpp b/plugins/TipperYM/src/popwin.cpp index cba55de9bf..405df12768 100644 --- a/plugins/TipperYM/src/popwin.cpp +++ b/plugins/TipperYM/src/popwin.cpp @@ -73,7 +73,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if (ServiceExists(MS_PROTO_GETACCOUNT)) { PROTOACCOUNT *pa = ProtoGetAccount(pwd->clcit.szProto); if (pa) - _tcscpy(pwd->swzTitle, pa->tszAccountName); + mir_tstrcpy(pwd->swzTitle, pa->tszAccountName); } if (mir_tstrlen(pwd->swzTitle) == 0) @@ -779,7 +779,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa buff[MAX_VALUE_LEN] = 0; _tcscat(buff, _T("...")); } - else _tcscpy(buff, pwd->rows[i].swzValue); + else mir_tstrcpy(buff, pwd->rows[i].swzValue); AppendMenu(hMenu, MF_STRING, i + 1, buff); // first id = 1, because no select have id = 0 SetMenuItemBitmaps(hMenu, i + 1, MF_BYCOMMAND, hbmpItem, hbmpItem); @@ -852,7 +852,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa } } // single row - else _tcscpy(pchData, pwd->rows[iSelItem - 1].swzValue); + else mir_tstrcpy(pchData, pwd->rows[iSelItem - 1].swzValue); GlobalUnlock(hClipboardData); SetClipboardData(CF_UNICODETEXT, hClipboardData); @@ -1499,7 +1499,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa else buff[0] = 0; TCHAR swzProto[256]; - _tcscpy(swzProto, pa->tszAccountName); + mir_tstrcpy(swzProto, pa->tszAccountName); if (dwItems & TRAYTIP_LOCKSTATUS) if (CallService(MS_PROTO_ISACCOUNTLOCKED, 0, (LPARAM)pa->szModuleName)) mir_sntprintf(swzProto, SIZEOF(swzProto), TranslateT("%s (locked)"), pa->tszAccountName); @@ -1634,7 +1634,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa mir_sntprintf(swzName, SIZEOF(swzName), _T("%s (%s)"), swzNick, swzProto); mir_free(swzProto); } - else _tcscpy(swzName, swzNick); + else mir_tstrcpy(swzName, swzNick); AddRow(pwd, swzName, swzStatus, NULL, false, false, false); } @@ -1667,7 +1667,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa if (!pchBold || pchBold != pwd->clcit.swzText) { TCHAR swzText[256]; - _tcscpy(swzText, pwd->clcit.swzText); + mir_tstrcpy(swzText, pwd->clcit.swzText); if (pchBr) swzText[pchBr - pwd->clcit.swzText] = 0; AddRow(pwd, swzText, _T(""), NULL, false, true, false, true, LoadSkinnedIcon(SKINICON_OTHER_FILLEDBLOB)); } diff --git a/plugins/TipperYM/src/skin_parser.cpp b/plugins/TipperYM/src/skin_parser.cpp index 5391e74001..d4335c6cfb 100644 --- a/plugins/TipperYM/src/skin_parser.cpp +++ b/plugins/TipperYM/src/skin_parser.cpp @@ -90,7 +90,7 @@ void ParseAboutPart(FILE *fp, TCHAR *buff, TCHAR *szSkinName) TCHAR szImgPath[1024]; mir_sntprintf(szImgPath, SIZEOF(szImgPath), _T("%s\\%s\\%s"), SKIN_FOLDER, szSkinName, pch); if (FileExists(szImgPath)) - _tcscpy(opt.szPreviewFile, szImgPath); + mir_tstrcpy(opt.szPreviewFile, szImgPath); } } } diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp index b196ee3ea1..4c832427aa 100644 --- a/plugins/TipperYM/src/tipper.cpp +++ b/plugins/TipperYM/src/tipper.cpp @@ -125,8 +125,8 @@ int ReloadSkinFolder(WPARAM wParam, LPARAM lParam) void InitFonts() { colourBg.cbSize = sizeof(ColourIDT); - _tcscpy(colourBg.group, LPGENT("Tooltips")); - _tcscpy(colourBg.name, LPGENT("Background")); + mir_tstrcpy(colourBg.group, LPGENT("Tooltips")); + mir_tstrcpy(colourBg.name, LPGENT("Background")); mir_strcpy(colourBg.dbSettingsGroup, MODULE); mir_strcpy(colourBg.setting, "ColourBg"); colourBg.defcolour = RGB(219, 219, 219); @@ -134,8 +134,8 @@ void InitFonts() ColourRegisterT(&colourBg); colourBorder.cbSize = sizeof(ColourIDT); - _tcscpy(colourBorder.group, LPGENT("Tooltips")); - _tcscpy(colourBorder.name, LPGENT("Border")); + mir_tstrcpy(colourBorder.group, LPGENT("Tooltips")); + mir_tstrcpy(colourBorder.name, LPGENT("Border")); mir_strcpy(colourBorder.dbSettingsGroup, MODULE); mir_strcpy(colourBorder.setting, "BorderCol"); colourBorder.defcolour = 0; @@ -143,8 +143,8 @@ void InitFonts() ColourRegisterT(&colourBorder); colourAvatarBorder.cbSize = sizeof(ColourIDT); - _tcscpy(colourAvatarBorder.group, LPGENT("Tooltips")); - _tcscpy(colourAvatarBorder.name, LPGENT("Avatar border")); + mir_tstrcpy(colourAvatarBorder.group, LPGENT("Tooltips")); + mir_tstrcpy(colourAvatarBorder.name, LPGENT("Avatar border")); mir_strcpy(colourAvatarBorder.dbSettingsGroup, MODULE); mir_strcpy(colourAvatarBorder.setting, "AvBorderCol"); colourAvatarBorder.defcolour = 0; @@ -152,8 +152,8 @@ void InitFonts() ColourRegisterT(&colourAvatarBorder); colourDivider.cbSize = sizeof(ColourIDT); - _tcscpy(colourDivider.group, LPGENT("Tooltips")); - _tcscpy(colourDivider.name, LPGENT("Dividers")); + mir_tstrcpy(colourDivider.group, LPGENT("Tooltips")); + mir_tstrcpy(colourDivider.name, LPGENT("Dividers")); mir_strcpy(colourDivider.dbSettingsGroup, MODULE); mir_strcpy(colourDivider.setting, "DividerCol"); colourDivider.defcolour = 0; @@ -161,8 +161,8 @@ void InitFonts() ColourRegisterT(&colourDivider); colourSidebar.cbSize = sizeof(ColourIDT); - _tcscpy(colourSidebar.group, LPGENT("Tooltips")); - _tcscpy(colourSidebar.name, LPGENT("Sidebar")); + mir_tstrcpy(colourSidebar.group, LPGENT("Tooltips")); + mir_tstrcpy(colourSidebar.name, LPGENT("Sidebar")); mir_strcpy(colourSidebar.dbSettingsGroup, MODULE); mir_strcpy(colourSidebar.setting, "SidebarCol"); colourSidebar.defcolour = RGB(192, 192, 192); @@ -171,12 +171,12 @@ void InitFonts() fontTitle.cbSize = sizeof(FontIDT); fontTitle.flags = FIDF_ALLOWEFFECTS; - _tcscpy(fontTitle.group, LPGENT("Tooltips")); - _tcscpy(fontTitle.name, LPGENT("Title")); + mir_tstrcpy(fontTitle.group, LPGENT("Tooltips")); + mir_tstrcpy(fontTitle.name, LPGENT("Title")); mir_strcpy(fontTitle.dbSettingsGroup, MODULE); mir_strcpy(fontTitle.prefix, "FontFirst"); - _tcscpy(fontTitle.backgroundGroup, LPGENT("Tooltips")); - _tcscpy(fontTitle.backgroundName, LPGENT("Background")); + mir_tstrcpy(fontTitle.backgroundGroup, LPGENT("Tooltips")); + mir_tstrcpy(fontTitle.backgroundName, LPGENT("Background")); fontTitle.order = 0; fontTitle.deffontsettings.charset = DEFAULT_CHARSET; @@ -187,12 +187,12 @@ void InitFonts() fontLabels.cbSize = sizeof(FontIDT); fontLabels.flags = FIDF_ALLOWEFFECTS; - _tcscpy(fontLabels.group, LPGENT("Tooltips")); - _tcscpy(fontLabels.name, LPGENT("Labels")); + mir_tstrcpy(fontLabels.group, LPGENT("Tooltips")); + mir_tstrcpy(fontLabels.name, LPGENT("Labels")); mir_strcpy(fontLabels.dbSettingsGroup, MODULE); mir_strcpy(fontLabels.prefix, "FontLabels"); - _tcscpy(fontLabels.backgroundGroup, LPGENT("Tooltips")); - _tcscpy(fontLabels.backgroundName, LPGENT("Background")); + mir_tstrcpy(fontLabels.backgroundGroup, LPGENT("Tooltips")); + mir_tstrcpy(fontLabels.backgroundName, LPGENT("Background")); fontLabels.order = 1; fontLabels.deffontsettings.charset = DEFAULT_CHARSET; @@ -203,12 +203,12 @@ void InitFonts() fontValues.cbSize = sizeof(FontIDT); fontValues.flags = FIDF_ALLOWEFFECTS; - _tcscpy(fontValues.group, LPGENT("Tooltips")); - _tcscpy(fontValues.name, LPGENT("Values")); + mir_tstrcpy(fontValues.group, LPGENT("Tooltips")); + mir_tstrcpy(fontValues.name, LPGENT("Values")); mir_strcpy(fontValues.dbSettingsGroup, MODULE); mir_strcpy(fontValues.prefix, "FontValues"); - _tcscpy(fontValues.backgroundGroup, LPGENT("Tooltips")); - _tcscpy(fontValues.backgroundName, LPGENT("Background")); + mir_tstrcpy(fontValues.backgroundGroup, LPGENT("Tooltips")); + mir_tstrcpy(fontValues.backgroundName, LPGENT("Background")); fontValues.order = 2; fontValues.deffontsettings.charset = DEFAULT_CHARSET; @@ -219,12 +219,12 @@ void InitFonts() fontTrayTitle.cbSize = sizeof(FontIDT); fontTrayTitle.flags = FIDF_ALLOWEFFECTS; - _tcscpy(fontTrayTitle.group, LPGENT("Tooltips")); - _tcscpy(fontTrayTitle.name, LPGENT("Tray title")); + mir_tstrcpy(fontTrayTitle.group, LPGENT("Tooltips")); + mir_tstrcpy(fontTrayTitle.name, LPGENT("Tray title")); mir_strcpy(fontTrayTitle.dbSettingsGroup, MODULE); mir_strcpy(fontTrayTitle.prefix, "FontTrayTitle"); - _tcscpy(fontTrayTitle.backgroundGroup, LPGENT("Tooltips")); - _tcscpy(fontTrayTitle.backgroundName, LPGENT("Background")); + mir_tstrcpy(fontTrayTitle.backgroundGroup, LPGENT("Tooltips")); + mir_tstrcpy(fontTrayTitle.backgroundName, LPGENT("Background")); fontTrayTitle.order = 0; fontTrayTitle.deffontsettings.charset = DEFAULT_CHARSET; -- cgit v1.2.3