diff options
author | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-24 12:35:03 +0000 |
---|---|---|
committer | Kirill Volinsky <mataes2007@gmail.com> | 2015-05-24 12:35:03 +0000 |
commit | ee697e0b699bcefec907c089e3ad455538c72c2f (patch) | |
tree | 030a675c2c93dc8b34a13b7fc9a3bea7477d84ba /plugins/IEView | |
parent | 5aed15a8d8d8e4f913539761be496e0d1ba2c4f0 (diff) |
replace wcscpy to mir_wstrcpy
replace wcscat to mir_wstrcat
replace wcsncat to mir_wstrncat
replace wcscmp to mir_wstrcmp
replace wcsicmp to mir_wstrcmpi
git-svn-id: http://svn.miranda-ng.org/main/trunk@13814 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/IEView')
-rw-r--r-- | plugins/IEView/src/IEView.cpp | 4 | ||||
-rw-r--r-- | plugins/IEView/src/TextToken.cpp | 12 | ||||
-rw-r--r-- | plugins/IEView/src/Utils.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/plugins/IEView/src/IEView.cpp b/plugins/IEView/src/IEView.cpp index 0f016dfb93..098cb1a71f 100644 --- a/plugins/IEView/src/IEView.cpp +++ b/plugins/IEView/src/IEView.cpp @@ -652,7 +652,7 @@ STDMETHODIMP IEView::GetSecuritySite(IInternetSecurityMgrSite **) STDMETHODIMP IEView::MapUrlToZone(LPCWSTR pwszUrl, DWORD *pdwZone, DWORD)
{
- if (pdwZone != NULL && pwszUrl != NULL && !wcscmp(pwszUrl, L"about:blank")) {
+ if (pdwZone != NULL && pwszUrl != NULL && !mir_wstrcmp(pwszUrl, L"about:blank")) {
*pdwZone = URLZONE_LOCAL_MACHINE;
return S_OK;
}
@@ -667,7 +667,7 @@ STDMETHODIMP IEView::GetSecurityId(LPCWSTR, BYTE *, DWORD *, DWORD_PTR) STDMETHODIMP IEView::ProcessUrlAction(LPCWSTR pwszUrl, DWORD dwAction, BYTE *pPolicy, DWORD cbPolicy, BYTE *, DWORD, DWORD, DWORD)
{
DWORD dwPolicy = URLPOLICY_ALLOW;
- if (pwszUrl != NULL && !wcscmp(pwszUrl, L"about:blank")) {
+ if (pwszUrl != NULL && !mir_wstrcmp(pwszUrl, L"about:blank")) {
if (dwAction <= URLACTION_ACTIVEX_MAX && dwAction >= URLACTION_ACTIVEX_MIN) {
//dwPolicy = URLPOLICY_DISALLOW;
//dwPolicy = URLPOLICY_ALLOW;
diff --git a/plugins/IEView/src/TextToken.cpp b/plugins/IEView/src/TextToken.cpp index ad08ee7856..1818154309 100644 --- a/plugins/IEView/src/TextToken.cpp +++ b/plugins/IEView/src/TextToken.cpp @@ -479,18 +479,18 @@ wchar_t *TextToken::htmlEncode(const wchar_t *str) wchar_t *output = new wchar_t[c + 1];
for (out = output, ptr = str; *ptr != '\0'; ptr++) {
if (*ptr == ' ' && wasSpace) {
- wcscpy(out, L" ");
+ mir_wstrcpy(out, L" ");
out += 6;
}
else {
wasSpace = false;
switch (*ptr) {
- case '\n': wcscpy(out, L"<br>"); out += 4; break;
+ case '\n': mir_wstrcpy(out, L"<br>"); out += 4; break;
case '\r': break;
- case '&': wcscpy(out, L"&"); out += 5; break;
- case '>': wcscpy(out, L">"); out += 4; break;
- case '<': wcscpy(out, L"<"); out += 4; break;
- case '"': wcscpy(out, L"""); out += 6; break;
+ case '&': mir_wstrcpy(out, L"&"); out += 5; break;
+ case '>': mir_wstrcpy(out, L">"); out += 4; break;
+ case '<': mir_wstrcpy(out, L"<"); out += 4; break;
+ case '"': mir_wstrcpy(out, L"""); out += 6; break;
case ' ': wasSpace = true;
default: *out = *ptr; out++;
}
diff --git a/plugins/IEView/src/Utils.cpp b/plugins/IEView/src/Utils.cpp index 1655b06c95..1330f14e89 100644 --- a/plugins/IEView/src/Utils.cpp +++ b/plugins/IEView/src/Utils.cpp @@ -36,8 +36,8 @@ wchar_t* Utils::toAbsolute(wchar_t* relative) long tlen = len + (int)mir_wstrlen(relative);
wchar_t* result = (wchar_t*)mir_alloc(sizeof(wchar_t)*(tlen + 1));
if (result) {
- wcscpy(result, bdir);
- wcscpy(result + len, relative);
+ mir_wstrcpy(result, bdir);
+ mir_wstrcpy(result + len, relative);
}
return result;
}
|