db_* functions replaced with g_plugin calls

2 files changed, 19 insertions, 19 deletions

diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp
index 17c723c7d7..36de693706 100644
--- a/plugins/AssocMgr/src/assoclist.cpp
+++ b/plugins/AssocMgr/src/assoclist.cpp
@@ -32,7 +32,7 @@ static BOOL IsAssocEnabled(const ASSOCDATA *assoc)
 {

 	char szSetting[MAXMODULELABELLENGTH];

 	mir_snprintf(szSetting, "enabled_%s", assoc->pszClassName);

-	return db_get_b(NULL, MODULENAME, szSetting, (BYTE)!(assoc->flags&FTDF_DEFAULTDISABLED)) != 0;

+	return g_plugin.getByte(szSetting, (BYTE)!(assoc->flags&FTDF_DEFAULTDISABLED)) != 0;

 }

 

 static void SetAssocEnabled(const ASSOCDATA *assoc, BOOL fEnabled)

@@ -40,13 +40,13 @@ static void SetAssocEnabled(const ASSOCDATA *assoc, BOOL fEnabled)
 	char szSetting[MAXMODULELABELLENGTH];

 	wchar_t szDLL[MAX_PATH], szBuf[MAX_PATH];

 	mir_snprintf(szSetting, "enabled_%s", assoc->pszClassName);

-	db_set_b(NULL, MODULENAME, szSetting, (BYTE)fEnabled);

+	g_plugin.setByte(szSetting, (BYTE)fEnabled);

 	// dll name for uninstall

 	if (assoc->hInstance != nullptr && assoc->hInstance != g_plugin.getInst() && assoc->hInstance != GetModuleHandle(nullptr))

 		if (GetModuleFileName(assoc->hInstance, szBuf, _countof(szBuf)))

 			if (PathToRelativeW(szBuf, szDLL)) {

 				mir_snprintf(szSetting, "module_%s", assoc->pszClassName);

-				db_set_ws(NULL, MODULENAME, szSetting, szDLL);

+				g_plugin.setWString(szSetting, szDLL);

 			}

 }

 

@@ -54,10 +54,10 @@ static void DeleteAssocEnabledSetting(const ASSOCDATA *assoc)
 {

 	char szSetting[MAXMODULELABELLENGTH];

 	mir_snprintf(szSetting, "enabled_%s", assoc->pszClassName);

-	db_unset(NULL, MODULENAME, szSetting);

+	g_plugin.delSetting(szSetting);

 	// dll name for uninstall

 	mir_snprintf(szSetting, "module_%s", assoc->pszClassName);

-	db_unset(NULL, MODULENAME, szSetting);

+	g_plugin.delSetting(szSetting);

 }

 

 void CleanupAssocEnabledSettings(void)

@@ -71,15 +71,15 @@ void CleanupAssocEnabledSettings(void)
 			char *pszSuffix = &ppszSettings[i][8];

 			char szSetting[MAXMODULELABELLENGTH];

 			mir_snprintf(szSetting, "module_%s", pszSuffix);

-			ptrW wszPath(db_get_wsa(NULL, MODULENAME, szSetting));

+			ptrW wszPath(g_plugin.getWStringA(szSetting));

 			if (wszPath != nullptr) {

 				wchar_t szDLL[MAX_PATH];

 				if (PathToAbsoluteW(wszPath, szDLL)) {

 					// file still exists?

 					HANDLE hFile = CreateFile(szDLL, 0, FILE_SHARE_READ, nullptr, OPEN_EXISTING, 0, nullptr);

 					if (hFile == INVALID_HANDLE_VALUE) {

-						db_unset(NULL, MODULENAME, ppszSettings[i]);

-						db_unset(NULL, MODULENAME, szSetting);

+						g_plugin.delSetting(ppszSettings[i]);

+						g_plugin.delSetting(szSetting);

 					}

 					else CloseHandle(hFile);

 				}

@@ -97,9 +97,9 @@ static __inline void RememberMimeTypeAdded(const char *pszMimeType, const char *
 	char szSetting[MAXMODULELABELLENGTH];

 	mir_snprintf(szSetting, "mime_%s", pszMimeType);

 	if (fAdded)

-		db_set_s(NULL, MODULENAME, szSetting, pszFileExt);

+		g_plugin.setString(szSetting, pszFileExt);

 	else

-		db_unset(NULL, MODULENAME, szSetting);

+		g_plugin.delSetting(szSetting);

 }

 

 static __inline BOOL WasMimeTypeAdded(const char *pszMimeType)

@@ -108,7 +108,7 @@ static __inline BOOL WasMimeTypeAdded(const char *pszMimeType)
 	DBVARIANT dbv;

 	BOOL fAdded = FALSE;

 	mir_snprintf(szSetting, "mime_%s", pszMimeType);

-	if (!db_get(NULL, MODULENAME, szSetting, &dbv))

+	if (!db_get(0, MODULENAME, szSetting, &dbv))

 		fAdded = TRUE;

 	else

 		db_free(&dbv);

@@ -133,11 +133,11 @@ void CleanupMimeTypeAddedSettings(void)
 			

 			if (p == nullptr) { // mime type not in current list

 				DBVARIANT dbv;

-				if (!db_get_s(NULL, MODULENAME, ppszSettings[i], &dbv)) {

+				if (!g_plugin.getString(ppszSettings[i], &dbv)) {

 					RemoveRegMimeType(pszSuffix, dbv.pszVal);

 					db_free(&dbv);

 				}

-				db_unset(NULL, MODULENAME, ppszSettings[i]);

+				g_plugin.delSetting(ppszSettings[i]);

 			}

 			mir_free(ppszSettings[i]);

 		}

@@ -656,7 +656,7 @@ static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 			ListView_SetItemState(hwndList, lvi.iItem, LVIS_SELECTED | LVIS_FOCUSED, LVIS_SELECTED | LVIS_FOCUSED);

 			ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE_USEHEADER); // size to fit window

 			// only while running

-			CheckDlgButton(hwndDlg, IDC_ONLYWHILERUNNING, (BOOL)db_get_b(NULL, MODULENAME, "OnlyWhileRunning", SETTING_ONLYWHILERUNNING_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

+			CheckDlgButton(hwndDlg, IDC_ONLYWHILERUNNING, (BOOL)g_plugin.getByte("OnlyWhileRunning", SETTING_ONLYWHILERUNNING_DEFAULT) ? BST_CHECKED : BST_UNCHECKED);

 

 			// autostart

 			wchar_t *pszRunCmd = MakeRunCommand(TRUE, TRUE);

@@ -797,7 +797,7 @@ static INT_PTR CALLBACK AssocListOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wPara
 				BOOL fEnabled, fRegFailed = FALSE;

 

 				// only while running

-				db_set_b(NULL, MODULENAME, "OnlyWhileRunning", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_ONLYWHILERUNNING) != 0));

+				g_plugin.setByte("OnlyWhileRunning", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_ONLYWHILERUNNING) != 0));

 

 				// save enabled assoc items

 				HWND hwndList = GetDlgItem(hwndDlg, IDC_ASSOCLIST);

@@ -920,7 +920,7 @@ void InitAssocList(void)
 void UninitAssocList(void)

 {

 	// Assoc List

-	BYTE fOnlyWhileRunning = db_get_b(NULL, MODULENAME, "OnlyWhileRunning", SETTING_ONLYWHILERUNNING_DEFAULT);

+	BYTE fOnlyWhileRunning = g_plugin.getByte("OnlyWhileRunning", SETTING_ONLYWHILERUNNING_DEFAULT);

 	for (auto &it : arAssocList)

 		if (fOnlyWhileRunning)

 			UnregisterAssoc(it); // remove registry keys

diff --git a/plugins/AssocMgr/src/reg.cpp b/plugins/AssocMgr/src/reg.cpp
index b6ecad1a0b..6c4a30e847 100644
--- a/plugins/AssocMgr/src/reg.cpp
+++ b/plugins/AssocMgr/src/reg.cpp
@@ -334,7 +334,7 @@ static void WriteDbBackupData(const char *pszSetting, DWORD dwType, BYTE *pData,
 	if (buf) {

 		*(DWORD*)buf = dwType;

 		memcpy(buf + sizeof(DWORD), pData, cbData);

-		db_set_blob(NULL, MODULENAME, pszSetting, buf, (unsigned)cbLen);

+		db_set_blob(0, MODULENAME, pszSetting, buf, (unsigned)cbLen);

 		mir_free(buf);

 	}

 }

@@ -483,7 +483,7 @@ static LONG RestoreRegTree(HKEY hKey, const char *pszSubKey, const char *pszDbPr
 					if (res)

 						break;

 					

-					db_unset(NULL, MODULENAME, ppszSettings[i]);

+					g_plugin.delSetting(ppszSettings[i]);

 					if (hSubKey != hKey)

 						RegCloseKey(hSubKey);

 				}

@@ -507,7 +507,7 @@ static void DeleteRegTreeBackup(const char *pszSubKey, const char *pszDbPrefix)
 	if (pszPrefixWithSubKey != nullptr) {

 		if (EnumDbPrefixSettings(MODULENAME, pszPrefixWithSubKey, &ppszSettings, &nSettingsCount)) {

 			for (i = 0; i < nSettingsCount; ++i) {

-				db_unset(NULL, MODULENAME, ppszSettings[i]);

+				g_plugin.delSetting(ppszSettings[i]);

 				mir_free(ppszSettings[i]);

 			}

 			mir_free(ppszSettings);