From ac6607c5f76566c2c840ca3955a22448738df9b3 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 28 Jan 2019 15:51:04 +0300 Subject: mir_urlDecode & mir_urlEncode to return CMStringA --- plugins/AVS/src/stdafx.h | 1 - plugins/AddContactPlus/src/stdafx.h | 1 - plugins/Clist_nicer/src/stdafx.h | 1 - plugins/CloudFile/src/Services/microsoft_api.h | 8 ++++---- plugins/CloudFile/src/Services/yandex_api.h | 6 +++--- plugins/CloudFile/src/http_request.h | 2 +- plugins/CloudFile/src/stdafx.h | 1 - plugins/CrashDumper/src/stdafx.h | 1 - plugins/DbEditorPP/src/stdafx.h | 1 - plugins/Folders/src/stdafx.h | 1 - plugins/GmailNotifier/src/notify.cpp | 6 +----- plugins/IEView/src/stdafx.h | 1 - plugins/MimCmd/src/stdafx.h | 1 - plugins/NewXstatusNotify/src/stdafx.h | 1 - plugins/New_GPG/src/stdafx.h | 1 - plugins/NewsAggregator/Src/stdafx.h | 1 - plugins/Non-IM Contact/src/stdafx.h | 1 - plugins/OpenSSL/src/stdafx.h | 1 - plugins/Popup/src/stdafx.h | 1 - plugins/QuickReplies/src/stdafx.h | 1 - plugins/Scriver/src/stdafx.h | 1 - plugins/Scriver/src/utils.cpp | 18 +++++++++--------- plugins/SeenPlugin/src/stdafx.h | 1 - plugins/SendScreenshotPlus/src/stdafx.h | 1 - plugins/SimpleAR/src/stdafx.h | 1 - plugins/SmileyAdd/src/stdafx.h | 1 - plugins/StatusManager/src/stdafx.h | 1 - plugins/TabSRMM/src/stdafx.h | 1 - plugins/TranslitSwitcher/src/stdafx.h | 1 - plugins/UserInfoEx/src/stdafx.h | 1 - plugins/Variables/src/stdafx.h | 1 - plugins/Weather/src/weather_addstn.cpp | 2 +- 32 files changed, 19 insertions(+), 49 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h index 7a3b675086..78f90ce490 100644 --- a/plugins/AVS/src/stdafx.h +++ b/plugins/AVS/src/stdafx.h @@ -41,7 +41,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include diff --git a/plugins/AddContactPlus/src/stdafx.h b/plugins/AddContactPlus/src/stdafx.h index 24535e7645..d374ea0cc1 100644 --- a/plugins/AddContactPlus/src/stdafx.h +++ b/plugins/AddContactPlus/src/stdafx.h @@ -36,7 +36,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include -#include #include "m_toptoolbar.h" #include "m_addcontactplus.h" diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h index 9c58d131db..bd776d8938 100644 --- a/plugins/Clist_nicer/src/stdafx.h +++ b/plugins/Clist_nicer/src/stdafx.h @@ -58,7 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include diff --git a/plugins/CloudFile/src/Services/microsoft_api.h b/plugins/CloudFile/src/Services/microsoft_api.h index 62a2204459..6c22ac512f 100644 --- a/plugins/CloudFile/src/Services/microsoft_api.h +++ b/plugins/CloudFile/src/Services/microsoft_api.h @@ -48,7 +48,7 @@ namespace OneDriveAPI { public: UploadFileRequest(const char *token, const char *name, const char *data, size_t size, OnConflict strategy = NONE) : - HttpRequest(REQUEST_PUT, FORMAT, ONEDRIVE_API "/special/approot:/%s:/content", ptrA(mir_urlEncode(name))) + HttpRequest(REQUEST_PUT, FORMAT, ONEDRIVE_API "/special/approot:/%s:/content", mir_urlEncode(name).c_str()) { AddUrlParameter("select=id"); @@ -63,7 +63,7 @@ namespace OneDriveAPI } UploadFileRequest(const char *token, const char *parentId, const char *name, const char *data, size_t size, OnConflict strategy = NONE) : - HttpRequest(REQUEST_PUT, FORMAT, ONEDRIVE_API "/items/%s:/%s:/content", parentId, ptrA(mir_urlEncode(name))) + HttpRequest(REQUEST_PUT, FORMAT, ONEDRIVE_API "/items/%s:/%s:/content", parentId, mir_urlEncode(name).c_str()) { AddUrlParameter("select=id"); @@ -82,7 +82,7 @@ namespace OneDriveAPI { public: CreateUploadSessionRequest(const char *token, const char *name, OnConflict strategy = NONE) : - HttpRequest(REQUEST_POST, FORMAT, ONEDRIVE_API "/special/approot:/%s:/createUploadSession", ptrA(mir_urlEncode(name))) + HttpRequest(REQUEST_POST, FORMAT, ONEDRIVE_API "/special/approot:/%s:/createUploadSession", mir_urlEncode(name).c_str()) { AddBearerAuthHeader(token); AddHeader("Content-Type", "application/json"); @@ -102,7 +102,7 @@ namespace OneDriveAPI } CreateUploadSessionRequest(const char *token, const char *parentId, const char *name, OnConflict strategy = NONE) : - HttpRequest(REQUEST_POST, FORMAT, ONEDRIVE_API "/items/%s:/%s:/createUploadSession", parentId, ptrA(mir_urlEncode(name))) + HttpRequest(REQUEST_POST, FORMAT, ONEDRIVE_API "/items/%s:/%s:/createUploadSession", parentId, mir_urlEncode(name).c_str()) { AddBearerAuthHeader(token); AddHeader("Content-Type", "application/json"); diff --git a/plugins/CloudFile/src/Services/yandex_api.h b/plugins/CloudFile/src/Services/yandex_api.h index ac99cb0177..c7c3dfe19d 100644 --- a/plugins/CloudFile/src/Services/yandex_api.h +++ b/plugins/CloudFile/src/Services/yandex_api.h @@ -60,7 +60,7 @@ namespace YandexAPI HttpRequest(REQUEST_GET, YADISK_API "/upload") { AddOAuthHeader(token); - AddUrlParameter("path=app:%s", ptrA(mir_urlEncode(path))); + AddUrlParameter("path=app:%s", mir_urlEncode(path).c_str()); AddUrlParameter("fields=href"); if (strategy == OnConflict::REPLACE) AddUrlParameter("overwrite=true"); @@ -111,7 +111,7 @@ namespace YandexAPI HttpRequest(REQUEST_PUT, YADISK_API "/publish") { AddOAuthHeader(token); - AddUrlParameter("path=app:%s", ptrA(mir_urlEncode(path))); + AddUrlParameter("path=app:%s", mir_urlEncode(path).c_str()); } }; @@ -122,7 +122,7 @@ namespace YandexAPI HttpRequest(REQUEST_GET, YADISK_API) { AddOAuthHeader(token); - AddUrlParameter("path=app:%s", ptrA(mir_urlEncode(path))); + AddUrlParameter("path=app:%s", mir_urlEncode(path).c_str()); AddUrlParameter("fields=public_url"); } }; diff --git a/plugins/CloudFile/src/http_request.h b/plugins/CloudFile/src/http_request.h index db052604b8..c74b2ae40c 100644 --- a/plugins/CloudFile/src/http_request.h +++ b/plugins/CloudFile/src/http_request.h @@ -125,7 +125,7 @@ protected: m_szUrl.AppendFormat("%s=", name); CMStringA value; value.AppendFormatV(valueFormat, valueArgs); - m_szUrl.Append(ptrA(mir_urlEncode(value))); + m_szUrl += mir_urlEncode(value); va_end(valueArgs); } diff --git a/plugins/CloudFile/src/stdafx.h b/plugins/CloudFile/src/stdafx.h index 08628d1488..58801c4a34 100644 --- a/plugins/CloudFile/src/stdafx.h +++ b/plugins/CloudFile/src/stdafx.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include diff --git a/plugins/CrashDumper/src/stdafx.h b/plugins/CrashDumper/src/stdafx.h index 7799b59a4e..c6ace054d4 100644 --- a/plugins/CrashDumper/src/stdafx.h +++ b/plugins/CrashDumper/src/stdafx.h @@ -36,7 +36,6 @@ along with this program. If not, see . #include #include #include -#include #include #include diff --git a/plugins/DbEditorPP/src/stdafx.h b/plugins/DbEditorPP/src/stdafx.h index 1b0b9c586f..d623275d4c 100644 --- a/plugins/DbEditorPP/src/stdafx.h +++ b/plugins/DbEditorPP/src/stdafx.h @@ -32,7 +32,6 @@ #include #include #include -#include #include #include "m_toptoolbar.h" diff --git a/plugins/Folders/src/stdafx.h b/plugins/Folders/src/stdafx.h index afadf0a653..1c56ec4f1d 100644 --- a/plugins/Folders/src/stdafx.h +++ b/plugins/Folders/src/stdafx.h @@ -34,7 +34,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp index 42804b3322..b07805dac4 100644 --- a/plugins/GmailNotifier/src/notify.cpp +++ b/plugins/GmailNotifier/src/notify.cpp @@ -46,14 +46,10 @@ static void __cdecl Login_ThreadFunc(Account *curAcc) mir_strcat(lpPathBuffer, szTempName); } else { - char *szEncodedURL = mir_urlEncode(curAcc->name); mir_strcat(lpPathBuffer, LINK); - mir_strcat(lpPathBuffer, szEncodedURL); - //mir_strcat(lpPathBuffer, "&Passwd="); - //mir_strcat(lpPathBuffer, mir_urlEncode(curAcc->pass)); + mir_strcat(lpPathBuffer, mir_urlEncode(curAcc->name)); if (opt.AutoLogin == 1) mir_strcat(lpPathBuffer, "&PersistentCookie=yes"); - mir_free(szEncodedURL); } } } diff --git a/plugins/IEView/src/stdafx.h b/plugins/IEView/src/stdafx.h index fa6f601184..f7da077d89 100644 --- a/plugins/IEView/src/stdafx.h +++ b/plugins/IEView/src/stdafx.h @@ -49,7 +49,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/MimCmd/src/stdafx.h b/plugins/MimCmd/src/stdafx.h index d6aa7d304c..7fe5cafc4f 100644 --- a/plugins/MimCmd/src/stdafx.h +++ b/plugins/MimCmd/src/stdafx.h @@ -32,7 +32,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include "../CmdLine/src/mimcmd_ipc.h" #include "version.h" diff --git a/plugins/NewXstatusNotify/src/stdafx.h b/plugins/NewXstatusNotify/src/stdafx.h index 5f92ba982a..02e2fbeb43 100644 --- a/plugins/NewXstatusNotify/src/stdafx.h +++ b/plugins/NewXstatusNotify/src/stdafx.h @@ -52,7 +52,6 @@ #include #include #include -#include #include #include diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h index 40518948c2..9a39ad4ea5 100755 --- a/plugins/New_GPG/src/stdafx.h +++ b/plugins/New_GPG/src/stdafx.h @@ -62,7 +62,6 @@ using std::fstream; #include #include #include -#include #include #include diff --git a/plugins/NewsAggregator/Src/stdafx.h b/plugins/NewsAggregator/Src/stdafx.h index b40650e2f9..67c4ff057a 100644 --- a/plugins/NewsAggregator/Src/stdafx.h +++ b/plugins/NewsAggregator/Src/stdafx.h @@ -48,7 +48,6 @@ Boston, MA 02111-1307, USA. #include #include -#include #include "Options.h" #include "version.h" diff --git a/plugins/Non-IM Contact/src/stdafx.h b/plugins/Non-IM Contact/src/stdafx.h index 2c7df9029d..b0cec1f9cb 100644 --- a/plugins/Non-IM Contact/src/stdafx.h +++ b/plugins/Non-IM Contact/src/stdafx.h @@ -44,7 +44,6 @@ struct DLGTEMPLATEEX #include #include #include -#include #include #include "resource.h" diff --git a/plugins/OpenSSL/src/stdafx.h b/plugins/OpenSSL/src/stdafx.h index ef64bfa1e4..8eacec47c2 100644 --- a/plugins/OpenSSL/src/stdafx.h +++ b/plugins/OpenSSL/src/stdafx.h @@ -38,7 +38,6 @@ typedef struct SslHandle *HSSL; #include #include #include -#include #include #include diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h index a63a558885..74e34acc48 100644 --- a/plugins/Popup/src/stdafx.h +++ b/plugins/Popup/src/stdafx.h @@ -81,7 +81,6 @@ https://miranda-ng.org/distr/ #include #include #include -#include #include #include diff --git a/plugins/QuickReplies/src/stdafx.h b/plugins/QuickReplies/src/stdafx.h index 091d8e57cf..f39d1ea9d6 100644 --- a/plugins/QuickReplies/src/stdafx.h +++ b/plugins/QuickReplies/src/stdafx.h @@ -25,7 +25,6 @@ Boston, MA 02111-1307, USA. #include #include -#include #include #include #include diff --git a/plugins/Scriver/src/stdafx.h b/plugins/Scriver/src/stdafx.h index 7a023eaeab..e1ae6b4b96 100644 --- a/plugins/Scriver/src/stdafx.h +++ b/plugins/Scriver/src/stdafx.h @@ -59,7 +59,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include #include diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index 593eaba0f2..e8f9590391 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -232,32 +232,32 @@ void SearchWord(wchar_t *word, int engine) char szURL[4096]; if (word && word[0]) { T2Utf wordUTF(word); - ptrA wordURL(mir_urlEncode(wordUTF)); + CMStringA wordURL(mir_urlEncode(wordUTF)); switch (engine) { case SEARCHENGINE_WIKIPEDIA: - mir_snprintf(szURL, "http://en.wikipedia.org/wiki/%s", wordURL); + mir_snprintf(szURL, "http://en.wikipedia.org/wiki/%s", wordURL.c_str()); break; case SEARCHENGINE_YAHOO: - mir_snprintf(szURL, "http://search.yahoo.com/search?p=%s&ei=UTF-8", wordURL); + mir_snprintf(szURL, "http://search.yahoo.com/search?p=%s&ei=UTF-8", wordURL.c_str()); break; case SEARCHENGINE_FOODNETWORK: - mir_snprintf(szURL, "http://search.foodnetwork.com/search/delegate.do?fnSearchString=%s", wordURL); + mir_snprintf(szURL, "http://search.foodnetwork.com/search/delegate.do?fnSearchString=%s", wordURL.c_str()); break; case SEARCHENGINE_BING: - mir_snprintf(szURL, "http://www.bing.com/search?q=%s&form=OSDSRC", wordURL); + mir_snprintf(szURL, "http://www.bing.com/search?q=%s&form=OSDSRC", wordURL.c_str()); break; case SEARCHENGINE_GOOGLE_MAPS: - mir_snprintf(szURL, "http://maps.google.com/maps?q=%s&ie=utf-8&oe=utf-8", wordURL); + mir_snprintf(szURL, "http://maps.google.com/maps?q=%s&ie=utf-8&oe=utf-8", wordURL.c_str()); break; case SEARCHENGINE_GOOGLE_TRANSLATE: - mir_snprintf(szURL, "http://translate.google.com/?q=%s&ie=utf-8&oe=utf-8", wordURL); + mir_snprintf(szURL, "http://translate.google.com/?q=%s&ie=utf-8&oe=utf-8", wordURL.c_str()); break; case SEARCHENGINE_YANDEX: - mir_snprintf(szURL, "http://yandex.ru/yandsearch?text=%s", wordURL); + mir_snprintf(szURL, "http://yandex.ru/yandsearch?text=%s", wordURL.c_str()); break; case SEARCHENGINE_GOOGLE: default: - mir_snprintf(szURL, "http://www.google.com/search?q=%s&ie=utf-8&oe=utf-8", wordURL); + mir_snprintf(szURL, "http://www.google.com/search?q=%s&ie=utf-8&oe=utf-8", wordURL.c_str()); break; } diff --git a/plugins/SeenPlugin/src/stdafx.h b/plugins/SeenPlugin/src/stdafx.h index f76c1fc0ae..f8f4c338e2 100644 --- a/plugins/SeenPlugin/src/stdafx.h +++ b/plugins/SeenPlugin/src/stdafx.h @@ -47,7 +47,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include -#include #include #include diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h index 720f67165e..a615d173bb 100644 --- a/plugins/SendScreenshotPlus/src/stdafx.h +++ b/plugins/SendScreenshotPlus/src/stdafx.h @@ -67,7 +67,6 @@ using namespace std; #include #include #include -#include #include #include diff --git a/plugins/SimpleAR/src/stdafx.h b/plugins/SimpleAR/src/stdafx.h index 0c13a139e3..afbf46a9e4 100644 --- a/plugins/SimpleAR/src/stdafx.h +++ b/plugins/SimpleAR/src/stdafx.h @@ -9,7 +9,6 @@ #include #include #include -#include #include diff --git a/plugins/SmileyAdd/src/stdafx.h b/plugins/SmileyAdd/src/stdafx.h index 3a43b4a00b..6817dfcbc9 100644 --- a/plugins/SmileyAdd/src/stdafx.h +++ b/plugins/SmileyAdd/src/stdafx.h @@ -66,7 +66,6 @@ along with this program. If not, see . #include #include #include -#include #include #include diff --git a/plugins/StatusManager/src/stdafx.h b/plugins/StatusManager/src/stdafx.h index 6162650dad..5594382334 100644 --- a/plugins/StatusManager/src/stdafx.h +++ b/plugins/StatusManager/src/stdafx.h @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h index aae1f8a4cc..10debe1e4e 100644 --- a/plugins/TabSRMM/src/stdafx.h +++ b/plugins/TabSRMM/src/stdafx.h @@ -74,7 +74,6 @@ #include #include #include -#include #include #include #include diff --git a/plugins/TranslitSwitcher/src/stdafx.h b/plugins/TranslitSwitcher/src/stdafx.h index fd6e7cd3c7..bd61dbf255 100644 --- a/plugins/TranslitSwitcher/src/stdafx.h +++ b/plugins/TranslitSwitcher/src/stdafx.h @@ -30,7 +30,6 @@ Boston, MA 02111-1307, USA. #include #include #include -#include #include #include diff --git a/plugins/UserInfoEx/src/stdafx.h b/plugins/UserInfoEx/src/stdafx.h index d438efa2da..e3e8f5e21d 100644 --- a/plugins/UserInfoEx/src/stdafx.h +++ b/plugins/UserInfoEx/src/stdafx.h @@ -72,7 +72,6 @@ using namespace std; #include #include #include -#include #include /*********************************************************************************************************** diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h index 926eeef75f..14e7d17c04 100644 --- a/plugins/Variables/src/stdafx.h +++ b/plugins/Variables/src/stdafx.h @@ -42,7 +42,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include #include #include -#include #include #include diff --git a/plugins/Weather/src/weather_addstn.cpp b/plugins/Weather/src/weather_addstn.cpp index c40fd5c431..7756ac3e39 100644 --- a/plugins/Weather/src/weather_addstn.cpp +++ b/plugins/Weather/src/weather_addstn.cpp @@ -310,7 +310,7 @@ int NameSearchProc(wchar_t *name, const int searchId, WINAMESEARCH *sData, wchar // replace spaces with %20 char loc[256]; T2Utf szSearchName(name); - mir_snprintf(loc, sData->SearchURL, ptrA(mir_urlEncode(szSearchName))); + mir_snprintf(loc, sData->SearchURL, mir_urlEncode(szSearchName).c_str()); if (InternetDownloadFile(loc, nullptr, nullptr, &szData) == 0) { wchar_t* szInfo = szData; search = wcsstr(szInfo, sData->NotFoundStr); // determine if data is available -- cgit v1.2.3