summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/AVS/src/options.cpp2
-rw-r--r--plugins/CSList/src/cslist.cpp4
-rw-r--r--plugins/Clist_blind/src/cluiopts.cpp2
-rw-r--r--plugins/Clist_nicer/src/clcopts.cpp2
-rw-r--r--plugins/Clist_nicer/src/extBackg.cpp8
-rw-r--r--plugins/Clist_nicer/src/viewmodes.cpp2
-rw-r--r--plugins/ConnectionNotify/src/ConnectionNotify.cpp6
-rw-r--r--plugins/MirandaG15/src/CConfig.cpp2
-rw-r--r--plugins/MyDetails/src/data.cpp2
-rw-r--r--plugins/SMS/src/functions.cpp2
-rw-r--r--plugins/SmileyAdd/src/options.cpp2
-rw-r--r--plugins/SmileyAdd/src/services.cpp2
-rw-r--r--plugins/SmileyAdd/src/smileys.cpp2
-rw-r--r--plugins/WinterSpeak/src/ConfigDatabase.cpp2
14 files changed, 20 insertions, 20 deletions
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp
index 057098a607..bef7b80373 100644
--- a/plugins/AVS/src/options.cpp
+++ b/plugins/AVS/src/options.cpp
@@ -385,7 +385,7 @@ static INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wPar
g_selectedProto = GetProtoFromList(hwndDlg, iItem);
if (g_selectedProto) {
DBVARIANT dbv;
- if (!db_get_ws(NULL, PPICT_MODULE, g_selectedProto->szProtoname, &dbv)) {
+ if (!db_get_ws(0, PPICT_MODULE, g_selectedProto->szProtoname, &dbv)) {
if (!PathIsAbsoluteW(VARSW(dbv.pwszVal))) {
wchar_t szFinalPath[MAX_PATH];
mir_snwprintf(szFinalPath, L"%%miranda_path%%\\%s", dbv.pwszVal);
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp
index 3782dbb197..127ed4ad26 100644
--- a/plugins/CSList/src/cslist.cpp
+++ b/plugins/CSList/src/cslist.cpp
@@ -234,14 +234,14 @@ void importCustomStatuses(CSWindow* csw, int result)
si->m_iIcon = i - 1;
mir_snprintf(bufTitle, "XStatus%dName", i);
- if (!db_get_ws(NULL, protoName, bufTitle, &dbv)) {
+ if (!db_get_ws(0, protoName, bufTitle, &dbv)) {
mir_wstrcpy(si->m_tszTitle, dbv.pwszVal);
db_free(&dbv);
}
else si->m_tszTitle[0] = 0;
mir_snprintf(bufMessage, "XStatus%dMsg", i);
- if (!db_get_ws(NULL, protoName, bufMessage, &dbv)) {
+ if (!db_get_ws(0, protoName, bufMessage, &dbv)) {
mir_wstrcpy(si->m_tszMessage, dbv.pwszVal);
db_free(&dbv);
}
diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp
index 8ef8108178..a20d289f9b 100644
--- a/plugins/Clist_blind/src/cluiopts.cpp
+++ b/plugins/Clist_blind/src/cluiopts.cpp
@@ -72,7 +72,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
{
DBVARIANT dbv;
- if (!db_get_ws(NULL, "CList", "TitleText", &dbv)) {
+ if (!db_get_ws(0, "CList", "TitleText", &dbv)) {
SetDlgItemText(hwndDlg, IDC_TITLETEXT, dbv.pwszVal);
db_free(&dbv);
}
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp
index a1c4e96ff8..624a01b2cc 100644
--- a/plugins/Clist_nicer/src/clcopts.cpp
+++ b/plugins/Clist_nicer/src/clcopts.cpp
@@ -707,7 +707,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
CheckDlgButton(hwndDlg, IDC_SKINMODE, cfg::dat.bWallpaperMode ? BST_CHECKED : BST_UNCHECKED);
{
DBVARIANT dbv;
- if (!db_get_ws(NULL, "CLC", "BkBitmap", &dbv)) {
+ if (!db_get_ws(0, "CLC", "BkBitmap", &dbv)) {
wchar_t szPath[MAX_PATH];
if (PathToAbsoluteW(dbv.pwszVal, szPath))
SetDlgItemText(hwndDlg, IDC_FILENAME, szPath);
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index 6cffd44a57..f4bf1be8b3 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -1184,7 +1184,7 @@ static void BTN_ReadItem(char *itemName, char *file)
void IMG_LoadItems()
{
DBVARIANT dbv;
- if (db_get_ws(NULL, "CLC", "AdvancedSkin", &dbv))
+ if (db_get_ws(0, "CLC", "AdvancedSkin", &dbv))
return;
wchar_t tszFileName[MAX_PATH];
@@ -1460,7 +1460,7 @@ static void ApplyCLUISkin()
DBVARIANT dbv = { 0 };
wchar_t tszFinalName[MAX_PATH];
char szFinalName[MAX_PATH];
- if (!db_get_ws(NULL, "CLC", "AdvancedSkin", &dbv)) {
+ if (!db_get_ws(0, "CLC", "AdvancedSkin", &dbv)) {
MY_pathToAbsolute(dbv.pwszVal, tszFinalName);
WideCharToMultiByte(CP_ACP, 0, tszFinalName, MAX_PATH, szFinalName, MAX_PATH, nullptr, nullptr);
@@ -1513,7 +1513,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
else
Utils::enableDlgControl(hwndDlg, IDC_RELOAD, FALSE);
CheckDlgButton(hwndDlg, IDC_USESKIN, db_get_b(0, "CLUI", "useskin", 0) ? BST_CHECKED : BST_UNCHECKED);
- if (!db_get_ws(NULL, "CLC", "AdvancedSkin", &dbv)) {
+ if (!db_get_ws(0, "CLC", "AdvancedSkin", &dbv)) {
SetDlgItemText(hwndDlg, IDC_SKINFILENAME, dbv.pwszVal);
db_free(&dbv);
}
@@ -1564,7 +1564,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
int skinChanged = 0;
DBVARIANT dbv = { 0 };
- if (!db_get_ws(NULL, "CLC", "AdvancedSkin", &dbv)) {
+ if (!db_get_ws(0, "CLC", "AdvancedSkin", &dbv)) {
if (mir_wstrcmp(dbv.pwszVal, final_path))
skinChanged = TRUE;
db_free(&dbv);
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 82d6323b93..7b8565deae 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -434,7 +434,7 @@ void UpdateFilters()
goto cleanup;
mir_snprintf(szSetting, "%c%s_GF", 246, szBuf);
- if (db_get_ws(NULL, CLVM_MODULE, szSetting, &dbv_gf))
+ if (db_get_ws(0, CLVM_MODULE, szSetting, &dbv_gf))
goto cleanup;
mir_snprintf(szSetting, "%c%s_OPT", 246, szBuf);
diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
index 031a7b8c11..156115a229 100644
--- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp
+++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
@@ -120,15 +120,15 @@ struct CONNECTION* LoadSettingsConnections()
for (i = settingFiltersCount - 1; i >= 0; i--) {
struct CONNECTION *conn = (struct CONNECTION*)mir_alloc(sizeof(struct CONNECTION));
mir_snprintf(buff, "%dFilterIntIp", i);
- if (!db_get_ws(NULL, PLUGINNAME, buff, &dbv))
+ if (!db_get_ws(0, PLUGINNAME, buff, &dbv))
wcsncpy(conn->strIntIp, dbv.pwszVal, _countof(conn->strIntIp));
db_free(&dbv);
mir_snprintf(buff, "%dFilterExtIp", i);
- if (!db_get_ws(NULL, PLUGINNAME, buff, &dbv))
+ if (!db_get_ws(0, PLUGINNAME, buff, &dbv))
wcsncpy(conn->strExtIp, dbv.pwszVal, _countof(conn->strExtIp));
db_free(&dbv);
mir_snprintf(buff, "%dFilterPName", i);
- if (!db_get_ws(NULL, PLUGINNAME, buff, &dbv))
+ if (!db_get_ws(0, PLUGINNAME, buff, &dbv))
wcsncpy(conn->PName, dbv.pwszVal, _countof(conn->PName));
db_free(&dbv);
diff --git a/plugins/MirandaG15/src/CConfig.cpp b/plugins/MirandaG15/src/CConfig.cpp
index 9416e4ef57..8f2c452d84 100644
--- a/plugins/MirandaG15/src/CConfig.cpp
+++ b/plugins/MirandaG15/src/CConfig.cpp
@@ -330,7 +330,7 @@ void CConfig::LoadFontSettings(int iFont)
// Name
mir_snprintf(szSetting, "Font%dName", iFont);
DBVARIANT dbv;
- if (db_get_ws(NULL, "MirandaG15", szSetting, &dbv))
+ if (db_get_ws(0, "MirandaG15", szSetting, &dbv))
mir_wstrcpy(m_logfont[iFont].lfFaceName, L"Small Fonts");
else {
mir_wstrcpy(m_logfont[iFont].lfFaceName, dbv.pwszVal);
diff --git a/plugins/MyDetails/src/data.cpp b/plugins/MyDetails/src/data.cpp
index 6038f89487..7b8852c657 100644
--- a/plugins/MyDetails/src/data.cpp
+++ b/plugins/MyDetails/src/data.cpp
@@ -325,7 +325,7 @@ wchar_t *Protocol::GetListeningTo()
}
DBVARIANT dbv = { 0 };
- if (db_get_ws(NULL, name, "ListeningTo", &dbv)) {
+ if (db_get_ws(0, name, "ListeningTo", &dbv)) {
lcopystr(listening_to, L"", _countof(listening_to));
return listening_to;
}
diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp
index d1cd4d92b8..a89dd2a1ce 100644
--- a/plugins/SMS/src/functions.cpp
+++ b/plugins/SMS/src/functions.cpp
@@ -444,7 +444,7 @@ void LoadMsgDlgFont(int i, LOGFONT *lf, COLORREF *colour)
}
if (lf) {
- if (db_get_ws(NULL, SRMMMOD, str, &dbv)) {
+ if (db_get_ws(0, SRMMMOD, str, &dbv)) {
mir_wstrncpy(lf->lfFaceName, fontOptionsList[0].szDefFace, _countof(lf->lfFaceName));
}
else {
diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp
index 0ba2f7e92b..799c9284e8 100644
--- a/plugins/SmileyAdd/src/options.cpp
+++ b/plugins/SmileyAdd/src/options.cpp
@@ -277,7 +277,7 @@ void OptionsDialogType::UpdateVisibleSmPackList(void)
CMStringW PhysProtoName = L"AllProto";
CMStringW ProtoName = it->GetName();
DBVARIANT dbv;
- if (db_get_ws(NULL, _T2A(ProtoName.GetBuffer()), "AM_BaseProto", &dbv) == 0) {
+ if (db_get_ws(0, _T2A(ProtoName.GetBuffer()), "AM_BaseProto", &dbv) == 0) {
ProtoName = dbv.pwszVal;
db_free(&dbv);
}
diff --git a/plugins/SmileyAdd/src/services.cpp b/plugins/SmileyAdd/src/services.cpp
index 6e9a38f698..5d2ec28a5b 100644
--- a/plugins/SmileyAdd/src/services.cpp
+++ b/plugins/SmileyAdd/src/services.cpp
@@ -50,7 +50,7 @@ SmileyPackType* GetSmileyPack(const char *proto, MCONTACT hContact, SmileyPackCT
categoryName = dbv.pwszVal;
db_free(&dbv);
}
- else if (opt.UsePhysProto && db_get_ws(NULL, protonam, "AM_BaseProto", &dbv) == 0) {
+ else if (opt.UsePhysProto && db_get_ws(0, protonam, "AM_BaseProto", &dbv) == 0) {
categoryName = L"AllProto";
categoryName += dbv.pwszVal;
db_free(&dbv);
diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp
index 1034a37b51..ea5f10da76 100644
--- a/plugins/SmileyAdd/src/smileys.cpp
+++ b/plugins/SmileyAdd/src/smileys.cpp
@@ -792,7 +792,7 @@ void SmileyCategoryListType::AddAccountAsCategory(PROTOACCOUNT *acc, const CMStr
CMStringW PhysProtoName, paths;
DBVARIANT dbv;
- if (db_get_ws(NULL, acc->szModuleName, "AM_BaseProto", &dbv) == 0) {
+ if (db_get_ws(0, acc->szModuleName, "AM_BaseProto", &dbv) == 0) {
PhysProtoName = L"AllProto";
PhysProtoName += dbv.pwszVal;
db_free(&dbv);
diff --git a/plugins/WinterSpeak/src/ConfigDatabase.cpp b/plugins/WinterSpeak/src/ConfigDatabase.cpp
index 06f595b43c..3b626691a4 100644
--- a/plugins/WinterSpeak/src/ConfigDatabase.cpp
+++ b/plugins/WinterSpeak/src/ConfigDatabase.cpp
@@ -130,7 +130,7 @@ std::wstring ConfigDatabase::DBGetContactSettingString(const char *szModule, con
std::wstring ret = def;
DBVARIANT dbv;
- if (!db_get_ws(NULL, szModule, szSetting, &dbv))
+ if (!db_get_ws(0, szModule, szSetting, &dbv))
{
ret = dbv.pwszVal;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 05:43:22 +0000