summaryrefslogtreecommitdiff
path: root/protocols/IRCG/src
diff options
context:
space:
mode:
Diffstat (limited to 'protocols/IRCG/src')
-rw-r--r--protocols/IRCG/src/clist.cpp4
-rw-r--r--protocols/IRCG/src/commandmonitor.cpp24
-rw-r--r--protocols/IRCG/src/input.cpp12
-rw-r--r--protocols/IRCG/src/irclib.cpp2
-rw-r--r--protocols/IRCG/src/ircproto.cpp10
-rw-r--r--protocols/IRCG/src/options.cpp12
-rw-r--r--protocols/IRCG/src/services.cpp18
-rw-r--r--protocols/IRCG/src/tools.cpp2
-rw-r--r--protocols/IRCG/src/userinfo.cpp18
-rw-r--r--protocols/IRCG/src/windows.cpp14
10 files changed, 58 insertions, 58 deletions
diff --git a/protocols/IRCG/src/clist.cpp b/protocols/IRCG/src/clist.cpp
index 4c6b695325..4cffc5dd14 100644
--- a/protocols/IRCG/src/clist.cpp
+++ b/protocols/IRCG/src/clist.cpp
@@ -124,7 +124,7 @@ MCONTACT CIrcProto::CList_SetOffline(CONTACT *user)
if (!getWString(hContact, "Default", &dbv)) {
setString(hContact, "User", "");
setString(hContact, "Host", "");
- setWString(hContact, "Nick", dbv.ptszVal);
+ setWString(hContact, "Nick", dbv.pwszVal);
setWord(hContact, "Status", ID_STATUS_OFFLINE);
db_free(&dbv);
return hContact;
@@ -149,7 +149,7 @@ bool CIrcProto::CList_SetAllOffline(BYTE ChatsToo)
setWord(hContact, "Status", ID_STATUS_OFFLINE);
}
else if (!getWString(hContact, "Default", &dbv)) {
- setWString(hContact, "Nick", dbv.ptszVal);
+ setWString(hContact, "Nick", dbv.pwszVal);
setWord(hContact, "Status", ID_STATUS_OFFLINE);
db_free(&dbv);
}
diff --git a/protocols/IRCG/src/commandmonitor.cpp b/protocols/IRCG/src/commandmonitor.cpp
index 464ed5bea1..2d84403b90 100644
--- a/protocols/IRCG/src/commandmonitor.cpp
+++ b/protocols/IRCG/src/commandmonitor.cpp
@@ -156,7 +156,7 @@ VOID CALLBACK OnlineNotifTimerProc(HWND, UINT, UINT_PTR idEvent, DWORD)
if (!bAdvanced) {
db_free(&dbv);
if (!ppro->getWString(hContact, "Nick", &dbv)) {
- ppro->m_namesToUserhost += CMStringW(dbv.ptszVal) + L" ";
+ ppro->m_namesToUserhost += CMStringW(dbv.pwszVal) + L" ";
db_free(&dbv);
}
}
@@ -167,9 +167,9 @@ VOID CALLBACK OnlineNotifTimerProc(HWND, UINT, UINT_PTR idEvent, DWORD)
wchar_t* DBNick = nullptr;
wchar_t* DBWildcard = nullptr;
if (!ppro->getWString(hContact, "Nick", &dbv))
- DBNick = dbv.ptszVal;
+ DBNick = dbv.pwszVal;
if (!ppro->getWString(hContact, "UWildcard", &dbv2))
- DBWildcard = dbv2.ptszVal;
+ DBWildcard = dbv2.pwszVal;
if (DBNick && (!DBWildcard || !WCCmp(CharLower(DBWildcard), CharLower(DBNick))))
ppro->m_namesToWho += CMStringW(DBNick) + L" ";
@@ -1366,7 +1366,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage *pmsg)
int k = 0;
while (!command.IsEmpty()) {
- command = GetWord(dbv.ptszVal, k);
+ command = GetWord(dbv.pwszVal, k);
k++;
if (!command.IsEmpty()) {
CMStringW S = command.Mid(1);
@@ -1378,7 +1378,7 @@ bool CIrcProto::OnIrc_ENDNAMES(const CIrcMessage *pmsg)
}
if (!command.IsEmpty()) {
- save += GetWordAddress(dbv.ptszVal, k);
+ save += GetWordAddress(dbv.pwszVal, k);
switch (command[0]) {
case 'M':
Chat_Control(m_szModuleName, sID, WINDOW_HIDDEN);
@@ -1743,17 +1743,17 @@ bool CIrcProto::OnIrc_WHOIS_NO_USER(const CIrcMessage *pmsg)
DBVARIANT dbv;
if (!getWString(hContact, "Default", &dbv)) {
- setWString(hContact, "Nick", dbv.ptszVal);
+ setWString(hContact, "Nick", dbv.pwszVal);
DBVARIANT dbv2;
if (getByte(hContact, "AdvancedMode", 0) == 0)
- DoUserhostWithReason(1, ((CMStringW)L"S" + dbv.ptszVal), true, dbv.ptszVal);
+ DoUserhostWithReason(1, ((CMStringW)L"S" + dbv.pwszVal), true, dbv.pwszVal);
else {
if (!getWString(hContact, "UWildcard", &dbv2)) {
- DoUserhostWithReason(2, ((CMStringW)L"S" + dbv2.ptszVal), true, dbv2.ptszVal);
+ DoUserhostWithReason(2, ((CMStringW)L"S" + dbv2.pwszVal), true, dbv2.pwszVal);
db_free(&dbv2);
}
- else DoUserhostWithReason(2, ((CMStringW)L"S" + dbv.ptszVal), true, dbv.ptszVal);
+ else DoUserhostWithReason(2, ((CMStringW)L"S" + dbv.pwszVal), true, dbv.pwszVal);
}
setString(hContact, "User", "");
setString(hContact, "Host", "");
@@ -1811,7 +1811,7 @@ bool CIrcProto::OnIrc_JOINERROR(const CIrcMessage *pmsg)
int i = 0;
while (!command.IsEmpty()) {
- command = GetWord(dbv.ptszVal, i);
+ command = GetWord(dbv.pwszVal, i);
i++;
if (!command.IsEmpty() && pmsg->parameters[0] == command.Mid(1))
@@ -2390,8 +2390,8 @@ int CIrcProto::DoPerform(const char* event)
DBVARIANT dbv;
if (!getWString(sSetting, &dbv)) {
- if (!my_strstri(dbv.ptszVal, L"/away"))
- PostIrcMessageWnd(nullptr, NULL, dbv.ptszVal);
+ if (!my_strstri(dbv.pwszVal, L"/away"))
+ PostIrcMessageWnd(nullptr, NULL, dbv.pwszVal);
else
mir_forkthread(AwayWarningThread);
db_free(&dbv);
diff --git a/protocols/IRCG/src/input.cpp b/protocols/IRCG/src/input.cpp
index 169dbc4153..f7cf3b6f84 100644
--- a/protocols/IRCG/src/input.cpp
+++ b/protocols/IRCG/src/input.cpp
@@ -51,7 +51,7 @@ void CIrcProto::FormatMsg(CMStringW& text)
if (sNick4Perform == L"") {
DBVARIANT dbv;
if (!getWString("PNick", &dbv)) {
- sNick4Perform = dbv.ptszVal;
+ sNick4Perform = dbv.pwszVal;
db_free(&dbv);
}
}
@@ -549,8 +549,8 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo
DBVARIANT dbv1;
if (!getWString(hContact, "UWildcard", &dbv1)) {
CMStringW S = L"S";
- S += dbv1.ptszVal;
- DoUserhostWithReason(2, S.c_str(), true, dbv1.ptszVal);
+ S += dbv1.pwszVal;
+ DoUserhostWithReason(2, S.c_str(), true, dbv1.pwszVal);
db_free(&dbv1);
}
else {
@@ -624,8 +624,8 @@ BOOL CIrcProto::DoHardcodedCommand(CMStringW text, wchar_t *window, MCONTACT hCo
DBVARIANT dbv1;
CMStringW S = L"S";
if (!getWString(ccNew, "UWildcard", &dbv1)) {
- S += dbv1.ptszVal;
- DoUserhostWithReason(2, S.c_str(), true, dbv1.ptszVal);
+ S += dbv1.pwszVal;
+ DoUserhostWithReason(2, S.c_str(), true, dbv1.pwszVal);
db_free(&dbv1);
}
else {
@@ -804,7 +804,7 @@ bool CIrcProto::PostIrcMessageWnd(wchar_t *window, MCONTACT hContact, const wcha
return 0;
if (hContact && !getWString(hContact, "Nick", &dbv)) {
- mir_wstrncpy(windowname, dbv.ptszVal, 255);
+ mir_wstrncpy(windowname, dbv.pwszVal, 255);
db_free(&dbv);
}
else if (window)
diff --git a/protocols/IRCG/src/irclib.cpp b/protocols/IRCG/src/irclib.cpp
index 04b56f2c6a..96426b287e 100644
--- a/protocols/IRCG/src/irclib.cpp
+++ b/protocols/IRCG/src/irclib.cpp
@@ -527,7 +527,7 @@ CDccSession* CIrcProto::FindDCCRecvByPortAndName(int iPort, const wchar_t* szNam
for (auto &p : m_dcc_xfers) {
DBVARIANT dbv;
if (!getWString(p->di->hContact, "Nick", &dbv)) {
- if (p->di->iType == DCC_SEND && !p->di->bSender && !mir_wstrcmpi(szName, dbv.ptszVal) && iPort == p->di->iPort) {
+ if (p->di->iType == DCC_SEND && !p->di->bSender && !mir_wstrcmpi(szName, dbv.pwszVal) && iPort == p->di->iPort) {
db_free(&dbv);
return p;
}
diff --git a/protocols/IRCG/src/ircproto.cpp b/protocols/IRCG/src/ircproto.cpp
index f4c42f4e80..096ed5b1c8 100644
--- a/protocols/IRCG/src/ircproto.cpp
+++ b/protocols/IRCG/src/ircproto.cpp
@@ -250,7 +250,7 @@ void CIrcProto::OnModulesLoaded()
if (!getWString(*it, &dbv)) {
db_unset(NULL, m_szModuleName, *it);
it->MakeUpper();
- setWString(*it, dbv.ptszVal);
+ setWString(*it, dbv.pwszVal);
db_free(&dbv);
}
}
@@ -302,8 +302,8 @@ MCONTACT CIrcProto::AddToList(int, PROTOSEARCHRESULT* psr)
}
else {
if (!getWString(hContact, "UWildcard", &dbv1)) {
- S += dbv1.ptszVal;
- DoUserhostWithReason(2, S, true, dbv1.ptszVal);
+ S += dbv1.pwszVal;
+ DoUserhostWithReason(2, S, true, dbv1.pwszVal);
db_free(&dbv1);
}
else {
@@ -556,7 +556,7 @@ HANDLE CIrcProto::SendFile(MCONTACT hContact, const wchar_t*, wchar_t** ppszFile
}
dci->hContact = hContact;
- dci->sContactName = dbv.ptszVal;
+ dci->sContactName = dbv.pwszVal;
dci->iType = DCC_SEND;
dci->bReverse = m_DCCPassive ? true : false;
dci->bSender = true;
@@ -772,7 +772,7 @@ HANDLE CIrcProto::GetAwayMsg(MCONTACT hContact)
return nullptr;
}
CMStringW S = L"WHOIS ";
- S += dbv.ptszVal;
+ S += dbv.pwszVal;
if (IsConnected())
SendIrcMessage(S.c_str(), false);
db_free(&dbv);
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp
index a1ae6248a0..d1e155fd9d 100644
--- a/protocols/IRCG/src/options.cpp
+++ b/protocols/IRCG/src/options.cpp
@@ -62,11 +62,11 @@ void CIrcProto::ReadSettings(TDbSetting* sets, int count)
case DBVT_WCHAR:
if (!getWString(p->name, &dbv)) {
if (p->size != -1) {
- size_t len = min(p->size - 1, mir_wstrlen(dbv.ptszVal));
+ size_t len = min(p->size - 1, mir_wstrlen(dbv.pwszVal));
memcpy(ptr, dbv.pszVal, len*sizeof(wchar_t));
*(wchar_t*)&ptr[len*sizeof(wchar_t)] = 0;
}
- else *(wchar_t**)ptr = mir_wstrdup(dbv.ptszVal);
+ else *(wchar_t**)ptr = mir_wstrdup(dbv.pwszVal);
db_free(&dbv);
}
else {
@@ -1177,7 +1177,7 @@ void COtherPrefsDlg::addPerformComboValue(int idx, const char* szValueName)
PERFORM_INFO* pPref;
DBVARIANT dbv;
if (!m_proto->getWString(sSetting.c_str(), &dbv)) {
- pPref = new PERFORM_INFO(sSetting.c_str(), dbv.ptszVal);
+ pPref = new PERFORM_INFO(sSetting.c_str(), dbv.pwszVal);
db_free(&dbv);
}
else pPref = new PERFORM_INFO(sSetting.c_str(), L"");
@@ -1363,9 +1363,9 @@ void CIrcProto::InitIgnore(void)
if (getWString(settingName, &dbv))
break;
- CMStringW mask = GetWord(dbv.ptszVal, 0);
- CMStringW flags = GetWord(dbv.ptszVal, 1);
- CMStringW network = GetWord(dbv.ptszVal, 2);
+ CMStringW mask = GetWord(dbv.pwszVal, 0);
+ CMStringW flags = GetWord(dbv.pwszVal, 1);
+ CMStringW network = GetWord(dbv.pwszVal, 2);
m_ignoreItems.insert(new CIrcIgnoreItem(mask.c_str(), flags.c_str(), network.c_str()));
db_free(&dbv);
}
diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp
index 01824a8e25..d1d79044e8 100644
--- a/protocols/IRCG/src/services.cpp
+++ b/protocols/IRCG/src/services.cpp
@@ -183,12 +183,12 @@ void CIrcProto::OnContactDeleted(MCONTACT hContact)
if (type != 0) {
CMStringW S;
if (type == GCW_CHATROOM)
- S = MakeWndID(dbv.ptszVal);
+ S = MakeWndID(dbv.pwszVal);
if (type == GCW_SERVER)
S = SERVERWINDOW;
int i = Chat_Terminate(m_szModuleName, S);
if (i && type == GCW_CHATROOM)
- PostIrcMessage(L"/PART %s %s", dbv.ptszVal, m_userInfo);
+ PostIrcMessage(L"/PART %s %s", dbv.pwszVal, m_userInfo);
}
else {
BYTE bDCC = getByte(hContact, "DCC", 0);
@@ -211,7 +211,7 @@ INT_PTR __cdecl CIrcProto::OnJoinChat(WPARAM wp, LPARAM)
DBVARIANT dbv;
if (!getWString((MCONTACT)wp, "Nick", &dbv)) {
if (getByte((MCONTACT)wp, "ChatRoom", 0) == GCW_CHATROOM)
- PostIrcMessage(L"/JOIN %s", dbv.ptszVal);
+ PostIrcMessage(L"/JOIN %s", dbv.pwszVal);
db_free(&dbv);
}
return 0;
@@ -225,8 +225,8 @@ INT_PTR __cdecl CIrcProto::OnLeaveChat(WPARAM wp, LPARAM)
DBVARIANT dbv;
if (!getWString((MCONTACT)wp, "Nick", &dbv)) {
if (getByte((MCONTACT)wp, "ChatRoom", 0) == GCW_CHATROOM) {
- PostIrcMessage(L"/PART %s %s", dbv.ptszVal, m_userInfo);
- Chat_Terminate(m_szModuleName, MakeWndID(dbv.ptszVal));
+ PostIrcMessage(L"/PART %s %s", dbv.pwszVal, m_userInfo);
+ Chat_Terminate(m_szModuleName, MakeWndID(dbv.pwszVal));
}
db_free(&dbv);
}
@@ -241,7 +241,7 @@ INT_PTR __cdecl CIrcProto::OnMenuChanSettings(WPARAM wp, LPARAM)
MCONTACT hContact = (MCONTACT)wp;
DBVARIANT dbv;
if (!getWString(hContact, "Nick", &dbv)) {
- PostIrcMessageWnd(dbv.ptszVal, NULL, L"/CHANNELMANAGER");
+ PostIrcMessageWnd(dbv.pwszVal, NULL, L"/CHANNELMANAGER");
db_free(&dbv);
}
return 0;
@@ -255,7 +255,7 @@ INT_PTR __cdecl CIrcProto::OnMenuWhois(WPARAM wp, LPARAM)
DBVARIANT dbv;
if (!getWString((MCONTACT)wp, "Nick", &dbv)) {
- PostIrcMessage(L"/WHOIS %s %s", dbv.ptszVal, dbv.ptszVal);
+ PostIrcMessage(L"/WHOIS %s %s", dbv.pwszVal, dbv.pwszVal);
db_free(&dbv);
}
return 0;
@@ -540,7 +540,7 @@ int __cdecl CIrcProto::GCEventHook(WPARAM, LPARAM lParam)
{
DBVARIANT dbv;
if (!getWString("Nick", &dbv)) {
- PostIrcMessage(L"/nickserv SENDPASS %s", dbv.ptszVal);
+ PostIrcMessage(L"/nickserv SENDPASS %s", dbv.pwszVal);
db_free(&dbv);
}
}
@@ -917,7 +917,7 @@ int __cdecl CIrcProto::OnDbSettingChanged(WPARAM hContact, LPARAM lParam)
DBVARIANT dbv;
if (!getWString(hContact, "Nick", &dbv)) {
if (getByte("MirVerAutoRequest", 1))
- PostIrcMessage(L"/PRIVMSG %s \001VERSION\001", dbv.ptszVal);
+ PostIrcMessage(L"/PRIVMSG %s \001VERSION\001", dbv.pwszVal);
db_free(&dbv);
}
}
diff --git a/protocols/IRCG/src/tools.cpp b/protocols/IRCG/src/tools.cpp
index 311e5bf494..740a331842 100644
--- a/protocols/IRCG/src/tools.cpp
+++ b/protocols/IRCG/src/tools.cpp
@@ -42,7 +42,7 @@ void CIrcProto::AddToJTemp(wchar_t op, CMStringW& sCommand)
DBVARIANT dbv;
if (!getWString("JTemp", &dbv)) {
- res = CMStringW(dbv.ptszVal) + L" " + res;
+ res = CMStringW(dbv.pwszVal) + L" " + res;
db_free(&dbv);
}
diff --git a/protocols/IRCG/src/userinfo.cpp b/protocols/IRCG/src/userinfo.cpp
index fc50e5ae56..1d93cab326 100644
--- a/protocols/IRCG/src/userinfo.cpp
+++ b/protocols/IRCG/src/userinfo.cpp
@@ -65,25 +65,25 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
if (!bAdvanced) {
SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateW(STR_BASIC));
if (!p->ppro->getWString(p->hContact, "Default", &dbv)) {
- SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.ptszVal);
+ SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.pwszVal);
db_free(&dbv);
}
}
else {
SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateW(STR_ADVANCED));
if (!p->ppro->getWString(p->hContact, "UWildcard", &dbv)) {
- SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.ptszVal);
+ SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.pwszVal);
db_free(&dbv);
}
}
if (!p->ppro->getWString(p->hContact, "UUser", &dbv)) {
- SetDlgItemText(m_hwnd, IDC_USER, dbv.ptszVal);
+ SetDlgItemText(m_hwnd, IDC_USER, dbv.pwszVal);
db_free(&dbv);
}
if (!p->ppro->getWString(p->hContact, "UHost", &dbv)) {
- SetDlgItemText(m_hwnd, IDC_HOST, dbv.ptszVal);
+ SetDlgItemText(m_hwnd, IDC_HOST, dbv.pwszVal);
db_free(&dbv);
}
ProtoBroadcastAck(p->ppro->m_szModuleName, p->hContact, ACKTYPE_GETINFO, ACKRESULT_SUCCESS, (HANDLE)1, 0);
@@ -115,9 +115,9 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
if (!p->ppro->getWString(p->hContact, "Default", &dbv)) {
CMStringW S = STR_ERROR;
S += L" (";
- S += dbv.ptszVal;
+ S += dbv.pwszVal;
S += L")";
- if ((mir_wstrlen(temp) < 4 && mir_wstrlen(temp)) || !WCCmp(CharLower(temp), CharLower(dbv.ptszVal))) {
+ if ((mir_wstrlen(temp) < 4 && mir_wstrlen(temp)) || !WCCmp(CharLower(temp), CharLower(dbv.pwszVal))) {
MessageBox(nullptr, TranslateW(S.c_str()), TranslateT("IRC error"), MB_OK | MB_ICONERROR);
db_free(&dbv);
return FALSE;
@@ -166,7 +166,7 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
DBVARIANT dbv;
if (!p->ppro->getWString(p->hContact, "Default", &dbv)) {
- SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.ptszVal);
+ SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.pwszVal);
db_free(&dbv);
}
EnableWindow(GetDlgItem(m_hwnd, IDC_WILDCARD), FALSE);
@@ -176,7 +176,7 @@ INT_PTR CALLBACK UserDetailsDlgProc(HWND m_hwnd, UINT msg, WPARAM wParam, LPARAM
DBVARIANT dbv;
SetDlgItemText(m_hwnd, IDC_DEFAULT, TranslateW(STR_ADVANCED));
if (!p->ppro->getWString(p->hContact, "UWildcard", &dbv)) {
- SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.ptszVal);
+ SetDlgItemText(m_hwnd, IDC_WILDCARD, dbv.pwszVal);
db_free(&dbv);
}
EnableWindow(GetDlgItem(m_hwnd, IDC_WILDCARD), true);
@@ -201,7 +201,7 @@ int __cdecl CIrcProto::OnInitUserInfo(WPARAM wParam, LPARAM lParam)
DBVARIANT dbv;
if (!getWString(hContact, "Default", &dbv)) {
- if (IsChannel(dbv.ptszVal)) {
+ if (IsChannel(dbv.pwszVal)) {
db_free(&dbv);
return 0;
}
diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp
index b921af9029..728c451996 100644
--- a/protocols/IRCG/src/windows.cpp
+++ b/protocols/IRCG/src/windows.cpp
@@ -215,8 +215,8 @@ bool CNickDlg::OnInitDialog()
DBVARIANT dbv;
if (!m_proto->getWString("RecentNicks", &dbv)) {
for (int i = 0; i < 10; i++)
- if (!GetWord(dbv.ptszVal, i).IsEmpty())
- SendDlgItemMessage(m_hwnd, IDC_ENICK, CB_ADDSTRING, 0, (LPARAM)GetWord(dbv.ptszVal, i).c_str());
+ if (!GetWord(dbv.pwszVal, i).IsEmpty())
+ SendDlgItemMessage(m_hwnd, IDC_ENICK, CB_ADDSTRING, 0, (LPARAM)GetWord(dbv.pwszVal, i).c_str());
db_free(&dbv);
}
@@ -239,7 +239,7 @@ void CNickDlg::OnOk(CCtrlButton*)
DBVARIANT dbv;
if (!m_proto->getWString("RecentNicks", &dbv)) {
for (int i = 0; i < 10; i++) {
- CMStringW s = GetWord(dbv.ptszVal, i);
+ CMStringW s = GetWord(dbv.pwszVal, i);
if (!s.IsEmpty() && s != szTemp)
S += L" " + s;
}
@@ -509,8 +509,8 @@ bool CJoinDlg::OnInitDialog()
DBVARIANT dbv;
if (!m_proto->getWString("RecentChannels", &dbv)) {
for (int i = 0; i < 20; i++) {
- if (!GetWord(dbv.ptszVal, i).IsEmpty()) {
- CMStringW S = GetWord(dbv.ptszVal, i);
+ if (!GetWord(dbv.pwszVal, i).IsEmpty()) {
+ CMStringW S = GetWord(dbv.pwszVal, i);
S.Replace(L"%newl", L" ");
SendDlgItemMessage(m_hwnd, IDC_ENICK, CB_ADDSTRING, 0, (LPARAM)S.c_str());
}
@@ -542,7 +542,7 @@ void CJoinDlg::OnOk(CCtrlButton*)
DBVARIANT dbv;
if (!m_proto->getWString("RecentChannels", &dbv)) {
for (int i = 0; i < 20; i++) {
- CMStringW W = GetWord(dbv.ptszVal, i);
+ CMStringW W = GetWord(dbv.pwszVal, i);
if (!W.IsEmpty() && W != SL)
S += L" " + W;
}
@@ -1292,7 +1292,7 @@ void CManagerDlg::InitManager(int mode, const wchar_t* window)
DBVARIANT dbv;
if (!m_proto->getWString(p, &dbv)) {
for (int i = 0; i < 5; i++) {
- CMStringW S = GetWord(dbv.ptszVal, i);
+ CMStringW S = GetWord(dbv.pwszVal, i);
if (!S.IsEmpty()) {
/* FIXME: What the hell does it mean!? GCC won't compile this on UNICODE */
#if !defined(__GNUC__) || !defined(UNICODE)
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 11:48:54 +0000