From d296f9f99daf102b9af5d56690e2bd00d61c1267 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 24 Jul 2018 11:11:26 +0300 Subject: database: - senseless fiels ptszVal removed from DBVARIANT, pwszVal is used instead; - if you want db_get to return a string, you need to use db_get_s. --- src/mir_app/src/chat_opts.cpp | 2 +- src/mir_app/src/clcitems.cpp | 8 ++++---- src/mir_app/src/clistsettings.cpp | 2 +- src/mir_app/src/clui.cpp | 2 +- src/mir_app/src/contacts.cpp | 6 +++--- src/mir_app/src/meta_edit.cpp | 2 +- src/mir_app/src/meta_services.cpp | 11 ++++------- src/mir_app/src/movetogroup.cpp | 6 +++--- src/mir_app/src/sounds.cpp | 6 +++--- 9 files changed, 21 insertions(+), 24 deletions(-) (limited to 'src/mir_app') diff --git a/src/mir_app/src/chat_opts.cpp b/src/mir_app/src/chat_opts.cpp index 1a6a242a01..6850899677 100644 --- a/src/mir_app/src/chat_opts.cpp +++ b/src/mir_app/src/chat_opts.cpp @@ -195,7 +195,7 @@ static void InitSetting(wchar_t** ppPointer, char* pszSetting, wchar_t* pszDefau { DBVARIANT dbv; if (!db_get_ws(0, CHAT_MODULE, pszSetting, &dbv)) { - replaceStrW(*ppPointer, dbv.ptszVal); + replaceStrW(*ppPointer, dbv.pwszVal); db_free(&dbv); } else replaceStrW(*ppPointer, pszDefault); diff --git a/src/mir_app/src/clcitems.cpp b/src/mir_app/src/clcitems.cpp index 8c35188d75..851dfaf549 100644 --- a/src/mir_app/src/clcitems.cpp +++ b/src/mir_app/src/clcitems.cpp @@ -322,15 +322,15 @@ MIR_APP_DLL(void) Clist_DeleteItemFromTree(HWND hwnd, MCONTACT hItem) ClcContact *cc = group->cl[i]; if (cc->type == CLCIT_GROUP) { size_t len = mir_wstrlen(cc->szText); - if (!wcsncmp(cc->szText, dbv.ptszVal + nameOffset, len) && - (dbv.ptszVal[nameOffset + len] == '\\' || dbv.ptszVal[nameOffset + len] == '\0')) { + if (!wcsncmp(cc->szText, dbv.pwszVal + nameOffset, len) && + (dbv.pwszVal[nameOffset + len] == '\\' || dbv.pwszVal[nameOffset + len] == '\0')) { group->totalMembers--; - if (dbv.ptszVal[nameOffset + len] == '\0') + if (dbv.pwszVal[nameOffset + len] == '\0') break; } } } - mir_free(dbv.ptszVal); + mir_free(dbv.pwszVal); } else Clist_RemoveItemFromGroup(hwnd, group, contact, 1); } diff --git a/src/mir_app/src/clistsettings.cpp b/src/mir_app/src/clistsettings.cpp index cc8020975c..37fb40cd66 100644 --- a/src/mir_app/src/clistsettings.cpp +++ b/src/mir_app/src/clistsettings.cpp @@ -186,7 +186,7 @@ static void Dbwcs2tstr(DBCONTACTWRITESETTING *cws, wchar_t* &pStr) break; case DBVT_WCHAR: - pStr = mir_wstrdup(cws->value.ptszVal); + pStr = mir_wstrdup(cws->value.pwszVal); break; } } diff --git a/src/mir_app/src/clui.cpp b/src/mir_app/src/clui.cpp index 4079bdc675..740cd7004b 100644 --- a/src/mir_app/src/clui.cpp +++ b/src/mir_app/src/clui.cpp @@ -300,7 +300,7 @@ int LoadCLUIModule(void) if (db_get_ws(0, "CList", "TitleText", &dbv)) mir_wstrncpy(titleText, _T(MIRANDANAME), _countof(titleText)); else { - mir_wstrncpy(titleText, dbv.ptszVal, _countof(titleText)); + mir_wstrncpy(titleText, dbv.pwszVal, _countof(titleText)); db_free(&dbv); } diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index 0c13ddb594..1ce2f46b4b 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -63,7 +63,7 @@ static wchar_t* ProcessDatabaseValueDefault(MCONTACT hContact, const char *szPro if (!dbv.pszVal[0]) break; case DBVT_WCHAR: if (!dbv.pwszVal[0]) break; - return dbv.ptszVal; + return dbv.pwszVal; } db_free(&dbv); } @@ -143,7 +143,7 @@ MIR_APP_DLL(wchar_t*) Contact_GetInfo(int type, MCONTACT hContact, const char *s case CNF_COUNTRY: case CNF_COCOUNTRY: if (!GetDatabaseString(hContact, szProto, type == CNF_COUNTRY ? "CountryName" : "CompanyCountryName", &dbv)) - return dbv.ptszVal; + return dbv.pwszVal; if (!db_get(hContact, szProto, type == CNF_COUNTRY ? "Country" : "CompanyCountry", &dbv)) { if (dbv.type == DBVT_WORD) { @@ -237,7 +237,7 @@ MIR_APP_DLL(wchar_t*) Contact_GetInfo(int type, MCONTACT hContact, const char *s _ltow(value, buf, 10); return mir_wstrdup(buf); } - return dbv.ptszVal; + return dbv.pwszVal; } } break; diff --git a/src/mir_app/src/meta_edit.cpp b/src/mir_app/src/meta_edit.cpp index 2b740d8b79..9d6b9f4799 100644 --- a/src/mir_app/src/meta_edit.cpp +++ b/src/mir_app/src/meta_edit.cpp @@ -74,7 +74,7 @@ static void FillContactList(HWND hList) wcsncpy_s(buff, _A2T(dbv.pszVal), _TRUNCATE); break; case DBVT_WCHAR: - wcsncpy_s(buff, dbv.ptszVal, _TRUNCATE); + wcsncpy_s(buff, dbv.pwszVal, _TRUNCATE); break; case DBVT_BYTE: _itow(dbv.bVal, buff, 10); diff --git a/src/mir_app/src/meta_services.cpp b/src/mir_app/src/meta_services.cpp index 4a67acce15..d5da2e557c 100644 --- a/src/mir_app/src/meta_services.cpp +++ b/src/mir_app/src/meta_services.cpp @@ -285,17 +285,14 @@ int Meta_HandleACK(WPARAM, LPARAM lParam) // change the hContact in the avatar info struct, if it's the avatar we're using - else drop it if (ack->type == ACKTYPE_AVATAR) { if (ack->result == ACKRESULT_SUCCESS || ack->result == ACKRESULT_FAILED || ack->result == ACKRESULT_STATUS) { - DBVARIANT dbv; - // change avatar if the most online supporting avatars changes, or if we don't have one MCONTACT hMostOnline = Meta_GetMostOnlineSupporting(cc, PFLAGNUM_4, PF4_AVATARS); if (ack->hContact == 0 || ack->hContact != hMostOnline) return 0; - if (!db_get(ack->hContact, "ContactPhoto", "File", &dbv)) { - db_set_ws(cc->contactID, "ContactPhoto", "File", dbv.ptszVal); - db_free(&dbv); - } + ptrW wszFile(db_get_wsa(ack->hContact, "ContactPhoto", "File")); + if (wszFile) + db_set_ws(cc->contactID, "ContactPhoto", "File", wszFile); if (ack->hProcess) { PROTO_AVATAR_INFORMATION ai; @@ -403,7 +400,7 @@ int Meta_SettingChanged(WPARAM hContact, LPARAM lParam) DBVARIANT dbv; if (proto && !db_get_ws(hContact, proto, "Nick", &dbv)) { - db_set_ws(ccMeta->contactID, META_PROTO, buffer, dbv.ptszVal); + db_set_ws(ccMeta->contactID, META_PROTO, buffer, dbv.pwszVal); db_free(&dbv); } else db_unset(ccMeta->contactID, META_PROTO, buffer); diff --git a/src/mir_app/src/movetogroup.cpp b/src/mir_app/src/movetogroup.cpp index 7e23871cfd..b0b6da5ef1 100644 --- a/src/mir_app/src/movetogroup.cpp +++ b/src/mir_app/src/movetogroup.cpp @@ -108,10 +108,10 @@ static int OnContactMenuBuild(WPARAM wParam, LPARAM) if (db_get_ws(0, "CListGroups", intname, &dbv)) break; - if (dbv.ptszVal[0]) - groups.insert(new GroupItemSort(dbv.ptszVal + 1, i + 1)); + if (dbv.pwszVal[0]) + groups.insert(new GroupItemSort(dbv.pwszVal + 1, i + 1)); - mir_free(dbv.ptszVal); + mir_free(dbv.pwszVal); } for (auto &p : groups) { diff --git a/src/mir_app/src/sounds.cpp b/src/mir_app/src/sounds.cpp index 607f8f1eb7..502a945cb5 100644 --- a/src/mir_app/src/sounds.cpp +++ b/src/mir_app/src/sounds.cpp @@ -259,7 +259,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM DBVARIANT dbv; if (!db_get_ws(0, "SkinSounds", p->name, &dbv)) { wchar_t szPathFull[MAX_PATH]; - PathToAbsoluteW(dbv.ptszVal, szPathFull); + PathToAbsoluteW(dbv.pwszVal, szPathFull); NotifyEventHooks(hPlayEvent, 1, (LPARAM)szPathFull); db_free(&dbv); } @@ -289,7 +289,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM if (db_get_b(0, "SkinSoundsOff", p->name, 0) == 0) { DBVARIANT dbv; if (db_get_ws(0, "SkinSounds", p->name, &dbv) == 0) { - PathToAbsoluteW(dbv.ptszVal, strdir); + PathToAbsoluteW(dbv.pwszVal, strdir); db_free(&dbv); } } @@ -393,7 +393,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM else { DBVARIANT dbv; if (!db_get_ws(0, "SkinSounds", p->name, &dbv)) { - SetDlgItemText(hwndDlg, IDC_LOCATION, dbv.ptszVal); + SetDlgItemText(hwndDlg, IDC_LOCATION, dbv.pwszVal); db_free(&dbv); } else SetDlgItemText(hwndDlg, IDC_LOCATION, TranslateT("")); -- cgit v1.2.3