summaryrefslogtreecommitdiff
path: root/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'protocols')
-rw-r--r--protocols/Discord/src/groupchat.cpp2
-rw-r--r--protocols/Discord/src/menus.cpp4
-rw-r--r--protocols/ICQ-WIM/src/proto.cpp4
-rwxr-xr-xprotocols/JabberG/src/jabber_util.cpp2
-rw-r--r--protocols/SkypeWeb/src/skype_chatrooms.cpp6
-rw-r--r--protocols/SkypeWeb/src/skype_mslogin.cpp2
-rw-r--r--protocols/VKontakte/src/misc.cpp7
-rw-r--r--protocols/VKontakte/src/vk_chats.cpp2
-rw-r--r--protocols/VKontakte/src/vk_status.cpp2
9 files changed, 13 insertions, 18 deletions
diff --git a/protocols/Discord/src/groupchat.cpp b/protocols/Discord/src/groupchat.cpp
index babe48803a..95e3c47fb8 100644
--- a/protocols/Discord/src/groupchat.cpp
+++ b/protocols/Discord/src/groupchat.cpp
@@ -96,7 +96,7 @@ void CDiscordProto::Chat_ProcessLogMenu(GCHOOK *gch)
if (pUser == nullptr)
return;
- ENTER_STRING es = { sizeof(es) };
+ ENTER_STRING es = {};
es.szModuleName = m_szModuleName;
switch (gch->dwData) {
diff --git a/protocols/Discord/src/menus.cpp b/protocols/Discord/src/menus.cpp
index e2c4a602f6..f4faa56c10 100644
--- a/protocols/Discord/src/menus.cpp
+++ b/protocols/Discord/src/menus.cpp
@@ -39,7 +39,7 @@ INT_PTR CDiscordProto::OnMenuCopyId(WPARAM hContact, LPARAM)
INT_PTR CDiscordProto::OnMenuCreateChannel(WPARAM hContact, LPARAM)
{
- ENTER_STRING es = { sizeof(es), ESF_COMBO, m_szModuleName, "channel_name", TranslateT("Enter channel name"), nullptr, 5 };
+ ENTER_STRING es = { m_szModuleName, "channel_name", TranslateT("Enter channel name"), nullptr, ESF_COMBO, 5 };
if (EnterString(&es)) {
JSONNode roles(JSON_ARRAY); roles.set_name("permission_overwrites");
JSONNode root; root << INT_PARAM("type", 0) << WCHAR_PARAM("name", es.ptszResult) << roles;
@@ -54,7 +54,7 @@ INT_PTR CDiscordProto::OnMenuCreateChannel(WPARAM hContact, LPARAM)
INT_PTR CDiscordProto::OnMenuJoinGuild(WPARAM, LPARAM)
{
- ENTER_STRING es = { sizeof(es), ESF_COMBO, m_szModuleName, "guild_name", TranslateT("Enter invitation code you received"), nullptr, 5 };
+ ENTER_STRING es = { m_szModuleName, "guild_name", TranslateT("Enter invitation code you received"), nullptr, ESF_COMBO, 5 };
if (EnterString(&es)) {
CMStringA szUrl(FORMAT, "/invite/%S", es.ptszResult);
Push(new AsyncHttpRequest(this, REQUEST_POST, szUrl, nullptr));
diff --git a/protocols/ICQ-WIM/src/proto.cpp b/protocols/ICQ-WIM/src/proto.cpp
index 595a4c1689..39a58f7ef9 100644
--- a/protocols/ICQ-WIM/src/proto.cpp
+++ b/protocols/ICQ-WIM/src/proto.cpp
@@ -241,8 +241,8 @@ public:
if (cmd == 1) { // rename
ENTER_STRING es = {};
- es.cbSize = sizeof(es);
- es.type = ESF_RICHEDIT;
+ es.type = ESF_COMBO;
+ es.szModuleName = m_proto->m_szModuleName;
es.caption = TranslateT("Enter new group name");
if (!EnterString(&es))
return;
diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index a0a281f0f9..4d5f4f8d3e 100755
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -815,7 +815,7 @@ BOOL CJabberProto::EnterString(CMStringW &result, const wchar_t *caption, int ty
result.Empty();
}
- ENTER_STRING param = { sizeof(param) };
+ ENTER_STRING param = {};
param.type = type;
param.caption = caption;
param.szModuleName = m_szModuleName;
diff --git a/protocols/SkypeWeb/src/skype_chatrooms.cpp b/protocols/SkypeWeb/src/skype_chatrooms.cpp
index ab464fa852..4760ae7899 100644
--- a/protocols/SkypeWeb/src/skype_chatrooms.cpp
+++ b/protocols/SkypeWeb/src/skype_chatrooms.cpp
@@ -165,9 +165,8 @@ int CSkypeProto::OnGroupChatEventHook(WPARAM, LPARAM lParam)
case 50:
ptrA tnick_old(GetChatContactNick(chat_id, user_id, T2Utf(gch->ptszText)));
- ENTER_STRING pForm = { sizeof(pForm) };
+ ENTER_STRING pForm = {};
pForm.type = ESF_COMBO;
- pForm.recentCount = 0;
pForm.caption = TranslateT("Enter new nickname");
pForm.szModuleName = m_szModuleName;
pForm.szDataPrefix = "renamenick_";
@@ -530,10 +529,9 @@ int CSkypeProto::OnGroupChatMenuHook(WPARAM, LPARAM lParam)
CMStringW CSkypeProto::ChangeTopicForm()
{
CMStringW caption(FORMAT, L"[%s] %s", _A2T(m_szModuleName), TranslateT("Enter new chatroom topic"));
- ENTER_STRING pForm = { sizeof(pForm) };
+ ENTER_STRING pForm = {};
pForm.type = ESF_MULTILINE;
pForm.caption = caption;
- pForm.ptszInitVal = nullptr;
pForm.szModuleName = m_szModuleName;
return (!EnterString(&pForm)) ? CMStringW() : CMStringW(ptrW(pForm.ptszResult));
}
diff --git a/protocols/SkypeWeb/src/skype_mslogin.cpp b/protocols/SkypeWeb/src/skype_mslogin.cpp
index 84755dad3a..28a8c25cef 100644
--- a/protocols/SkypeWeb/src/skype_mslogin.cpp
+++ b/protocols/SkypeWeb/src/skype_mslogin.cpp
@@ -162,7 +162,7 @@ void CSkypeProto::OnMSLoginEnd(const NETLIBHTTPREQUEST *response)
CMStringW CSkypeProto::RunConfirmationCode()
{
CMStringW caption(FORMAT, L"[%s] %s", _A2T(m_szModuleName), TranslateT("Enter confirmation code"));
- ENTER_STRING pForm = { sizeof(pForm) };
+ ENTER_STRING pForm = {};
pForm.type = ESF_PASSWORD;
pForm.caption = caption;
pForm.ptszInitVal = nullptr;
diff --git a/protocols/VKontakte/src/misc.cpp b/protocols/VKontakte/src/misc.cpp
index 8cb14eab53..9d54898e85 100644
--- a/protocols/VKontakte/src/misc.cpp
+++ b/protocols/VKontakte/src/misc.cpp
@@ -463,11 +463,9 @@ bool CVkProto::AutoFillForm(char *pBody, CMStringA &szAction, CMStringA& szResul
CMStringW CVkProto::RunConfirmationCode(LPCWSTR pwszTitle)
{
- ENTER_STRING pForm = { sizeof(pForm) };
+ ENTER_STRING pForm = {};
pForm.type = ESF_COMBO;
- pForm.recentCount = 0;
pForm.caption = IsEmpty(pwszTitle) ? TranslateT("Enter confirmation code") : pwszTitle;
- pForm.ptszInitVal = nullptr;
pForm.szModuleName = m_szModuleName;
pForm.szDataPrefix = "confirmcode_";
return (!EnterString(&pForm)) ? CMStringW() : CMStringW(ptrW(pForm.ptszResult));
@@ -475,9 +473,8 @@ CMStringW CVkProto::RunConfirmationCode(LPCWSTR pwszTitle)
CMStringW CVkProto::RunRenameNick(LPCWSTR pwszOldName)
{
- ENTER_STRING pForm = { sizeof(pForm) };
+ ENTER_STRING pForm = {};
pForm.type = ESF_COMBO;
- pForm.recentCount = 0;
pForm.caption = TranslateT("Enter new nickname");
pForm.ptszInitVal = pwszOldName;
pForm.szModuleName = m_szModuleName;
diff --git a/protocols/VKontakte/src/vk_chats.cpp b/protocols/VKontakte/src/vk_chats.cpp
index 069bbc1142..35977921be 100644
--- a/protocols/VKontakte/src/vk_chats.cpp
+++ b/protocols/VKontakte/src/vk_chats.cpp
@@ -519,7 +519,7 @@ void CVkProto::OnSendChatMsg(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pReq)
LPTSTR CVkProto::ChangeChatTopic(CVkChatInfo *cc)
{
- ENTER_STRING pForm = { sizeof(pForm) };
+ ENTER_STRING pForm = {};
pForm.type = ESF_MULTILINE;
pForm.caption = TranslateT("Enter new chat title");
pForm.ptszInitVal = cc->m_wszTopic;
diff --git a/protocols/VKontakte/src/vk_status.cpp b/protocols/VKontakte/src/vk_status.cpp
index cd6df4fc71..4917bceead 100644
--- a/protocols/VKontakte/src/vk_status.cpp
+++ b/protocols/VKontakte/src/vk_status.cpp
@@ -135,7 +135,7 @@ void CVkProto::OnReceiveStatusMsg(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *pR
ptrW pwszOldStatusMsg(db_get_wsa(0, m_szModuleName, "OldStatusMsg"));
CMStringW wszOldStatusMsg(pwszOldStatusMsg);
- ENTER_STRING pForm = { sizeof(pForm) };
+ ENTER_STRING pForm = {};
pForm.type = ESF_MULTILINE;
pForm.caption = TranslateT("Enter new status message");
pForm.ptszInitVal = pwszOldStatusMsg;
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 13:47:40 +0000