From 53fe3e46177d17b4941610de19f5cc6210700cb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 12 Nov 2018 21:44:56 +0300 Subject: db_* functions replaced with g_plugin calls --- plugins/AVS/src/acc.cpp | 2 +- plugins/AVS/src/cache.cpp | 4 +- plugins/AVS/src/image_utils.cpp | 8 +- plugins/AVS/src/main.cpp | 2 +- plugins/AVS/src/options.cpp | 65 ++--- plugins/AVS/src/poll.cpp | 4 +- plugins/AVS/src/services.cpp | 26 +- plugins/AVS/src/stdafx.h | 3 + plugins/AVS/src/utils.cpp | 16 +- plugins/AddContactPlus/src/addcontact.cpp | 4 +- plugins/Alarms/src/alarmlist.cpp | 90 +++--- plugins/Alarms/src/frame.cpp | 6 +- plugins/Alarms/src/options.cpp | 48 +-- plugins/AsSingleWindow/src/Options.cpp | 8 +- plugins/AssocMgr/src/assoclist.cpp | 32 +- plugins/AssocMgr/src/reg.cpp | 6 +- plugins/AutoShutdown/src/frame.cpp | 8 +- plugins/AutoShutdown/src/options.cpp | 20 +- plugins/AutoShutdown/src/settingsdlg.cpp | 28 +- plugins/AutoShutdown/src/shutdownsvc.cpp | 6 +- plugins/AutoShutdown/src/watcher.cpp | 18 +- plugins/AvatarHistory/src/AvatarDlg.cpp | 4 +- plugins/AvatarHistory/src/AvatarHistory.cpp | 22 +- plugins/AvatarHistory/src/options.cpp | 6 +- plugins/AvatarHistory/src/popup.cpp | 2 +- plugins/AvatarHistory/src/utils.cpp | 2 +- plugins/BASS_interface/src/Main.cpp | 48 +-- plugins/BasicHistory/src/Options.cpp | 324 ++++++++++----------- plugins/Boltun/src/actionQueue.cpp | 2 +- plugins/Boltun/src/config.cpp | 10 +- plugins/BossKeyPlus/src/BossKey.cpp | 32 +- plugins/BossKeyPlus/src/BossKeyIdle.cpp | 2 +- plugins/BossKeyPlus/src/Options.cpp | 18 +- plugins/BuddyExpectator/src/options.cpp | 84 +++--- plugins/BuddyPounce/src/dialog.cpp | 22 +- plugins/BuddyPounce/src/main.cpp | 12 +- plugins/CSList/src/stdafx.h | 14 +- plugins/ChangeKeyboardLayout/src/hook_events.cpp | 78 ++--- plugins/ChangeKeyboardLayout/src/options.cpp | 4 +- .../ClientChangeNotify/src/ClientChangeNotify.cpp | 13 +- plugins/ClientChangeNotify/src/OptDlg.cpp | 2 +- plugins/ClientChangeNotify/src/Options.cpp | 28 +- plugins/Clist_blind/src/clcopts.cpp | 46 +-- plugins/Clist_blind/src/clistopts.cpp | 60 ++-- plugins/Clist_blind/src/cluiopts.cpp | 106 +++---- plugins/Clist_blind/src/init.cpp | 4 +- plugins/Clist_nicer/src/CLCButton.cpp | 6 +- plugins/Clist_nicer/src/Docking.cpp | 6 +- plugins/Clist_nicer/src/clc.cpp | 6 +- plugins/Clist_nicer/src/clcitems.cpp | 2 +- plugins/Clist_nicer/src/clcopts.cpp | 112 +++---- plugins/Clist_nicer/src/clcpaint.cpp | 8 +- plugins/Clist_nicer/src/clcutils.cpp | 12 +- plugins/Clist_nicer/src/clistmod.cpp | 10 +- plugins/Clist_nicer/src/clistopts.cpp | 62 ++-- plugins/Clist_nicer/src/clui.cpp | 126 ++++---- plugins/Clist_nicer/src/cluiframes.cpp | 58 ++-- plugins/Clist_nicer/src/cluiopts.cpp | 116 ++++---- plugins/Clist_nicer/src/cluiservices.cpp | 6 +- plugins/Clist_nicer/src/config.cpp | 2 +- plugins/Clist_nicer/src/contact.cpp | 4 +- plugins/Clist_nicer/src/extBackg.cpp | 164 +++++------ plugins/Clist_nicer/src/init.cpp | 58 ++-- plugins/Clist_nicer/src/statusbar.cpp | 4 +- plugins/Clist_nicer/src/viewmodes.cpp | 46 +-- plugins/Cln_skinedit/src/main.cpp | 8 +- plugins/CloudFile/src/Services/dropbox_service.cpp | 6 +- plugins/CloudFile/src/Services/google_service.cpp | 6 +- .../CloudFile/src/Services/microsoft_service.cpp | 6 +- plugins/CloudFile/src/Services/yandex_service.cpp | 2 +- plugins/CloudFile/src/menus.cpp | 2 +- plugins/CloudFile/src/options.cpp | 14 +- plugins/CloudFile/src/services.cpp | 4 +- plugins/CloudFile/src/srmm.cpp | 2 +- plugins/CloudFile/src/utils.cpp | 8 +- plugins/CmdLine/src/mimcmd_handlers.cpp | 40 +-- plugins/CmdLine/src/utils.cpp | 4 +- plugins/ConnectionNotify/src/ConnectionNotify.cpp | 48 +-- plugins/Console/src/Console.cpp | 28 +- plugins/ContactsPlus/src/send.cpp | 4 +- plugins/CountryFlags/src/main.cpp | 8 +- plugins/CountryFlags/src/options.cpp | 8 +- plugins/CrashDumper/src/crshdmp.cpp | 10 +- plugins/CrashDumper/src/dumper.cpp | 2 +- plugins/CrashDumper/src/ui.cpp | 24 +- plugins/CrashDumper/src/upload.cpp | 10 +- plugins/CrashDumper/src/utils.cpp | 2 +- plugins/CurrencyRates/src/CommonOptionDlg.cpp | 14 +- plugins/CurrencyRates/src/CurrencyConverter.cpp | 4 +- .../src/CurrencyRatesProviderBase.cpp | 4 +- .../CurrencyRates/src/CurrencyRatesProviders.cpp | 4 +- plugins/CurrencyRates/src/Forex.cpp | 4 +- plugins/CurrencyRates/src/Log.cpp | 2 +- plugins/CurrencyRates/src/SettingsDlg.cpp | 48 +-- plugins/DbEditorPP/src/deletemodule.cpp | 2 +- plugins/DbEditorPP/src/main.cpp | 8 +- plugins/DbEditorPP/src/main_window.cpp | 48 +-- plugins/DbEditorPP/src/moduletree.cpp | 10 +- plugins/DbEditorPP/src/options.cpp | 22 +- plugins/DbEditorPP/src/renamemodule.cpp | 2 +- plugins/DbEditorPP/src/settinglist.cpp | 2 +- plugins/DbEditorPP/src/watchedvars.cpp | 6 +- plugins/Exchange/src/dlg_handlers.cpp | 38 +-- plugins/Exchange/src/emails.cpp | 10 +- plugins/Exchange/src/hooked_events.cpp | 8 +- plugins/Exchange/src/utils.cpp | 2 +- plugins/FTPFileYM/src/dbentry.cpp | 4 +- plugins/FTPFileYM/src/ftpfile.cpp | 2 +- plugins/FTPFileYM/src/options.cpp | 44 +-- plugins/FTPFileYM/src/serverlist.cpp | 18 +- plugins/FTPFileYM/src/utils.cpp | 2 +- plugins/FavContacts/src/menu.cpp | 2 +- plugins/FavContacts/src/options.cpp | 52 ++-- plugins/FileAsMessage/src/dialog.cpp | 22 +- plugins/FileAsMessage/src/optionsdlg.cpp | 10 +- plugins/FingerprintNG/src/finger_groups.h | 44 +-- plugins/FingerprintNG/src/fingerprint.cpp | 8 +- plugins/FingerprintNG/src/options.cpp | 4 +- plugins/FloatingContacts/src/main.cpp | 58 ++-- plugins/FloatingContacts/src/options.cpp | 78 ++--- plugins/Folders/src/folderItem.cpp | 2 +- plugins/GmailNotifier/src/main.cpp | 32 +- plugins/GmailNotifier/src/options.cpp | 26 +- plugins/GmailNotifier/src/utility.cpp | 2 +- plugins/HTTPServer/src/GuiElements.cpp | 96 +++--- plugins/HTTPServer/src/main.cpp | 20 +- plugins/HistoryLinkListPlus/src/linklist_dlg.cpp | 18 +- plugins/HistoryLinkListPlus/src/linklist_fct.cpp | 124 ++++---- .../src/historysweeperlight.cpp | 16 +- plugins/HistorySweeperLight/src/main.cpp | 12 +- plugins/HistorySweeperLight/src/options.cpp | 38 +-- plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp | 6 +- plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp | 6 +- plugins/IEHistory/src/dlgHandlers.cpp | 24 +- plugins/IEHistory/src/services.cpp | 4 +- plugins/IEView/src/ChatHTMLBuilder.cpp | 14 +- plugins/IEView/src/HistoryHTMLBuilder.cpp | 18 +- plugins/IEView/src/MUCCHTMLBuilder.cpp | 12 +- plugins/IEView/src/ScriverHTMLBuilder.cpp | 42 +-- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 36 +-- plugins/IgnoreState/src/main.cpp | 4 +- plugins/IgnoreState/src/options.cpp | 4 +- plugins/Import/src/import.cpp | 6 +- plugins/Import/src/main.cpp | 4 +- plugins/Import/src/miranda.cpp | 4 +- plugins/Import/src/wizard.cpp | 2 +- plugins/KeyboardNotify/src/flash.cpp | 6 +- plugins/KeyboardNotify/src/ignore.cpp | 4 +- plugins/KeyboardNotify/src/main.cpp | 80 ++--- plugins/KeyboardNotify/src/options.cpp | 110 +++---- plugins/ListeningTo/src/listeningto.cpp | 6 +- plugins/LotusNotify/src/LotusNotify.cpp | 98 +++---- plugins/MagneticWindows/src/Options.cpp | 12 +- plugins/MenuItemEx/src/main.cpp | 8 +- plugins/MenuItemEx/src/options.cpp | 4 +- plugins/MirFox/src/MirandaOptions.cpp | 20 +- plugins/MirFox/src/MirandaUtils.cpp | 8 +- plugins/MirFox/src/MirfoxData.cpp | 49 ++-- plugins/MirLua/src/script.cpp | 6 +- plugins/MirLua/src/utils.cpp | 6 +- plugins/MirOTR/src/dllmain.cpp | 8 +- plugins/MirOTR/src/options.cpp | 40 +-- plugins/MirandaG15/src/CAppletManager.cpp | 4 +- plugins/MirandaG15/src/CConfig.cpp | 308 ++++++++++---------- plugins/MirandaG15/src/CContactList.cpp | 6 +- plugins/MsgPopup/src/main.cpp | 8 +- plugins/MsgPopup/src/options.cpp | 8 +- plugins/Msg_Export/src/FileViewer.cpp | 42 +-- plugins/Msg_Export/src/main.cpp | 8 +- plugins/Msg_Export/src/options.cpp | 10 +- plugins/Msg_Export/src/utils.cpp | 2 +- plugins/MyDetails/src/data.cpp | 10 +- plugins/MyDetails/src/frame.cpp | 22 +- plugins/MyDetails/src/options.cpp | 4 +- plugins/MyDetails/src/services.cpp | 2 +- plugins/NewAwaySysMod/src/AwaySys.cpp | 18 +- plugins/NewAwaySysMod/src/Client.cpp | 6 +- plugins/NewAwaySysMod/src/Options.cpp | 28 +- plugins/NewAwaySysMod/src/Properties.cpp | 12 +- plugins/NewAwaySysMod/src/Properties.h | 8 +- plugins/NewAwaySysMod/src/SetAwayMsg.cpp | 24 +- plugins/NewXstatusNotify/src/main.cpp | 58 ++-- plugins/NewXstatusNotify/src/options.cpp | 12 +- plugins/New_GPG/src/gpg_wrapper.cpp | 8 +- plugins/New_GPG/src/init.cpp | 56 ++-- plugins/New_GPG/src/log.cpp | 2 +- plugins/New_GPG/src/main.cpp | 26 +- plugins/New_GPG/src/messages.cpp | 12 +- plugins/New_GPG/src/options.cpp | 80 ++--- plugins/New_GPG/src/ui.cpp | 104 +++---- plugins/New_GPG/src/utilities.cpp | 72 ++--- plugins/NewsAggregator/Src/Menus.cpp | 4 +- plugins/NewsAggregator/Src/Services.cpp | 12 +- plugins/NewsAggregator/Src/Update.cpp | 6 +- plugins/Non-IM Contact/src/contactinfo.cpp | 4 +- plugins/Non-IM Contact/src/dialog.cpp | 12 +- plugins/Non-IM Contact/src/files.cpp | 18 +- plugins/Non-IM Contact/src/main.cpp | 2 +- plugins/Non-IM Contact/src/namereplacing.cpp | 8 +- plugins/Non-IM Contact/src/services.cpp | 12 +- plugins/Non-IM Contact/src/stdafx.h | 2 +- plugins/Non-IM Contact/src/timer.cpp | 8 +- plugins/NotesAndReminders/src/main.cpp | 2 +- plugins/NotesAndReminders/src/notes.cpp | 14 +- plugins/NotesAndReminders/src/options.cpp | 56 ++-- plugins/NotesAndReminders/src/reminders.cpp | 18 +- plugins/NotifyAnything/src/options.cpp | 36 +-- plugins/Nudge/src/nudge.cpp | 85 +++--- plugins/Nudge/src/shake.cpp | 16 +- plugins/PackUpdater/Src/Notifications.cpp | 20 +- plugins/PackUpdater/Src/Options.cpp | 40 +-- plugins/PackUpdater/Src/Utils.cpp | 76 ++--- plugins/PasteIt/src/Options.cpp | 46 +-- plugins/Ping/src/log.cpp | 4 +- plugins/Ping/src/options.cpp | 48 +-- plugins/Ping/src/ping.cpp | 6 +- plugins/Ping/src/pinggraph.cpp | 22 +- plugins/Ping/src/pinglist.cpp | 4 +- plugins/Ping/src/pingthread.cpp | 30 +- plugins/PluginUpdater/src/DlgListNew.cpp | 2 +- plugins/PluginUpdater/src/DlgUpdate.cpp | 40 +-- plugins/PluginUpdater/src/Events.cpp | 4 +- plugins/PluginUpdater/src/Notifications.cpp | 18 +- plugins/PluginUpdater/src/Options.cpp | 82 +++--- plugins/PluginUpdater/src/PluginUpdater.cpp | 20 +- plugins/PluginUpdater/src/Utils.cpp | 36 +-- plugins/PluginUpdater/src/unzipfile.cpp | 2 +- plugins/Popup/src/actions.cpp | 20 +- plugins/Popup/src/avatars.cpp | 2 +- plugins/Popup/src/config.cpp | 6 +- plugins/Popup/src/history.cpp | 2 +- plugins/Popup/src/main.cpp | 6 +- plugins/Popup/src/notifications.cpp | 24 +- plugins/Popup/src/opt_adv.cpp | 72 ++--- plugins/Popup/src/opt_class.cpp | 20 +- plugins/Popup/src/opt_gen.cpp | 84 +++--- plugins/Popup/src/opt_skins.cpp | 30 +- plugins/Popup/src/popup_thread.cpp | 2 +- plugins/Popup/src/services.cpp | 8 +- plugins/Popup/src/skin.cpp | 6 +- plugins/ProxySwitch/src/main.cpp | 8 +- plugins/ProxySwitch/src/opt.cpp | 48 +-- plugins/ProxySwitch/src/proxy.cpp | 4 +- plugins/QuickMessages/src/Utils.cpp | 36 +-- plugins/QuickMessages/src/main.cpp | 8 +- plugins/QuickMessages/src/options.cpp | 22 +- plugins/QuickReplies/src/events.cpp | 6 +- plugins/QuickReplies/src/options.cpp | 16 +- plugins/RecentContacts/src/RecentContacts.cpp | 12 +- plugins/RecentContacts/src/options.cpp | 4 +- plugins/RemovePersonalSettings/src/rps.cpp | 4 +- plugins/SMS/src/functions.cpp | 8 +- plugins/SMS/src/recvdlg.cpp | 4 +- plugins/SMS/src/senddlg.cpp | 4 +- plugins/SecureIM/src/commonheaders.cpp | 40 +-- plugins/SecureIM/src/crypt_dll.cpp | 2 +- plugins/SecureIM/src/crypt_lists.cpp | 4 +- plugins/SecureIM/src/crypt_misc.cpp | 2 +- plugins/SecureIM/src/crypt_popups.cpp | 34 +-- plugins/SecureIM/src/main.cpp | 58 ++-- plugins/SecureIM/src/options.cpp | 66 ++--- plugins/SecureIM/src/popupOptions.cpp | 60 ++-- plugins/SecureIM/src/splitmsg.cpp | 4 +- plugins/SecureIM/src/svcs_rsa.cpp | 4 +- plugins/SeenPlugin/src/history.cpp | 4 +- plugins/SeenPlugin/src/main.cpp | 10 +- plugins/SeenPlugin/src/menu.cpp | 4 +- plugins/SeenPlugin/src/missed.cpp | 2 +- plugins/SeenPlugin/src/options.cpp | 80 ++--- plugins/SeenPlugin/src/utils.cpp | 26 +- plugins/SendScreenshotPlus/src/UMainForm.cpp | 60 ++-- plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | 4 +- plugins/Sessions/Src/Main.cpp | 72 ++--- plugins/Sessions/Src/Options.cpp | 42 +-- plugins/Sessions/Src/Utils.cpp | 22 +- plugins/SimpleAR/src/Main.cpp | 22 +- plugins/SimpleAR/src/Options.cpp | 20 +- plugins/SimpleStatusMsg/src/main.cpp | 120 ++++---- plugins/SimpleStatusMsg/src/msgbox.cpp | 104 +++---- plugins/SimpleStatusMsg/src/options.cpp | 150 +++++----- plugins/SimpleStatusMsg/src/utils.cpp | 8 +- plugins/SmileyAdd/src/options.cpp | 78 ++--- plugins/SmileyAdd/src/services.cpp | 2 +- plugins/Spamotron/src/options.cpp | 2 +- plugins/SpellChecker/src/dictionary.cpp | 2 +- plugins/SpellChecker/src/options.cpp | 4 +- plugins/SpellChecker/src/utils.cpp | 4 +- plugins/SplashScreen/src/main.cpp | 10 +- plugins/SplashScreen/src/options.cpp | 70 ++--- plugins/StartupSilence/src/main.cpp | 84 +++--- plugins/StatusChange/src/main.cpp | 68 ++--- plugins/StatusManager/src/options.cpp | 2 +- plugins/StopSpamMod/src/init.cpp | 54 ++-- plugins/StopSpamMod/src/options.cpp | 70 ++--- plugins/StopSpamMod/src/utilities.cpp | 8 +- plugins/StopSpamPlus/src/services.cpp | 6 +- plugins/TipperYM/src/options.cpp | 262 ++++++++--------- plugins/TipperYM/src/popwin.cpp | 4 +- plugins/TipperYM/src/skin_parser.cpp | 8 +- plugins/TipperYM/src/subst.cpp | 2 +- plugins/TipperYM/src/tipper.cpp | 6 +- plugins/TooltipNotify/src/TooltipNotify.cpp | 108 +++---- plugins/TopToolBar/src/InternalButtons.cpp | 12 +- plugins/TopToolBar/src/toolbar.cpp | 4 +- plugins/TopToolBar/src/toolbarwnd.cpp | 8 +- plugins/TrafficCounter/src/TrafficCounter.cpp | 68 ++--- plugins/TrafficCounter/src/options.cpp | 4 +- plugins/UserInfoEx/src/Flags/svc_flags.cpp | 4 +- plugins/UserInfoEx/src/classMAnnivDate.cpp | 2 +- plugins/UserInfoEx/src/classPsTree.cpp | 12 +- plugins/UserInfoEx/src/classPsTreeItem.cpp | 17 +- plugins/UserInfoEx/src/ctrl_annivedit.cpp | 8 +- plugins/UserInfoEx/src/ctrl_base.cpp | 12 +- plugins/UserInfoEx/src/ctrl_combo.cpp | 2 +- plugins/UserInfoEx/src/ctrl_contact.cpp | 8 +- plugins/UserInfoEx/src/ctrl_edit.cpp | 2 +- plugins/UserInfoEx/src/dlg_anniversarylist.cpp | 26 +- plugins/UserInfoEx/src/dlg_msgbox.cpp | 4 +- plugins/UserInfoEx/src/dlg_propsheet.cpp | 18 +- .../UserInfoEx/src/ex_import/dlg_ExImModules.cpp | 2 +- .../src/ex_import/dlg_ExImOpenSaveFile.cpp | 4 +- .../UserInfoEx/src/ex_import/dlg_ExImProgress.cpp | 2 +- plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp | 2 +- plugins/UserInfoEx/src/mir_db.cpp | 2 +- plugins/UserInfoEx/src/mir_icolib.cpp | 2 +- plugins/UserInfoEx/src/mir_menuitems.cpp | 24 +- plugins/UserInfoEx/src/psp_anniversary.cpp | 2 +- plugins/UserInfoEx/src/psp_general.cpp | 2 +- plugins/UserInfoEx/src/psp_options.cpp | 80 ++--- plugins/UserInfoEx/src/svc_avatar.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 8 +- plugins/UserInfoEx/src/svc_gender.cpp | 4 +- plugins/UserInfoEx/src/svc_homepage.cpp | 4 +- plugins/UserInfoEx/src/svc_phone.cpp | 4 +- plugins/UserInfoEx/src/svc_refreshci.cpp | 6 +- plugins/UserInfoEx/src/svc_reminder.cpp | 46 +-- plugins/Variables/src/help.cpp | 12 +- plugins/Variables/src/options.cpp | 20 +- plugins/Variables/src/variables.cpp | 10 +- plugins/Watrack_MPD/src/init.cpp | 6 +- plugins/Watrack_MPD/src/options.cpp | 12 +- plugins/Weather/src/weather.cpp | 4 +- plugins/Weather/src/weather_addstn.cpp | 4 +- plugins/Weather/src/weather_contacts.cpp | 6 +- plugins/Weather/src/weather_data.cpp | 2 +- plugins/Weather/src/weather_mwin.cpp | 2 +- plugins/Weather/src/weather_opt.cpp | 136 ++++----- plugins/Weather/src/weather_svcs.cpp | 4 +- plugins/Weather/src/weather_update.cpp | 2 +- plugins/WebView/src/main.cpp | 20 +- plugins/WebView/src/webview.cpp | 64 ++-- plugins/WebView/src/webview_alerts.cpp | 32 +- plugins/WebView/src/webview_datawnd.cpp | 14 +- plugins/WebView/src/webview_getdata.cpp | 14 +- plugins/WebView/src/webview_opts.cpp | 138 ++++----- plugins/WebView/src/webview_services.cpp | 8 +- plugins/WhenWasIt/src/dlg_handlers.cpp | 44 +-- plugins/WhenWasIt/src/hooked_events.cpp | 2 +- plugins/WhenWasIt/src/services.cpp | 46 +-- plugins/WhenWasIt/src/utils.cpp | 2 +- plugins/WhoUsesMyFiles/src/options.cpp | 34 +-- plugins/WhoUsesMyFiles/src/wumfplug.cpp | 38 +-- plugins/WinterSpeak/src/AnnounceDatabase.cpp | 12 +- plugins/WinterSpeak/src/ConfigDatabase.cpp | 26 +- plugins/XSoundNotify/src/options.cpp | 16 +- plugins/XSoundNotify/src/xsn_main.cpp | 8 +- plugins/YAMN/src/browser/mailbrowser.cpp | 10 +- plugins/YAMN/src/main.cpp | 22 +- plugins/YAMN/src/proto/pop3/pop3opt.cpp | 18 +- plugins/YAMN/src/services.cpp | 14 +- plugins/YAPP/src/options.cpp | 100 +++---- plugins/YAPP/src/services.cpp | 8 +- plugins/YARelay/src/main.cpp | 18 +- plugins/YARelay/src/options.cpp | 18 +- plugins/ZeroNotification/src/main.cpp | 12 +- plugins/ZeroNotification/src/options.cpp | 16 +- plugins/mTextControl/src/textusers.cpp | 8 +- plugins/wbOSD/src/events.cpp | 30 +- plugins/wbOSD/src/options.cpp | 180 ++++++------ plugins/wbOSD/src/wbOSD.cpp | 14 +- 380 files changed, 4877 insertions(+), 4881 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp index 5d7bb35503..df91050b65 100644 --- a/plugins/AVS/src/acc.cpp +++ b/plugins/AVS/src/acc.cpp @@ -565,7 +565,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP DeleteObject(hbrush); } - if (data->hContact == NULL && data->proto[0] == 0 && db_get_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1)) + if (data->hContact == NULL && data->proto[0] == 0 && g_plugin.getByte("GlobalUserAvatarNotConsistent", 1)) DrawText(hdc, data->hFont, rc, TranslateT("Protocols have different avatars")); // Has an animated gif diff --git a/plugins/AVS/src/cache.cpp b/plugins/AVS/src/cache.cpp index 79ccc1ddbe..d698f42b93 100644 --- a/plugins/AVS/src/cache.cpp +++ b/plugins/AVS/src/cache.cpp @@ -72,7 +72,7 @@ CacheNode* FindAvatarInCache(MCONTACT hContact, bool add, bool findAny) return nullptr; char *szProto = GetContactProto(hContact); - if (szProto == nullptr || !db_get_b(NULL, AVS_MODULE, szProto, 1)) + if (szProto == nullptr || !g_plugin.getByte(szProto, 1)) return nullptr; CacheNode *cc; @@ -222,7 +222,7 @@ void PicLoader(LPVOID) { Thread_SetName("AVS: PicLoader"); - DWORD dwDelay = db_get_dw(NULL, AVS_MODULE, "picloader_sleeptime", 80); + DWORD dwDelay = g_plugin.getDword("picloader_sleeptime", 80); if (dwDelay < 30) dwDelay = 30; diff --git a/plugins/AVS/src/image_utils.cpp b/plugins/AVS/src/image_utils.cpp index d89448e359..9717e5ddb4 100644 --- a/plugins/AVS/src/image_utils.cpp +++ b/plugins/AVS/src/image_utils.cpp @@ -319,7 +319,7 @@ BOOL MakeTransparentBkg(MCONTACT hContact, HBITMAP *hBitmap) GetObject(*hBitmap, sizeof(bmp), &bmp); int width = bmp.bmWidth; int height = bmp.bmHeight; - int colorDiff = db_get_w(hContact, "ContactPhoto", "TranspBkgColorDiff", db_get_w(0, AVS_MODULE, "TranspBkgColorDiff", 10)); + int colorDiff = db_get_w(hContact, "ContactPhoto", "TranspBkgColorDiff", g_plugin.getWord("TranspBkgColorDiff", 10)); // Min 5x5 to easy things in loop if (width <= 4 || height <= 4) @@ -414,7 +414,7 @@ BOOL MakeTransparentBkg(MCONTACT hContact, HBITMAP *hBitmap) if (foundBkg[i]) count++; - if (count < db_get_w(hContact, "ContactPhoto", "TranspBkgNumPoints", db_get_w(0, AVS_MODULE, "TranspBkgNumPoints", 5))) { + if (count < db_get_w(hContact, "ContactPhoto", "TranspBkgNumPoints", g_plugin.getWord("TranspBkgNumPoints", 5))) { if (hBmpTmp != *hBitmap) DeleteObject(hBmpTmp); free(p); @@ -440,7 +440,7 @@ BOOL MakeTransparentBkg(MCONTACT hContact, HBITMAP *hBitmap) } if (maxCount < db_get_w(hContact, "ContactPhoto", "TranspBkgNumPoints", - db_get_w(0, AVS_MODULE, "TranspBkgNumPoints", 5))) { + g_plugin.getWord("TranspBkgNumPoints", 5))) { // Not enought corners with the same color if (hBmpTmp != *hBitmap) DeleteObject(hBmpTmp); free(p); @@ -480,7 +480,7 @@ BOOL MakeTransparentBkg(MCONTACT hContact, HBITMAP *hBitmap) } // Set alpha from borders - bool transpProportional = (db_get_b(NULL, AVS_MODULE, "MakeTransparencyProportionalToColorDiff", 0) != 0); + bool transpProportional = (g_plugin.getByte("MakeTransparencyProportionalToColorDiff", 0) != 0); int *stack = (int *)malloc(width * height * 2 * sizeof(int)); if (stack == nullptr) { diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index 0d2827a0cb..057f69339c 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -57,7 +57,7 @@ static PLUGININFOEX pluginInfoEx = }; CMPlugin::CMPlugin() : - PLUGIN(AVS_MODULE, pluginInfoEx) + PLUGIN(MODULENAME, pluginInfoEx) {} ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 2558fe9626..057098a607 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -114,7 +114,7 @@ static void SetProtoPic(protoPicCacheEntry *pce) wchar_t szNewPath[MAX_PATH]; PathToRelativeW(FileName, szNewPath, g_szDataPath); - db_set_ws(NULL, PPICT_MODULE, pce->szProtoname, szNewPath); + db_set_ws(0, PPICT_MODULE, pce->szProtoname, szNewPath); switch(pce->cacheType) { case PCE_TYPE_GLOBAL: @@ -171,16 +171,16 @@ static INT_PTR CALLBACK DlgProcOptionsAvatars(HWND hwndDlg, UINT msg, WPARAM wPa case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_SHOWWARNINGS, db_get_b(0, AVS_MODULE, "warnings", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MAKE_GRAYSCALE, db_get_b(0, AVS_MODULE, "MakeGrayscale", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MAKE_TRANSPARENT_BKG, db_get_b(0, AVS_MODULE, "MakeTransparentBkg", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MAKE_TRANSP_PROPORTIONAL, db_get_b(0, AVS_MODULE, "MakeTransparencyProportionalToColorDiff", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SHOWWARNINGS, g_plugin.getByte("warnings", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_MAKE_GRAYSCALE, g_plugin.getByte("MakeGrayscale", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_MAKE_TRANSPARENT_BKG, g_plugin.getByte("MakeTransparentBkg", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_MAKE_TRANSP_PROPORTIONAL, g_plugin.getByte("MakeTransparencyProportionalToColorDiff", 0) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETRANGE, 0, MAKELONG(8, 2)); - SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETPOS, 0, (LPARAM)db_get_w(0, AVS_MODULE, "TranspBkgNumPoints", 5)); + SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETPOS, 0, g_plugin.getWord("TranspBkgNumPoints", 5)); SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_SETRANGE, 0, MAKELONG(100, 0)); - SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_SETPOS, 0, (LPARAM)db_get_w(0, AVS_MODULE, "TranspBkgColorDiff", 10)); + SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_SETPOS, 0, g_plugin.getWord("TranspBkgColorDiff", 10)); { BOOL enabled = IsDlgButtonChecked(hwndDlg, IDC_MAKE_TRANSPARENT_BKG); EnableWindow(GetDlgItem(hwndDlg, IDC_BKG_NUM_POINTS_L), enabled); @@ -195,8 +195,7 @@ static INT_PTR CALLBACK DlgProcOptionsAvatars(HWND hwndDlg, UINT msg, WPARAM wPa return TRUE; case WM_COMMAND: - if ((LOWORD(wParam) == IDC_BKG_NUM_POINTS || LOWORD(wParam) == IDC_BKG_COLOR_DIFFERENCE) - && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())) + if ((LOWORD(wParam) == IDC_BKG_NUM_POINTS || LOWORD(wParam) == IDC_BKG_COLOR_DIFFERENCE) && (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())) return FALSE; SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; @@ -218,12 +217,12 @@ static INT_PTR CALLBACK DlgProcOptionsAvatars(HWND hwndDlg, UINT msg, WPARAM wPa case 0: switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: - db_set_b(NULL, AVS_MODULE, "warnings", IsDlgButtonChecked(hwndDlg, IDC_SHOWWARNINGS) ? 1 : 0); - db_set_b(NULL, AVS_MODULE, "MakeGrayscale", IsDlgButtonChecked(hwndDlg, IDC_MAKE_GRAYSCALE) ? 1 : 0); - db_set_b(NULL, AVS_MODULE, "MakeTransparentBkg", IsDlgButtonChecked(hwndDlg, IDC_MAKE_TRANSPARENT_BKG) ? 1 : 0); - db_set_b(NULL, AVS_MODULE, "MakeTransparencyProportionalToColorDiff", IsDlgButtonChecked(hwndDlg, IDC_MAKE_TRANSP_PROPORTIONAL) ? 1 : 0); - db_set_w(NULL, AVS_MODULE, "TranspBkgNumPoints", (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_GETPOS, 0, 0)); - db_set_w(NULL, AVS_MODULE, "TranspBkgColorDiff", (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_GETPOS, 0, 0)); + g_plugin.setByte("warnings", IsDlgButtonChecked(hwndDlg, IDC_SHOWWARNINGS) ? 1 : 0); + g_plugin.setByte("MakeGrayscale", IsDlgButtonChecked(hwndDlg, IDC_MAKE_GRAYSCALE) ? 1 : 0); + g_plugin.setByte("MakeTransparentBkg", IsDlgButtonChecked(hwndDlg, IDC_MAKE_TRANSPARENT_BKG) ? 1 : 0); + g_plugin.setByte("MakeTransparencyProportionalToColorDiff", IsDlgButtonChecked(hwndDlg, IDC_MAKE_TRANSP_PROPORTIONAL) ? 1 : 0); + g_plugin.setWord("TranspBkgNumPoints", (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_GETPOS, 0, 0)); + g_plugin.setWord("TranspBkgColorDiff", (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_GETPOS, 0, 0)); } } break; @@ -239,8 +238,8 @@ static INT_PTR CALLBACK DlgProcOptionsOwn(HWND hwndDlg, UINT msg, WPARAM, LPARAM case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_MAKE_MY_AVATARS_TRANSP, db_get_b(0, AVS_MODULE, "MakeMyAvatarsTransparent", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SET_MAKE_SQUARE, db_get_b(0, AVS_MODULE, "SetAllwaysMakeSquare", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_MAKE_MY_AVATARS_TRANSP, g_plugin.getByte("MakeMyAvatarsTransparent", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SET_MAKE_SQUARE, g_plugin.getByte("SetAllwaysMakeSquare", 0) ? BST_CHECKED : BST_UNCHECKED); return TRUE; @@ -253,8 +252,8 @@ static INT_PTR CALLBACK DlgProcOptionsOwn(HWND hwndDlg, UINT msg, WPARAM, LPARAM case 0: switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: - db_set_b(NULL, AVS_MODULE, "MakeMyAvatarsTransparent", IsDlgButtonChecked(hwndDlg, IDC_MAKE_MY_AVATARS_TRANSP) ? 1 : 0); - db_set_b(NULL, AVS_MODULE, "SetAllwaysMakeSquare", IsDlgButtonChecked(hwndDlg, IDC_SET_MAKE_SQUARE) ? 1 : 0); + g_plugin.setByte("MakeMyAvatarsTransparent", IsDlgButtonChecked(hwndDlg, IDC_MAKE_MY_AVATARS_TRANSP) ? 1 : 0); + g_plugin.setByte("SetAllwaysMakeSquare", IsDlgButtonChecked(hwndDlg, IDC_SET_MAKE_SQUARE) ? 1 : 0); } } break; @@ -313,7 +312,7 @@ static INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wPar int newItem = ListView_InsertItem(hwndList, &item); if (newItem >= 0) ListView_SetCheckState(hwndList, newItem, - db_get_b(NULL, AVS_MODULE, p->szProtoname, 1) ? TRUE : FALSE); + g_plugin.getByte(p->szProtoname, 1) ? TRUE : FALSE); } ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE); ListView_Arrange(hwndList, LVA_ALIGNLEFT | LVA_ALIGNTOP); @@ -410,7 +409,7 @@ static INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wPar for (int i = 0; i < ListView_GetItemCount(hwndList); i++) { auto *pce = GetProtoFromList(hwndDlg, i); - BOOL oldVal = db_get_b(NULL, AVS_MODULE, pce->szProtoname, 1); + BOOL oldVal = g_plugin.getByte(pce->szProtoname, 1); BOOL newVal = ListView_GetCheckState(hwndList, i); if (oldVal && !newVal) @@ -418,9 +417,9 @@ static INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wPar DeleteAvatarFromCache(hContact, TRUE); if (newVal) - db_set_b(NULL, AVS_MODULE, pce->szProtoname, 1); + g_plugin.setByte(pce->szProtoname, 1); else - db_set_b(NULL, AVS_MODULE, pce->szProtoname, 0); + g_plugin.setByte(pce->szProtoname, 0); } } } @@ -433,9 +432,9 @@ static INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wPar static void LoadTransparentData(HWND hwndDlg, MCONTACT hContact) { - CheckDlgButton(hwndDlg, IDC_MAKETRANSPBKG, db_get_b(hContact, "ContactPhoto", "MakeTransparentBkg", db_get_b(0, AVS_MODULE, "MakeTransparentBkg", 0)) ? BST_CHECKED : BST_UNCHECKED); - SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETPOS, 0, (LPARAM)db_get_w(hContact, "ContactPhoto", "TranspBkgNumPoints", db_get_w(0, AVS_MODULE, "TranspBkgNumPoints", 5))); - SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_SETPOS, 0, (LPARAM)db_get_w(hContact, "ContactPhoto", "TranspBkgColorDiff", db_get_w(0, AVS_MODULE, "TranspBkgColorDiff", 10))); + CheckDlgButton(hwndDlg, IDC_MAKETRANSPBKG, db_get_b(hContact, "ContactPhoto", "MakeTransparentBkg", g_plugin.getByte("MakeTransparentBkg", 0)) ? BST_CHECKED : BST_UNCHECKED); + SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_SETPOS, 0, (LPARAM)db_get_w(hContact, "ContactPhoto", "TranspBkgNumPoints", g_plugin.getWord("TranspBkgNumPoints", 5))); + SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_SETPOS, 0, (LPARAM)db_get_w(hContact, "ContactPhoto", "TranspBkgColorDiff", g_plugin.getWord("TranspBkgColorDiff", 10))); BOOL transp_enabled = IsDlgButtonChecked(hwndDlg, IDC_MAKETRANSPBKG); EnableWindow(GetDlgItem(hwndDlg, IDC_BKG_NUM_POINTS_L), transp_enabled); @@ -449,19 +448,19 @@ static void LoadTransparentData(HWND hwndDlg, MCONTACT hContact) static void SaveTransparentData(HWND hwndDlg, MCONTACT hContact) { BOOL transp = IsDlgButtonChecked(hwndDlg, IDC_MAKETRANSPBKG); - if (db_get_b(0, AVS_MODULE, "MakeTransparentBkg", 0) == transp) + if (g_plugin.getByte("MakeTransparentBkg", 0) == transp) db_unset(hContact, "ContactPhoto", "MakeTransparentBkg"); else db_set_b(hContact, "ContactPhoto", "MakeTransparentBkg", transp); WORD tmp = (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_NUM_POINTS_SPIN, UDM_GETPOS, 0, 0); - if (db_get_w(0, AVS_MODULE, "TranspBkgNumPoints", 5) == tmp) + if (g_plugin.getWord("TranspBkgNumPoints", 5) == tmp) db_unset(hContact, "ContactPhoto", "TranspBkgNumPoints"); else db_set_w(hContact, "ContactPhoto", "TranspBkgNumPoints", tmp); tmp = (WORD)SendDlgItemMessage(hwndDlg, IDC_BKG_COLOR_DIFFERENCE_SPIN, UDM_GETPOS, 0, 0); - if (db_get_w(0, AVS_MODULE, "TranspBkgColorDiff", 10) == tmp) + if (g_plugin.getWord("TranspBkgColorDiff", 10) == tmp) db_unset(hContact, "ContactPhoto", "TranspBkgColorDiff"); else db_set_w(hContact, "ContactPhoto", "TranspBkgColorDiff", tmp); @@ -917,7 +916,7 @@ static void EnableDisableControls(HWND hwndDlg, char *proto) else { EnableWindow(GetDlgItem(hwndDlg, IDC_CHANGE), TRUE); - if (db_get_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1)) + if (g_plugin.getByte("GlobalUserAvatarNotConsistent", 1)) EnableWindow(GetDlgItem(hwndDlg, IDC_DELETE), TRUE); else { int width, height; @@ -1025,7 +1024,7 @@ static INT_PTR CALLBACK DlgProcAvatarProtoInfo(HWND hwndDlg, UINT msg, WPARAM wP ListView_Arrange(hwndList, LVA_ALIGNLEFT | LVA_ALIGNTOP); // Check if should show per protocol avatars - CheckDlgButton(hwndDlg, IDC_PER_PROTO, db_get_b(NULL, AVS_MODULE, "PerProtocolUserAvatars", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_PER_PROTO, g_plugin.getByte("PerProtocolUserAvatars", 1) ? BST_CHECKED : BST_UNCHECKED); EnableDisableProtocols(hwndDlg, TRUE); } break; @@ -1086,7 +1085,7 @@ static INT_PTR CALLBACK DlgProcAvatarProtoInfo(HWND hwndDlg, UINT msg, WPARAM wP break; case IDC_PER_PROTO: - db_set_b(NULL, AVS_MODULE, "PerProtocolUserAvatars", IsDlgButtonChecked(hwndDlg, IDC_PER_PROTO) ? 1 : 0); + g_plugin.setByte("PerProtocolUserAvatars", IsDlgButtonChecked(hwndDlg, IDC_PER_PROTO) ? 1 : 0); EnableDisableProtocols(hwndDlg, FALSE); break; } @@ -1109,7 +1108,7 @@ int OnDetailsInit(WPARAM wParam, LPARAM lParam) } else { char *szProto = GetContactProto(hContact); - if (szProto == nullptr || db_get_b(NULL, AVS_MODULE, szProto, 1)) { + if (szProto == nullptr || g_plugin.getByte(szProto, 1)) { // Contact dialog odp.pfnDlgProc = DlgProcAvatarUserInfo; odp.position = -2000000000; diff --git a/plugins/AVS/src/poll.cpp b/plugins/AVS/src/poll.cpp index c004765f03..90f2e614ce 100644 --- a/plugins/AVS/src/poll.cpp +++ b/plugins/AVS/src/poll.cpp @@ -81,7 +81,7 @@ static BOOL PollProtocolCanHaveAvatar(const char *szProto) // Return true if this protocol has to be checked static BOOL PollCheckProtocol(const char *szProto) { - return db_get_b(NULL, AVS_MODULE, szProto, 1); + return g_plugin.getByte(szProto, 1); } // Return true if this contact can have avatar requested @@ -156,7 +156,7 @@ void ProcessAvatarInfo(MCONTACT hContact, int type, PROTO_AVATAR_INFORMATION *pa else if (type == GAIR_NOAVATAR) { db_unset(hContact, "ContactPhoto", "NeedUpdate"); - if (db_get_b(NULL, AVS_MODULE, "RemoveAvatarWhenContactRemoves", 1)) { + if (g_plugin.getByte("RemoveAvatarWhenContactRemoves", 1)) { // Delete settings db_unset(hContact, "ContactPhoto", "RFile"); if (!db_get_b(hContact, "ContactPhoto", "Locked", 0)) diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 7a4b80faf2..b31702457b 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -205,9 +205,9 @@ static int InternalRemoveMyAvatar(char *protocol) if (ret == 0) { // Has global avatar? DBVARIANT dbv = { 0 }; - if (!db_get_ws(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) { + if (!g_plugin.getWString("GlobalUserAvatarFile", &dbv)) { db_free(&dbv); - db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1); + g_plugin.setByte("GlobalUserAvatarNotConsistent", 1); DeleteGlobalUserAvatar(); } } @@ -229,9 +229,9 @@ static int InternalRemoveMyAvatar(char *protocol) DeleteGlobalUserAvatar(); if (ret) - db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1); + g_plugin.setByte("GlobalUserAvatarNotConsistent", 1); else - db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 0); + g_plugin.setByte("GlobalUserAvatarNotConsistent", 0); } SetIgnoreNotify(protocol, FALSE); @@ -502,7 +502,7 @@ static int InternalSetMyAvatar(char *protocol, wchar_t *szFinalName, SetMyAvatar ret = SetProtoMyAvatar(protocol, hBmp, szFinalName, format, data.square, data.grow); if (ret == 0) { DeleteGlobalUserAvatar(); - db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1); + g_plugin.setByte("GlobalUserAvatarNotConsistent", 1); } } else { @@ -521,7 +521,7 @@ static int InternalSetMyAvatar(char *protocol, wchar_t *szFinalName, SetMyAvatar DeleteGlobalUserAvatar(); if (ret) - db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1); + g_plugin.setByte("GlobalUserAvatarNotConsistent", 1); else { // Copy avatar file to store as global one wchar_t globalFile[1024]; @@ -558,13 +558,13 @@ static int InternalSetMyAvatar(char *protocol, wchar_t *szFinalName, SetMyAvatar if (saved) { wchar_t relFile[1024]; if (PathToRelativeW(globalFile, relFile, g_szDataPath)) - db_set_ws(NULL, AVS_MODULE, "GlobalUserAvatarFile", relFile); + g_plugin.setWString("GlobalUserAvatarFile", relFile); else - db_set_ws(NULL, AVS_MODULE, "GlobalUserAvatarFile", globalFile); + g_plugin.setWString("GlobalUserAvatarFile", globalFile); - db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 0); + g_plugin.setByte("GlobalUserAvatarNotConsistent", 0); } - else db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1); + else g_plugin.setByte("GlobalUserAvatarNotConsistent", 1); } } @@ -614,7 +614,7 @@ INT_PTR SetMyAvatar(WPARAM wParam, LPARAM lParam) allAcceptSWF = allAcceptSWF && Proto_IsAvatarFormatSupported(it->szModuleName, PA_FORMAT_SWF); } - data.square = db_get_b(0, AVS_MODULE, "SetAllwaysMakeSquare", 0); + data.square = g_plugin.getByte("SetAllwaysMakeSquare", 0); } else { allAcceptXML = Proto_IsAvatarFormatSupported(protocol, PA_FORMAT_XML); @@ -622,7 +622,7 @@ INT_PTR SetMyAvatar(WPARAM wParam, LPARAM lParam) data.protocol = protocol; data.square = (Proto_AvatarImageProportion(protocol) & PIP_SQUARE) - || db_get_b(0, AVS_MODULE, "SetAllwaysMakeSquare", 0); + || g_plugin.getByte("SetAllwaysMakeSquare", 0); } if (tszPath == nullptr) { @@ -710,7 +710,7 @@ INT_PTR DrawAvatarPicture(WPARAM, LPARAM lParam) if (r->szProto == nullptr) return 0; - if (r->szProto[0] == '\0' && db_get_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1)) + if (r->szProto[0] == '\0' && g_plugin.getByte("GlobalUserAvatarNotConsistent", 1)) return -1; ace = (AVATARCACHEENTRY *)GetMyAvatar(0, (LPARAM)r->szProto); diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h index f9911c6f6a..0caf8837ac 100644 --- a/plugins/AVS/src/stdafx.h +++ b/plugins/AVS/src/stdafx.h @@ -57,6 +57,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define SHVIEW_THUMBNAIL 0x702D #endif +#define MODULENAME "AVS_Settings" // db settings module path +#define PPICT_MODULE "AVS_ProtoPics" // protocol pictures are saved here + struct CMPlugin : public PLUGIN { CMPlugin(); diff --git a/plugins/AVS/src/utils.cpp b/plugins/AVS/src/utils.cpp index 2c809a53d0..4e1d9ea226 100644 --- a/plugins/AVS/src/utils.cpp +++ b/plugins/AVS/src/utils.cpp @@ -79,7 +79,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz if (szProto == nullptr) { char *proto = GetContactProto(hContact); - if (proto == nullptr || !db_get_b(NULL, AVS_MODULE, proto, 1)) + if (proto == nullptr || !g_plugin.getByte(proto, 1)) return -1; if (db_get_b(hContact, "ContactPhoto", "Locked", 0) && (tszValue = db_get_wsa(hContact, "ContactPhoto", "Backup"))) @@ -114,7 +114,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz // startup and everytime they are changed. if (szProto[0] == '\0') { // Global avatar - if (tszValue = db_get_wsa(NULL, AVS_MODULE, "GlobalUserAvatarFile")) + if (tszValue = g_plugin.getWStringA("GlobalUserAvatarFile")) MyPathToAbsolute(tszValue, tszFilename); else return -10; @@ -164,7 +164,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz ace->bmHeight = bminfo.bmHeight; ace->bmWidth = bminfo.bmWidth; - BOOL noTransparency = db_get_b(0, AVS_MODULE, "RemoveAllTransparency", 0); + BOOL noTransparency = g_plugin.getByte("RemoveAllTransparency", 0); // Calc image hash if (hContact != 0 && hContact != INVALID_CONTACT_ID) { @@ -179,7 +179,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz } // Make transparent? - if (!noTransparency && !isTransparentImage && db_get_b(hContact, "ContactPhoto", "MakeTransparentBkg", db_get_b(0, AVS_MODULE, "MakeTransparentBkg", 0))) { + if (!noTransparency && !isTransparentImage && db_get_b(hContact, "ContactPhoto", "MakeTransparentBkg", g_plugin.getByte("MakeTransparentBkg", 0))) { if (MakeTransparentBkg(hContact, &ace->hbmPic)) { ace->dwFlags |= AVS_CUSTOMTRANSPBKG | AVS_HASTRANSPARENCY; GetObject(ace->hbmPic, sizeof(bminfo), &bminfo); @@ -188,7 +188,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz } } else if (hContact == INVALID_CONTACT_ID) { // My avatars - if (!noTransparency && !isTransparentImage && db_get_b(0, AVS_MODULE, "MakeTransparentBkg", 0) && db_get_b(0, AVS_MODULE, "MakeMyAvatarsTransparent", 0)) { + if (!noTransparency && !isTransparentImage && g_plugin.getByte("MakeTransparentBkg", 0) && g_plugin.getByte("MakeMyAvatarsTransparent", 0)) { if (MakeTransparentBkg(0, &ace->hbmPic)) { ace->dwFlags |= AVS_CUSTOMTRANSPBKG | AVS_HASTRANSPARENCY; GetObject(ace->hbmPic, sizeof(bminfo), &bminfo); @@ -197,7 +197,7 @@ int CreateAvatarInCache(MCONTACT hContact, AVATARCACHEENTRY *ace, const char *sz } } - if (db_get_b(0, AVS_MODULE, "MakeGrayscale", 0)) + if (g_plugin.getByte("MakeGrayscale", 0)) ace->hbmPic = MakeGrayscale(ace->hbmPic); if (noTransparency) { @@ -428,7 +428,7 @@ int ChangeAvatar(MCONTACT hContact, bool fLoad, bool fNotifyHist, int pa_format) void DeleteGlobalUserAvatar() { DBVARIANT dbv = { 0 }; - if (db_get_ws(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) + if (g_plugin.getWString("GlobalUserAvatarFile", &dbv)) return; wchar_t szFilename[MAX_PATH]; @@ -436,7 +436,7 @@ void DeleteGlobalUserAvatar() db_free(&dbv); DeleteFile(szFilename); - db_unset(NULL, AVS_MODULE, "GlobalUserAvatarFile"); + g_plugin.delSetting("GlobalUserAvatarFile"); } void SetIgnoreNotify(char *protocol, BOOL ignore) diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index da5163cea8..fa79e6976a 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -172,7 +172,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM) SendDlgItemMessage(hdlg, IDC_GROUP, CB_INSERTSTRING, 0, (LPARAM)TranslateT("None")); SendDlgItemMessage(hdlg, IDC_GROUP, CB_SETCURSEL, 0, 0); { - ptrA szProto(db_get_sa(NULL, MODULENAME, "LastProto")); + ptrA szProto(g_plugin.getStringA("LastProto")); if (szProto) acs->proto = szProto; } @@ -317,7 +317,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM) Window_FreeIcon_IcoLib(hdlg); ImageList_Destroy((HIMAGELIST)SendDlgItemMessage(hdlg, IDC_PROTO, CBEM_GETIMAGELIST, 0, 0)); if (acs) { - db_set_s(NULL, MODULENAME, "LastProto", acs->proto); + g_plugin.setString("LastProto", acs->proto); if (acs->psr) { mir_free(acs->psr->nick.w); mir_free(acs->psr->firstName.w); diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index 37623ee409..9d068cf908 100755 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -229,7 +229,7 @@ bool UpdateAlarm(SYSTEMTIME &time, Occurrence occ, int selected_days) void LoadAlarms() { - int num_alarms = db_get_w(0, MODULENAME, "Count", 0); + int num_alarms = g_plugin.getWord("Count", 0); char buff[256]; DBVARIANT dbv; ALARM alarm; @@ -243,69 +243,69 @@ void LoadAlarms() memset(&alarm, 0, sizeof(ALARM)); mir_snprintf(buff, "Title%d", i); - if (!db_get_ws(0, MODULENAME, buff, &dbv)) { + if (!g_plugin.getWString(buff, &dbv)) { alarm.szTitle = mir_wstrdup(dbv.pwszVal); db_free(&dbv); } mir_snprintf(buff, "Desc%d", i); - if (!db_get_ws(0, MODULENAME, buff, &dbv)) { + if (!g_plugin.getWString(buff, &dbv)) { alarm.szDesc = mir_wstrdup(dbv.pwszVal); db_free(&dbv); } mir_snprintf(buff, "Occ%d", i); - alarm.occurrence = (Occurrence)db_get_w(0, MODULENAME, buff, 0); + alarm.occurrence = (Occurrence)g_plugin.getWord(buff, 0); mir_snprintf(buff, "STHour%d", i); - alarm.time.wHour = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wHour = g_plugin.getWord(buff, 0); mir_snprintf(buff, "STMinute%d", i); - alarm.time.wMinute = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wMinute = g_plugin.getWord(buff, 0); mir_snprintf(buff, "STSecond%d", i); - alarm.time.wSecond = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wSecond = g_plugin.getWord(buff, 0); switch (alarm.occurrence) { case OC_ONCE: mir_snprintf(buff, "STYear%d", i); - alarm.time.wYear = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wYear = g_plugin.getWord(buff, 0); mir_snprintf(buff, "STMonth%d", i); - alarm.time.wMonth = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wMonth = g_plugin.getWord(buff, 0); mir_snprintf(buff, "STDay%d", i); - alarm.time.wDay = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wDay = g_plugin.getWord(buff, 0); break; case OC_WEEKLY: mir_snprintf(buff, "STDayOfWeek%d", i); - alarm.time.wDayOfWeek = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wDayOfWeek = g_plugin.getWord(buff, 0); break; case OC_WEEKDAYS: break; case OC_SELECTED_DAYS: mir_snprintf(buff, "SelectedDays%d", i); - alarm.day_mask = db_get_dw(0, MODULENAME, buff, alarm.day_mask); + alarm.day_mask = g_plugin.getDword(buff, alarm.day_mask); break; case OC_DAILY: break; case OC_MONTHLY: mir_snprintf(buff, "STDay%d", i); - alarm.time.wDay = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wDay = g_plugin.getWord(buff, 0); break; case OC_YEARLY: mir_snprintf(buff, "STMonth%d", i); - alarm.time.wMonth = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wMonth = g_plugin.getWord(buff, 0); mir_snprintf(buff, "STDay%d", i); - alarm.time.wDay = db_get_w(0, MODULENAME, buff, 0); + alarm.time.wDay = g_plugin.getWord(buff, 0); break; } if (UpdateAlarm(alarm.time, alarm.occurrence, alarm.day_mask)) { mir_snprintf(buff, "ActionFlags%d", i); - alarm.action = (unsigned short)db_get_dw(0, MODULENAME, buff, AAF_POPUP | AAF_SOUND); + alarm.action = (unsigned short)g_plugin.getDword(buff, AAF_POPUP | AAF_SOUND); if (alarm.action & AAF_COMMAND) { mir_snprintf(buff, "ActionCommand%d", i); - if (!db_get_ws(0, MODULENAME, buff, &dbv)) { + if (!g_plugin.getWString(buff, &dbv)) { alarm.szCommand = mir_wstrdup(dbv.pwszVal); db_free(&dbv); mir_snprintf(buff, "ActionParams%d", i); - if (!db_get_ws(0, MODULENAME, buff, &dbv)) { + if (!g_plugin.getWString(buff, &dbv)) { alarm.szCommandParams = mir_wstrdup(dbv.pwszVal); db_free(&dbv); } @@ -313,22 +313,22 @@ void LoadAlarms() } mir_snprintf(buff, "SoundNum%d", i); - alarm.sound_num = (int)db_get_b(0, MODULENAME, buff, 1); + alarm.sound_num = (int)g_plugin.getByte(buff, 1); mir_snprintf(buff, "Snoozer%d", i); - alarm.snoozer = db_get_b(0, MODULENAME, buff, 0) == 1; + alarm.snoozer = g_plugin.getByte(buff, 0) == 1; mir_snprintf(buff, "Hidden%d", i); - alarm.flags |= (db_get_b(0, MODULENAME, buff, 0) == 1 ? ALF_HIDDEN : 0); + alarm.flags |= (g_plugin.getByte(buff, 0) == 1 ? ALF_HIDDEN : 0); mir_snprintf(buff, "Suspended%d", i); - alarm.flags |= (db_get_b(0, MODULENAME, buff, 0) == 1 ? ALF_SUSPENDED : 0); + alarm.flags |= (g_plugin.getByte(buff, 0) == 1 ? ALF_SUSPENDED : 0); mir_snprintf(buff, "NoStartup%d", i); - alarm.flags |= (db_get_b(0, MODULENAME, buff, 0) == 1 ? ALF_NOSTARTUP : 0); + alarm.flags |= (g_plugin.getByte(buff, 0) == 1 ? ALF_NOSTARTUP : 0); mir_snprintf(buff, "Flags%d", i); - alarm.flags = db_get_dw(0, MODULENAME, buff, alarm.flags); + alarm.flags = g_plugin.getDword(buff, alarm.flags); alarm.id = next_alarm_id++; alarms.push_back(&alarm); @@ -394,7 +394,7 @@ void SaveAlarms() db_enum_settings(0, &db_enum_settings_sub_cb, MODULENAME, &settings); for (std::list::iterator i = settings.begin(), end = settings.end(); i != end; ++i) { - db_unset(0, MODULENAME, *i); + g_plugin.delSetting(*i); mir_free(*i); } } @@ -403,18 +403,18 @@ void SaveAlarms() ALARM *i; for (alarms.reset(); i = alarms.current(); alarms.next(), index++) { mir_snprintf(buff, "Title%d", index); - db_set_ws(0, MODULENAME, buff, i->szTitle); + g_plugin.setWString(buff, i->szTitle); mir_snprintf(buff, "Desc%d", index); - db_set_ws(0, MODULENAME, buff, i->szDesc); + g_plugin.setWString(buff, i->szDesc); mir_snprintf(buff, "Occ%d", index); - db_set_w(0, MODULENAME, buff, i->occurrence); + g_plugin.setWord(buff, i->occurrence); mir_snprintf(buff, "STHour%d", index); - db_set_w(0, MODULENAME, buff, i->time.wHour); + g_plugin.setWord(buff, i->time.wHour); mir_snprintf(buff, "STMinute%d", index); - db_set_w(0, MODULENAME, buff, i->time.wMinute); + g_plugin.setWord(buff, i->time.wMinute); mir_snprintf(buff, "STSecond%d", index); - db_set_w(0, MODULENAME, buff, i->time.wSecond); + g_plugin.setWord(buff, i->time.wSecond); switch (i->occurrence) { case OC_DAILY: @@ -423,47 +423,47 @@ void SaveAlarms() break; case OC_SELECTED_DAYS: mir_snprintf(buff, "SelectedDays%d", index); - db_set_dw(0, MODULENAME, buff, i->day_mask); + g_plugin.setDword(buff, i->day_mask); break; case OC_WEEKLY: mir_snprintf(buff, "STDayOfWeek%d", index); - db_set_w(0, MODULENAME, buff, i->time.wDayOfWeek); + g_plugin.setWord(buff, i->time.wDayOfWeek); break; case OC_ONCE: mir_snprintf(buff, "STYear%d", index); - db_set_w(0, MODULENAME, buff, i->time.wYear); + g_plugin.setWord(buff, i->time.wYear); case OC_YEARLY: mir_snprintf(buff, "STMonth%d", index); - db_set_w(0, MODULENAME, buff, i->time.wMonth); + g_plugin.setWord(buff, i->time.wMonth); case OC_MONTHLY: mir_snprintf(buff, "STDay%d", index); - db_set_w(0, MODULENAME, buff, i->time.wDay); + g_plugin.setWord(buff, i->time.wDay); break; } mir_snprintf(buff, "ActionFlags%d", index); - db_set_dw(0, MODULENAME, buff, i->action); + g_plugin.setDword(buff, i->action); if (i->action & AAF_COMMAND) { if (mir_wstrlen(i->szCommand)) { mir_snprintf(buff, "ActionCommand%d", index); - db_set_ws(0, MODULENAME, buff, i->szCommand); + g_plugin.setWString(buff, i->szCommand); if (mir_wstrlen(i->szCommandParams)) { mir_snprintf(buff, "ActionParams%d", index); - db_set_ws(0, MODULENAME, buff, i->szCommandParams); + g_plugin.setWString(buff, i->szCommandParams); } } } mir_snprintf(buff, "SoundNum%d", index); - db_set_b(0, MODULENAME, buff, i->sound_num); + g_plugin.setByte(buff, i->sound_num); mir_snprintf(buff, "Snoozer%d", index); - db_set_b(0, MODULENAME, buff, i->snoozer ? 1 : 0); + g_plugin.setByte(buff, i->snoozer ? 1 : 0); mir_snprintf(buff, "Flags%d", index); - db_set_dw(0, MODULENAME, buff, i->flags); + g_plugin.setDword(buff, i->flags); } - db_set_w(0, MODULENAME, "Count", index); + g_plugin.setWord("Count", index); } void copy_list(AlarmList ©) @@ -692,7 +692,7 @@ void DoAlarm(ALARM *alarm) void WriteLastCheckTime() { // save last-check time - db_set_blob(NULL, MODULENAME, "LastCheck", &last_check, sizeof(SYSTEMTIME)); + db_set_blob(0, MODULENAME, "LastCheck", &last_check, sizeof(SYSTEMTIME)); last_saved_check = last_check; } @@ -785,7 +785,7 @@ void InitList() DBVARIANT dbv; dbv.type = DBVT_BLOB; dbv.cpbVal = sizeof(SYSTEMTIME); - if (!db_get(NULL, MODULENAME, "LastCheck", &dbv)) { + if (!db_get(0, MODULENAME, "LastCheck", &dbv)) { memcpy(&last_check, dbv.pbVal, sizeof(SYSTEMTIME)); db_free(&dbv); } diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index 921ca4f290..e064c1b27d 100755 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -46,12 +46,12 @@ LRESULT CALLBACK FrameContainerWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LP case WM_SHOWWINDOW: if (wParam) { - db_set_b(0, MODULENAME, "ReminderFrameVisible", 1); + g_plugin.setByte("ReminderFrameVisible", 1); Utils_RestoreWindowPosition(hwnd, 0, MODULENAME, "reminders_window"); PostMessage(hwnd, WM_SIZE, 0, 0); } else { - db_set_b(0, MODULENAME, "ReminderFrameVisible", 0); + g_plugin.setByte("ReminderFrameVisible", 0); Utils_SaveWindowPosition(hwnd, 0, MODULENAME, "reminders_window"); } break; @@ -542,7 +542,7 @@ int CreateFrame() else ShowWindow(hwnd_frame, SW_HIDE); } else { - if (db_get_b(0, MODULENAME, "ReminderFrameVisible", 1) == 1) { + if (g_plugin.getByte("ReminderFrameVisible", 1) == 1) { ShowWindow(hwnd_frame, SW_SHOW); RefreshReminderFrame(); } diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 5b57bb9c4c..bf75d40ced 100755 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -1223,36 +1223,36 @@ int OptInit(WPARAM wParam, LPARAM) void LoadOptions() { - options.use_popup_module = (db_get_b(0, MODULENAME, "UsePopupModule", 0) == 1); - options.snooze_minutes = (int)db_get_dw(0, MODULENAME, "SnoozeMinutes", 10); - options.row_height = (int)db_get_dw(0, MODULENAME, "RowHeight", 20); - options.indent = (int)db_get_dw(0, MODULENAME, "Indent", 5); - options.aw_trans = (int)db_get_b(0, MODULENAME, "Transparency", 0); - options.aw_roundcorners = (db_get_b(0, MODULENAME, "RoundCorners", 1) == 1); - options.aw_dontstealfocus = (db_get_b(0, MODULENAME, "DontStealFocus", 1) == 1); - options.auto_showhide = (db_get_b(0, MODULENAME, "AutoShowHide", 0) == 1); - options.hide_with_clist = (db_get_b(0, MODULENAME, "HideWithClist", 0) == 1); - options.loop_sound = (db_get_b(0, MODULENAME, "LoopSound", 1) == 1); - options.auto_size_vert = (db_get_b(0, MODULENAME, "AutoSize", 0) == 1); - options.reminder_period = (int)db_get_dw(0, MODULENAME, "ReminderPeriod", 8); + options.use_popup_module = (g_plugin.getByte("UsePopupModule", 0) == 1); + options.snooze_minutes = (int)g_plugin.getDword("SnoozeMinutes", 10); + options.row_height = (int)g_plugin.getDword("RowHeight", 20); + options.indent = (int)g_plugin.getDword("Indent", 5); + options.aw_trans = (int)g_plugin.getByte("Transparency", 0); + options.aw_roundcorners = (g_plugin.getByte("RoundCorners", 1) == 1); + options.aw_dontstealfocus = (g_plugin.getByte("DontStealFocus", 1) == 1); + options.auto_showhide = (g_plugin.getByte("AutoShowHide", 0) == 1); + options.hide_with_clist = (g_plugin.getByte("HideWithClist", 0) == 1); + options.loop_sound = (g_plugin.getByte("LoopSound", 1) == 1); + options.auto_size_vert = (g_plugin.getByte("AutoSize", 0) == 1); + options.reminder_period = (int)g_plugin.getDword("ReminderPeriod", 8); HookEvent(ME_SYSTEM_MODULESLOADED, OptionsModulesLoaded); } void SaveOptions() { - db_set_b(0, MODULENAME, "UsePopupModule", options.use_popup_module ? 1 : 0); - db_set_dw(0, MODULENAME, "SnoozeMinutes", options.snooze_minutes); - db_set_dw(0, MODULENAME, "RowHeight", options.row_height); - db_set_dw(0, MODULENAME, "Indent", options.indent); - db_set_b(0, MODULENAME, "Transparency", options.aw_trans); - db_set_b(0, MODULENAME, "RoundCorners", options.aw_roundcorners ? 1 : 0); - db_set_b(0, MODULENAME, "DontStealFocus", options.aw_dontstealfocus ? 1 : 0); - db_set_b(0, MODULENAME, "AutoShowHide", options.auto_showhide ? 1 : 0); - db_set_b(0, MODULENAME, "HideWithClist", options.hide_with_clist ? 1 : 0); - db_set_b(0, MODULENAME, "LoopSound", options.loop_sound ? 1 : 0); - db_set_b(0, MODULENAME, "AutoSize", options.auto_size_vert ? 1 : 0); - db_set_dw(0, MODULENAME, "ReminderPeriod", options.reminder_period); + g_plugin.setByte("UsePopupModule", options.use_popup_module ? 1 : 0); + g_plugin.setDword("SnoozeMinutes", options.snooze_minutes); + g_plugin.setDword("RowHeight", options.row_height); + g_plugin.setDword("Indent", options.indent); + g_plugin.setByte("Transparency", options.aw_trans); + g_plugin.setByte("RoundCorners", options.aw_roundcorners ? 1 : 0); + g_plugin.setByte("DontStealFocus", options.aw_dontstealfocus ? 1 : 0); + g_plugin.setByte("AutoShowHide", options.auto_showhide ? 1 : 0); + g_plugin.setByte("HideWithClist", options.hide_with_clist ? 1 : 0); + g_plugin.setByte("LoopSound", options.loop_sound ? 1 : 0); + g_plugin.setByte("AutoSize", options.auto_size_vert ? 1 : 0); + g_plugin.setDword("ReminderPeriod", options.reminder_period); } INT_PTR NewAlarmMenuFunc(WPARAM, LPARAM) diff --git a/plugins/AsSingleWindow/src/Options.cpp b/plugins/AsSingleWindow/src/Options.cpp index 8e7659e79c..3bbabf2c9c 100644 --- a/plugins/AsSingleWindow/src/Options.cpp +++ b/plugins/AsSingleWindow/src/Options.cpp @@ -98,8 +98,8 @@ void dlgUpdateControls(HWND hWnd) void optionsLoad() { - pluginVars.Options.DrivenWindowPos = db_get_b(0, MODULENAME, "DrivenWindowPosition", ASW_CLWINDOWPOS_RIGHT); - pluginVars.Options.WindowsMerging = db_get_b(0, MODULENAME, "WindowsMerging", ASW_WINDOWS_MERGEONE); + pluginVars.Options.DrivenWindowPos = g_plugin.getByte("DrivenWindowPosition", ASW_CLWINDOWPOS_RIGHT); + pluginVars.Options.WindowsMerging = g_plugin.getByte("WindowsMerging", ASW_WINDOWS_MERGEONE); } void optionsUpdate(HWND hWnd) @@ -117,6 +117,6 @@ void optionsUpdate(HWND hWnd) void optionsSave() { - db_set_b(0, MODULENAME, "DrivenWindowPosition", pluginVars.Options.DrivenWindowPos); - db_set_b(0, MODULENAME, "WindowsMerging", pluginVars.Options.WindowsMerging); + g_plugin.setByte("DrivenWindowPosition", pluginVars.Options.DrivenWindowPos); + g_plugin.setByte("WindowsMerging", pluginVars.Options.WindowsMerging); } 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); diff --git a/plugins/AutoShutdown/src/frame.cpp b/plugins/AutoShutdown/src/frame.cpp index 3c1f18750e..ad77a5223b 100644 --- a/plugins/AutoShutdown/src/frame.cpp +++ b/plugins/AutoShutdown/src/frame.cpp @@ -39,7 +39,7 @@ static COLORREF GetDefaultColor(BYTE id) case FRAMEELEMENT_BAR: return RGB(250, 0, 0); /* same color as used on header icon */ case FRAMEELEMENT_BKGRND: - return (COLORREF)db_get_dw(NULL, "CLC", "BkColour", CLCDEFAULT_BKCOLOUR); + return (COLORREF)db_get_dw(0, "CLC", "BkColour", CLCDEFAULT_BKCOLOUR); case FRAMEELEMENT_TEXT: return GetSysColor(COLOR_WINDOWTEXT); } @@ -288,14 +288,14 @@ static LRESULT CALLBACK FrameWndProc(HWND hwndFrame, UINT msg, WPARAM wParam, LP } case M_SET_COUNTDOWN: if (dat->fTimeFlags&SDWTF_ST_TIME) { - dat->settingLastTime = (time_t)db_get_dw(NULL, MODULENAME, "TimeStamp", SETTING_TIMESTAMP_DEFAULT); + dat->settingLastTime = (time_t)g_plugin.getDword("TimeStamp", SETTING_TIMESTAMP_DEFAULT); dat->countdown = time(0); if (dat->settingLastTime > dat->countdown) dat->countdown = dat->settingLastTime - dat->countdown; else dat->countdown = 0; } else if (dat->flags&FWPDF_COUNTDOWNINVALID) { - dat->countdown = (time_t)db_get_dw(NULL, MODULENAME, "Countdown", SETTING_COUNTDOWN_DEFAULT); - dat->countdown *= (time_t)db_get_dw(NULL, MODULENAME, "CountdownUnit", SETTING_COUNTDOWNUNIT_DEFAULT); + dat->countdown = (time_t)g_plugin.getDword("Countdown", SETTING_COUNTDOWN_DEFAULT); + dat->countdown *= (time_t)g_plugin.getDword("CountdownUnit", SETTING_COUNTDOWNUNIT_DEFAULT); } dat->flags &= ~FWPDF_COUNTDOWNINVALID; /* commctl 4.70+, Win95: 1-100 will work fine (wrap around) */ diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp index f46c1d344e..3c79c94384 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -31,7 +31,7 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); { - WORD setting = db_get_w(NULL, MODULENAME, "ConfirmDlgCountdown", SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT); + WORD setting = g_plugin.getWord("ConfirmDlgCountdown", SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT); if (setting < 3) setting = SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT; SendDlgItemMessage(hwndDlg, IDC_SPIN_CONFIRMDLGCOUNTDOWN, UDM_SETRANGE, 0, MAKELPARAM(999, 3)); @@ -39,15 +39,15 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam SendDlgItemMessage(hwndDlg, IDC_SPIN_CONFIRMDLGCOUNTDOWN, UDM_SETPOS, 0, MAKELPARAM(setting, 0)); SetDlgItemInt(hwndDlg, IDC_EDIT_CONFIRMDLGCOUNTDOWN, setting, FALSE); } - CheckDlgButton(hwndDlg, IDC_CHECK_SMARTOFFLINECHECK, db_get_b(NULL, MODULENAME, "SmartOfflineCheck", SETTING_SMARTOFFLINECHECK_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_CHECK_REMEMBERONRESTART, db_get_b(NULL, MODULENAME, "RememberOnRestart", SETTING_REMEMBERONRESTART_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_CHECK_SHOWCONFIRMDLG, db_get_b(NULL, MODULENAME, "ShowConfirmDlg", SETTING_SHOWCONFIRMDLG_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CHECK_SMARTOFFLINECHECK, g_plugin.getByte("SmartOfflineCheck", SETTING_SMARTOFFLINECHECK_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CHECK_REMEMBERONRESTART, g_plugin.getByte("RememberOnRestart", SETTING_REMEMBERONRESTART_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CHECK_SHOWCONFIRMDLG, g_plugin.getByte("ShowConfirmDlg", SETTING_SHOWCONFIRMDLG_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); { BOOL enabled = ServiceIsTypeEnabled(SDSDT_SHUTDOWN, 0); if (enabled) { if (ServiceExists(MS_WEATHER_UPDATE)) { EnableWindow(GetDlgItem(hwndDlg, IDC_CHECK_WEATHER), TRUE); - CheckDlgButton(hwndDlg, IDC_CHECK_WEATHER, db_get_b(NULL, MODULENAME, "WeatherShutdown", SETTING_WEATHERSHUTDOWN_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CHECK_WEATHER, g_plugin.getByte("WeatherShutdown", SETTING_WEATHERSHUTDOWN_DEFAULT) != 0 ? BST_CHECKED : BST_UNCHECKED); } } } @@ -85,12 +85,12 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam case WM_NOTIFY: switch (((NMHDR*)lParam)->code) { case PSN_APPLY: - db_set_b(NULL, MODULENAME, "ShowConfirmDlg", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOWCONFIRMDLG) != 0)); - db_set_w(NULL, MODULENAME, "ConfirmDlgCountdown", (WORD)GetDlgItemInt(hwndDlg, IDC_EDIT_CONFIRMDLGCOUNTDOWN, nullptr, FALSE)); - db_set_b(NULL, MODULENAME, "RememberOnRestart", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_REMEMBERONRESTART) != 0)); - db_set_b(NULL, MODULENAME, "SmartOfflineCheck", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SMARTOFFLINECHECK) != 0)); + g_plugin.setByte("ShowConfirmDlg", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOWCONFIRMDLG) != 0)); + g_plugin.setWord("ConfirmDlgCountdown", (WORD)GetDlgItemInt(hwndDlg, IDC_EDIT_CONFIRMDLGCOUNTDOWN, nullptr, FALSE)); + g_plugin.setByte("RememberOnRestart", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_REMEMBERONRESTART) != 0)); + g_plugin.setByte("SmartOfflineCheck", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_SMARTOFFLINECHECK) != 0)); if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_CHECK_WEATHER))) - db_set_b(NULL, MODULENAME, "WeatherShutdown", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_WEATHER) != 0)); + g_plugin.setByte("WeatherShutdown", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_CHECK_WEATHER) != 0)); return TRUE; } break; diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 3109286671..bb39c0fc18 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -81,7 +81,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L } /* read-in watcher flags */ { - WORD watcherType = db_get_w(NULL, MODULENAME, "WatcherFlags", SETTING_WATCHERFLAGS_DEFAULT); + WORD watcherType = g_plugin.getWord("WatcherFlags", SETTING_WATCHERFLAGS_DEFAULT); CheckRadioButton(hwndDlg, IDC_RADIO_STTIME, IDC_RADIO_STCOUNTDOWN, (watcherType&SDWTF_ST_TIME) ? IDC_RADIO_STTIME : IDC_RADIO_STCOUNTDOWN); CheckDlgButton(hwndDlg, IDC_CHECK_SPECIFICTIME, (watcherType&SDWTF_SPECIFICTIME) != 0 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CHECK_MESSAGE, (watcherType&SDWTF_MESSAGE) != 0 ? BST_CHECKED : BST_UNCHECKED); @@ -93,14 +93,14 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L /* read-in countdown val */ { SYSTEMTIME st; - if (!TimeStampToSystemTime((time_t)db_get_dw(NULL, MODULENAME, "TimeStamp", SETTING_TIMESTAMP_DEFAULT), &st)) + if (!TimeStampToSystemTime((time_t)g_plugin.getDword("TimeStamp", SETTING_TIMESTAMP_DEFAULT), &st)) GetLocalTime(&st); DateTime_SetSystemtime(GetDlgItem(hwndDlg, IDC_TIME_TIMESTAMP), GDT_VALID, &st); DateTime_SetSystemtime(GetDlgItem(hwndDlg, IDC_DATE_TIMESTAMP), GDT_VALID, &st); SendMessage(hwndDlg, M_CHECK_DATETIME, 0, 0); } { - DWORD setting = db_get_dw(NULL, MODULENAME, "Countdown", SETTING_COUNTDOWN_DEFAULT); + DWORD setting = g_plugin.getDword("Countdown", SETTING_COUNTDOWN_DEFAULT); if (setting < 1) setting = SETTING_COUNTDOWN_DEFAULT; SendDlgItemMessage(hwndDlg, IDC_SPIN_COUNTDOWN, UDM_SETRANGE, 0, MAKELPARAM(UD_MAXVAL, 1)); SendDlgItemMessage(hwndDlg, IDC_EDIT_COUNTDOWN, EM_SETLIMITTEXT, (WPARAM)10, 0); @@ -109,7 +109,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L } { HWND hwndCombo = GetDlgItem(hwndDlg, IDC_COMBO_COUNTDOWNUNIT); - DWORD lastUnit = db_get_dw(NULL, MODULENAME, "CountdownUnit", SETTING_COUNTDOWNUNIT_DEFAULT); + DWORD lastUnit = g_plugin.getDword("CountdownUnit", SETTING_COUNTDOWNUNIT_DEFAULT); SendMessage(hwndCombo, CB_SETLOCALE, (WPARAM)locale, 0); /* sort order */ SendMessage(hwndCombo, CB_INITSTORAGE, _countof(unitNames), _countof(unitNames) * 16); /* approx. */ for (int i = 0; i < _countof(unitNames); ++i) { @@ -122,14 +122,14 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L } { DBVARIANT dbv; - if (!db_get_ws(NULL, MODULENAME, "Message", &dbv)) { + if (!g_plugin.getWString("Message", &dbv)) { SetDlgItemText(hwndDlg, IDC_EDIT_MESSAGE, dbv.pwszVal); mir_free(dbv.pwszVal); } } /* cpuusage threshold */ { - BYTE setting = DBGetContactSettingRangedByte(NULL, MODULENAME, "CpuUsageThreshold", SETTING_CPUUSAGETHRESHOLD_DEFAULT, 1, 100); + BYTE setting = DBGetContactSettingRangedByte(0, MODULENAME, "CpuUsageThreshold", SETTING_CPUUSAGETHRESHOLD_DEFAULT, 1, 100); SendDlgItemMessage(hwndDlg, IDC_SPIN_CPUUSAGE, UDM_SETRANGE, 0, MAKELPARAM(100, 1)); SendDlgItemMessage(hwndDlg, IDC_EDIT_CPUUSAGE, EM_SETLIMITTEXT, (WPARAM)3, 0); SendDlgItemMessage(hwndDlg, IDC_SPIN_CPUUSAGE, UDM_SETPOS, 0, MAKELPARAM(setting, 0)); @@ -138,7 +138,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L /* shutdown types */ { HWND hwndCombo = GetDlgItem(hwndDlg, IDC_COMBO_SHUTDOWNTYPE); - BYTE lastShutdownType = db_get_b(NULL, MODULENAME, "ShutdownType", SETTING_SHUTDOWNTYPE_DEFAULT); + BYTE lastShutdownType = g_plugin.getByte("ShutdownType", SETTING_SHUTDOWNTYPE_DEFAULT); SendMessage(hwndCombo, CB_SETLOCALE, (WPARAM)locale, 0); /* sort order */ SendMessage(hwndCombo, CB_SETEXTENDEDUI, TRUE, 0); SendMessage(hwndCombo, CB_INITSTORAGE, SDSDT_MAX, SDSDT_MAX * 32); @@ -340,7 +340,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L wchar_t *pszText = (wchar_t*)mir_alloc(len*sizeof(wchar_t)); if (pszText != nullptr && GetWindowText(hwndEdit, pszText, len + 1)) { TrimString(pszText); - db_set_ws(NULL, MODULENAME, "Message", pszText); + g_plugin.setWString("Message", pszText); } mir_free(pszText); /* does NULL check */ } @@ -351,18 +351,18 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L DateTime_GetSystemtime(GetDlgItem(hwndDlg, IDC_TIME_TIMESTAMP), &st); /* time gets synchronized */ if (!SystemTimeToTimeStamp(&st, ×tamp)) timestamp = time(0); - db_set_dw(NULL, MODULENAME, "TimeStamp", (DWORD)timestamp); + g_plugin.setDword("TimeStamp", (DWORD)timestamp); } /* shutdown type */ { int index = SendDlgItemMessage(hwndDlg, IDC_COMBO_SHUTDOWNTYPE, CB_GETCURSEL, 0, 0); if (index != LB_ERR) - db_set_b(NULL, MODULENAME, "ShutdownType", (BYTE)SendDlgItemMessage(hwndDlg, IDC_COMBO_SHUTDOWNTYPE, CB_GETITEMDATA, (WPARAM)index, 0)); + g_plugin.setByte("ShutdownType", (BYTE)SendDlgItemMessage(hwndDlg, IDC_COMBO_SHUTDOWNTYPE, CB_GETITEMDATA, (WPARAM)index, 0)); index = SendDlgItemMessage(hwndDlg, IDC_COMBO_COUNTDOWNUNIT, CB_GETCURSEL, 0, 0); if (index != LB_ERR) - db_set_dw(NULL, MODULENAME, "CountdownUnit", (DWORD)SendDlgItemMessage(hwndDlg, IDC_COMBO_COUNTDOWNUNIT, CB_GETITEMDATA, (WPARAM)index, 0)); - db_set_dw(NULL, MODULENAME, "Countdown", (DWORD)GetDlgItemInt(hwndDlg, IDC_EDIT_COUNTDOWN, nullptr, FALSE)); - db_set_b(NULL, MODULENAME, "CpuUsageThreshold", (BYTE)GetDlgItemInt(hwndDlg, IDC_EDIT_CPUUSAGE, nullptr, FALSE)); + g_plugin.setDword("CountdownUnit", (DWORD)SendDlgItemMessage(hwndDlg, IDC_COMBO_COUNTDOWNUNIT, CB_GETITEMDATA, (WPARAM)index, 0)); + g_plugin.setDword("Countdown", (DWORD)GetDlgItemInt(hwndDlg, IDC_EDIT_COUNTDOWN, nullptr, FALSE)); + g_plugin.setByte("CpuUsageThreshold", (BYTE)GetDlgItemInt(hwndDlg, IDC_EDIT_CPUUSAGE, nullptr, FALSE)); } /* watcher type */ { @@ -373,7 +373,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_IDLE)) watcherType |= SDWTF_IDLE; if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_STATUS)) watcherType |= SDWTF_STATUS; if (IsDlgButtonChecked(hwndDlg, IDC_CHECK_CPUUSAGE)) watcherType |= SDWTF_CPUUSAGE; - db_set_w(NULL, MODULENAME, "WatcherFlags", watcherType); + g_plugin.setWord("WatcherFlags", watcherType); ServiceStartWatcher(0, watcherType); } DestroyWindow(hwndDlg); diff --git a/plugins/AutoShutdown/src/shutdownsvc.cpp b/plugins/AutoShutdown/src/shutdownsvc.cpp index b6f4ac85e0..d8f6df0dac 100644 --- a/plugins/AutoShutdown/src/shutdownsvc.cpp +++ b/plugins/AutoShutdown/src/shutdownsvc.cpp @@ -321,7 +321,7 @@ static INT_PTR CALLBACK ShutdownDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TEXT_HEADER), GWLP_USERDATA, (LONG_PTR)hBoldFont); } { - countdown = db_get_w(NULL, MODULENAME, "ConfirmDlgCountdown", SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT); + countdown = g_plugin.getWord("ConfirmDlgCountdown", SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT); if (countdown < 3) countdown = SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT; SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_TEXT_HEADER), GWLP_USERDATA, countdown); @@ -416,7 +416,7 @@ static INT_PTR CALLBACK ShutdownDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L INT_PTR ServiceShutdown(WPARAM wParam, LPARAM lParam) { /* passing 0 as wParam is only to be used internally, undocumented */ - if (!wParam) wParam = db_get_b(NULL, MODULENAME, "ShutdownType", SETTING_SHUTDOWNTYPE_DEFAULT); + if (!wParam) wParam = g_plugin.getByte("ShutdownType", SETTING_SHUTDOWNTYPE_DEFAULT); if (!IsShutdownTypeEnabled((BYTE)wParam)) return 1; /* does shutdownType range check */ if ((BOOL)lParam && hwndShutdownDlg != nullptr) return 2; @@ -428,7 +428,7 @@ INT_PTR ServiceShutdown(WPARAM wParam, LPARAM lParam) /* tell others */ NotifyEventHooks(hEventShutdown, wParam, lParam); /* show dialog */ - if (lParam && db_get_b(NULL, MODULENAME, "ShowConfirmDlg", SETTING_SHOWCONFIRMDLG_DEFAULT)) + if (lParam && g_plugin.getByte("ShowConfirmDlg", SETTING_SHOWCONFIRMDLG_DEFAULT)) if (CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_SHUTDOWNNOW), nullptr, ShutdownDlgProc, (BYTE)wParam) != nullptr) return 0; /* show error */ diff --git a/plugins/AutoShutdown/src/watcher.cpp b/plugins/AutoShutdown/src/watcher.cpp index 529954f758..3973b251f9 100644 --- a/plugins/AutoShutdown/src/watcher.cpp +++ b/plugins/AutoShutdown/src/watcher.cpp @@ -99,7 +99,7 @@ static int MsgEventAdded(WPARAM, LPARAM hDbEvent) if (!db_event_get(hDbEvent, &dbe)) if (dbe.eventType == EVENTTYPE_MESSAGE && !(dbe.flags & DBEF_SENT)) { DBVARIANT dbv; - if (!db_get_ws(NULL, MODULENAME, "Message", &dbv)) { + if (!g_plugin.getWString("Message", &dbv)) { TrimString(dbv.pwszVal); wchar_t *pszMsg = GetMessageText(&dbe.pBlob, &dbe.cbBlob); if (pszMsg != nullptr && wcsstr(pszMsg, dbv.pwszVal) != nullptr) @@ -175,7 +175,7 @@ static int IdleChanged(WPARAM, LPARAM lParam) static BOOL CheckAllContactsOffline(void) { BOOL fSmartCheck, fAllOffline = TRUE; /* tentatively */ - fSmartCheck = db_get_b(NULL, MODULENAME, "SmartOfflineCheck", SETTING_SMARTOFFLINECHECK_DEFAULT); + fSmartCheck = g_plugin.getByte("SmartOfflineCheck", SETTING_SMARTOFFLINECHECK_DEFAULT); for (auto &hContact : Contacts()) { char *pszProto = GetContactProto(hContact); if (pszProto != nullptr && Proto_GetStatus(pszProto) != ID_STATUS_OFFLINE) { @@ -236,7 +236,7 @@ static int WeatherUpdated(WPARAM wParam, LPARAM lParam) { char *pszProto = GetContactProto(wParam); if ((BOOL)lParam && pszProto != nullptr && Proto_GetStatus(pszProto) == THUNDER) - if (db_get_b(NULL, MODULENAME, "WeatherShutdown", SETTING_WEATHERSHUTDOWN_DEFAULT)) + if (g_plugin.getByte("WeatherShutdown", SETTING_WEATHERSHUTDOWN_DEFAULT)) ServiceShutdown(SDSDT_SHUTDOWN, TRUE); return 0; } @@ -247,7 +247,7 @@ INT_PTR ServiceStartWatcher(WPARAM, LPARAM lParam) { /* passing watcherType as lParam is only to be used internally, undocumented */ if (lParam == 0) - lParam = (LPARAM)db_get_w(NULL, MODULENAME, "WatcherFlags", 0); + lParam = (LPARAM)g_plugin.getWord("WatcherFlags", 0); /* invalid flags or empty? */ if (!(lParam&SDWTF_MASK)) @@ -276,7 +276,7 @@ INT_PTR ServiceStartWatcher(WPARAM, LPARAM lParam) ShowCountdownFrame(currentWatcherType); /* after modules loaded */ /* Cpu Shutdown */ if (currentWatcherType&SDWTF_CPUUSAGE) - idCpuUsageThread = PollCpuUsage(CpuUsageWatcherProc, (LPARAM)DBGetContactSettingRangedByte(NULL, MODULENAME, "CpuUsageThreshold", SETTING_CPUUSAGETHRESHOLD_DEFAULT, 1, 100), 1500); + idCpuUsageThread = PollCpuUsage(CpuUsageWatcherProc, (LPARAM)DBGetContactSettingRangedByte(0, MODULENAME, "CpuUsageThreshold", SETTING_CPUUSAGETHRESHOLD_DEFAULT, 1, 100), 1500); /* Transfer Shutdown */ if (currentWatcherType&SDWTF_FILETRANSFER && !nTransfersCount) ShutdownAndStopWatcher(); @@ -317,8 +317,8 @@ void WatcherModulesLoaded(void) hHookWeatherUpdated = HookEvent(ME_WEATHER_UPDATED, WeatherUpdated); /* restore watcher if it was running on last exit */ - if (db_get_b(NULL, MODULENAME, "RememberOnRestart", 0) == SDROR_RUNNING) { - db_set_b(NULL, MODULENAME, "RememberOnRestart", 1); + if (g_plugin.getByte("RememberOnRestart", 0) == SDROR_RUNNING) { + g_plugin.setByte("RememberOnRestart", 1); ServiceStartWatcher(0, 0); /* after modules loaded */ } } @@ -350,8 +350,8 @@ void UninitWatcher(void) { /* remember watcher if running */ if (!ServiceStopWatcher(0, 0)) - if (db_get_b(NULL, MODULENAME, "RememberOnRestart", SETTING_REMEMBERONRESTART_DEFAULT)) - db_set_b(NULL, MODULENAME, "RememberOnRestart", SDROR_RUNNING); + if (g_plugin.getByte("RememberOnRestart", SETTING_REMEMBERONRESTART_DEFAULT)) + g_plugin.setByte("RememberOnRestart", SDROR_RUNNING); /* Message Shutdown */ UnhookEvent(hHookEventAdded); diff --git a/plugins/AvatarHistory/src/AvatarDlg.cpp b/plugins/AvatarHistory/src/AvatarDlg.cpp index 3cd569c8ce..664f1892b8 100644 --- a/plugins/AvatarHistory/src/AvatarDlg.cpp +++ b/plugins/AvatarHistory/src/AvatarDlg.cpp @@ -116,7 +116,7 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA AvatarDialogData *data = (struct AvatarDialogData*) lParam; SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)createDefaultOverlayedIcon(TRUE)); SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)createDefaultOverlayedIcon(FALSE)); - if (db_get_b(NULL, MODULENAME, "LogToHistory", AVH_DEF_LOGTOHISTORY)) + if (g_plugin.getByte("LogToHistory", AVH_DEF_LOGTOHISTORY)) FillAvatarListFromDB(hwndList, data->hContact); else if (opts.log_store_as_hash) FillAvatarListFromFolder(hwndList, data->hContact); @@ -310,7 +310,7 @@ static INT_PTR CALLBACK AvatarDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA wchar_t avfolder[MAX_PATH]; MCONTACT hContact = (MCONTACT)GetWindowLongPtr(hwnd, GWLP_USERDATA); GetContactFolder(avfolder, hContact); - ShellExecute(nullptr, db_get_b(NULL, MODULENAME, "OpenFolderMethod", 0) ? L"explore" : L"open", avfolder, nullptr, nullptr, SW_SHOWNORMAL); + ShellExecute(nullptr, g_plugin.getByte("OpenFolderMethod", 0) ? L"explore" : L"open", avfolder, nullptr, nullptr, SW_SHOWNORMAL); return TRUE; } break; diff --git a/plugins/AvatarHistory/src/AvatarHistory.cpp b/plugins/AvatarHistory/src/AvatarHistory.cpp index d15b8062bb..7ed09f7e59 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.cpp +++ b/plugins/AvatarHistory/src/AvatarHistory.cpp @@ -283,7 +283,7 @@ int CMPlugin::Load() CoInitialize(nullptr); // Is first run? - if (db_get_b(NULL, MODULENAME, "FirstRun", 1)) { + if (g_plugin.getByte("FirstRun", 1)) { // Show dialog int ret = DialogBoxParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_FIRST_RUN), nullptr, FirstRunDlgProc, 0); if (ret == 0) @@ -291,29 +291,29 @@ int CMPlugin::Load() // Write settings - db_set_b(NULL, MODULENAME, "LogToDisk", 1); + g_plugin.setByte("LogToDisk", 1); if (ret == IDC_MIR_SAME) - db_set_b(NULL, MODULENAME, "LogKeepSameFolder", 1); + g_plugin.setByte("LogKeepSameFolder", 1); else - db_set_b(NULL, MODULENAME, "LogKeepSameFolder", 0); + g_plugin.setByte("LogKeepSameFolder", 0); if (ret == IDC_MIR_SHORT || ret == IDC_SHORT || ret == IDC_DUP) - db_set_b(NULL, MODULENAME, "LogPerContactFolders", 1); + g_plugin.setByte("LogPerContactFolders", 1); else - db_set_b(NULL, MODULENAME, "LogPerContactFolders", 0); + g_plugin.setByte("LogPerContactFolders", 0); if (ret == IDC_DUP) - db_set_b(NULL, MODULENAME, "StoreAsHash", 0); + g_plugin.setByte("StoreAsHash", 0); else - db_set_b(NULL, MODULENAME, "StoreAsHash", 1); + g_plugin.setByte("StoreAsHash", 1); if (ret == IDC_MIR_SAME || ret == IDC_MIR_PROTO || ret == IDC_MIR_SHORT) - db_set_b(NULL, MODULENAME, "LogToHistory", 1); + g_plugin.setByte("LogToHistory", 1); else - db_set_b(NULL, MODULENAME, "LogToHistory", 0); + g_plugin.setByte("LogToHistory", 0); - db_set_b(NULL, MODULENAME, "FirstRun", 0); + g_plugin.setByte("FirstRun", 0); } LoadOptions(); diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index 3ea17f3fff..900bdf1c7a 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -170,7 +170,7 @@ void LoadOptions() LoadOpts(optionsControls, _countof(optionsControls), MODULENAME); LoadOpts(popupsControls, _countof(popupsControls), MODULENAME); - opts.log_per_contact_folders = db_get_b(NULL, MODULENAME, "LogPerContactFolders", 0); - opts.log_keep_same_folder = db_get_b(NULL, MODULENAME, "LogKeepSameFolder", 0); - opts.log_store_as_hash = db_get_b(NULL, MODULENAME, "StoreAsHash", 1); + opts.log_per_contact_folders = g_plugin.getByte("LogPerContactFolders", 0); + opts.log_keep_same_folder = g_plugin.getByte("LogKeepSameFolder", 0); + opts.log_store_as_hash = g_plugin.getByte("StoreAsHash", 1); } diff --git a/plugins/AvatarHistory/src/popup.cpp b/plugins/AvatarHistory/src/popup.cpp index ead52b114d..fad9b3c33a 100644 --- a/plugins/AvatarHistory/src/popup.cpp +++ b/plugins/AvatarHistory/src/popup.cpp @@ -74,7 +74,7 @@ void ShowPopup(MCONTACT hContact, const wchar_t *title, const wchar_t *descripti void ShowDebugPopup(MCONTACT hContact, const wchar_t *title, const wchar_t *description) { - if (db_get_b(NULL, MODULENAME, "Debug", 0)) { + if (g_plugin.getByte("Debug", 0)) { ShowPopup(hContact, title, description); } } diff --git a/plugins/AvatarHistory/src/utils.cpp b/plugins/AvatarHistory/src/utils.cpp index 9b70f7f762..a3af7ab9bd 100644 --- a/plugins/AvatarHistory/src/utils.cpp +++ b/plugins/AvatarHistory/src/utils.cpp @@ -38,7 +38,7 @@ bool ContactEnabled(MCONTACT hContact, char *setting, int def) if (!ProtocolEnabled(proto)) return false; - BYTE globpref = db_get_b(NULL, MODULENAME, setting, def); + BYTE globpref = g_plugin.getByte(setting, def); BYTE userpref = db_get_b(hContact, MODULENAME, setting, BST_INDETERMINATE); return (globpref && userpref == BST_INDETERMINATE) || userpref == BST_CHECKED; diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 71b3c8ad6f..2abe66e2bf 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -92,7 +92,7 @@ static int OnPlaySnd(WPARAM wParam, LPARAM lParam) case ID_STATUS_ONLINE: currstat <<= 1; } - if (!db_get_b(NULL, "Skin", "UseSound", 0)) + if (!db_get_b(0, "Skin", "UseSound", 0)) doPlay = FALSE; if (QuietTime) @@ -192,7 +192,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara SendDlgItemMessage(hwndDlg, IDC_OUTDEVICE, CB_SETCURSEL, 0, 0); BASS_DEVICEINFO info; - ptrW tszDeviceName(db_get_wsa(NULL, MODULENAME, OPT_OUTDEVICE)); + ptrW tszDeviceName(g_plugin.getWStringA(OPT_OUTDEVICE)); for (int i = 1; BASS_GetDeviceInfo(i + newBass, &info); i++) { SendDlgItemMessage(hwndDlg, IDC_OUTDEVICE, CB_ADDSTRING, 0, _A2T(info.name)); if (!mir_wstrcmp(tszDeviceName, _A2T(info.name))) @@ -221,29 +221,29 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara SYSTEMTIME systime = { 0 }; GetDlgItemText(hwndDlg, IDC_OUTDEVICE, tmp, _countof(tmp)); - db_set_ws(NULL, MODULENAME, OPT_OUTDEVICE, tmp); + g_plugin.setWString(OPT_OUTDEVICE, tmp); Volume = (DWORD)SendDlgItemMessage(hwndDlg, IDC_VOLUME, TBM_GETPOS, 0, 0); - db_set_b(NULL, MODULENAME, OPT_VOLUME, Volume); + g_plugin.setByte(OPT_VOLUME, Volume); sndLimSnd = SendDlgItemMessage(hwndDlg, IDC_MAXCHANNEL, CB_GETCURSEL, 0, 0) + 1; if (sndLimSnd > MAXCHAN) sndLimSnd = MAXCHAN; - db_set_b(NULL, MODULENAME, OPT_MAXCHAN, sndLimSnd); + g_plugin.setByte(OPT_MAXCHAN, sndLimSnd); QuietTime = IsDlgButtonChecked(hwndDlg, IDC_QUIETTIME) == BST_CHECKED; - db_set_b(NULL, MODULENAME, OPT_QUIETTIME, QuietTime); + g_plugin.setByte(OPT_QUIETTIME, QuietTime); SendDlgItemMessage(hwndDlg, IDC_TIME1, DTM_GETSYSTEMTIME, 0, (LPARAM)&systime); TimeWrd1 = MAKEWORD(systime.wMinute, systime.wHour); - db_set_w(NULL, MODULENAME, OPT_TIME1, TimeWrd1); + g_plugin.setWord(OPT_TIME1, TimeWrd1); SendDlgItemMessage(hwndDlg, IDC_TIME2, DTM_GETSYSTEMTIME, 0, (LPARAM)&systime); TimeWrd2 = MAKEWORD(systime.wMinute, systime.wHour); - db_set_w(NULL, MODULENAME, OPT_TIME2, TimeWrd2); + g_plugin.setWord(OPT_TIME2, TimeWrd2); EnPreview = IsDlgButtonChecked(hwndDlg, IDC_PREVIEW) == BST_CHECKED; - db_set_b(NULL, MODULENAME, OPT_PREVIEW, EnPreview); + g_plugin.setByte(OPT_PREVIEW, EnPreview); StatMask = 0; for (int i = IDC_CHECKBOX10; i > IDC_CHECKBOX1 - 1; i--) { @@ -252,7 +252,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara StatMask |= 1; } - db_set_w(NULL, MODULENAME, OPT_STATUS, StatMask); + g_plugin.setWord(OPT_STATUS, StatMask); device = SendDlgItemMessage(hwndDlg, IDC_OUTDEVICE, CB_GETCURSEL, 0, 0); if (device == 0) @@ -358,7 +358,7 @@ static LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR SendMessage(hwndMute, BUTTONSETASFLATBTN, 1, 0); SendMessage(hwndMute, BUTTONSETCUSTOMPAINT, 0, (LPARAM)&fnPainter); - EnableFrameIcon(db_get_b(NULL, "Skin", "UseSound", 0) != 0); + EnableFrameIcon(db_get_b(0, "Skin", "UseSound", 0) != 0); hwndSlider = CreateWindow(TRACKBAR_CLASS, L"", WS_CHILD | WS_VISIBLE | TBS_NOTICKS | TBS_TOOLTIPS, 21, 1, 100, 20, hwnd, (HMENU)nullptr, (HINSTANCE)GetWindowLongPtr(hwnd, GWLP_HINSTANCE), nullptr); @@ -369,8 +369,8 @@ static LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR case WM_COMMAND: if ((HWND)lParam == hwndMute) { - bool useSound = !db_get_b(NULL, "Skin", "UseSound", 0); - db_set_b(NULL, "Skin", "UseSound", useSound); + bool useSound = !db_get_b(0, "Skin", "UseSound", 0); + db_set_b(0, "Skin", "UseSound", useSound); EnableFrameIcon(useSound); } break; @@ -379,7 +379,7 @@ static LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR if (hBass != nullptr) if (LOWORD(wParam) == SB_ENDSCROLL || LOWORD(wParam) == SB_THUMBTRACK) { Volume = (DWORD)SendMessage(hwndSlider, TBM_GETPOS, 0, 0); - db_set_b(NULL, MODULENAME, OPT_VOLUME, Volume); + g_plugin.setByte(OPT_VOLUME, Volume); BASS_SetConfig(BASS_CONFIG_GVOL_STREAM, Volume * 100); SendMessage(hwndOptSlider, TBM_SETPOS, TRUE, Volume); Preview = TRUE; @@ -486,26 +486,26 @@ void LoadBassLibrary(const wchar_t *ptszPath) DBVARIANT dbv = { 0 }; BASS_DEVICEINFO info; - if (!db_get_ws(NULL, MODULENAME, OPT_OUTDEVICE, &dbv)) + if (!g_plugin.getWString(OPT_OUTDEVICE, &dbv)) for (size_t i = 1; BASS_GetDeviceInfo((DWORD)i, &info); i++) if (!mir_wstrcmp(dbv.pwszVal, _A2T(info.name))) device = (int)i; db_free(&dbv); - sndLimSnd = db_get_b(NULL, MODULENAME, OPT_MAXCHAN, MAXCHAN); + sndLimSnd = g_plugin.getByte(OPT_MAXCHAN, MAXCHAN); if (sndLimSnd > MAXCHAN) sndLimSnd = MAXCHAN; - TimeWrd1 = db_get_w(NULL, MODULENAME, OPT_TIME1, 0); - TimeWrd2 = db_get_w(NULL, MODULENAME, OPT_TIME2, 0); - QuietTime = db_get_b(NULL, MODULENAME, OPT_QUIETTIME, 0); - EnPreview = db_get_b(NULL, MODULENAME, OPT_PREVIEW, 0); - StatMask = db_get_w(NULL, MODULENAME, OPT_STATUS, 0x3ff); + TimeWrd1 = g_plugin.getWord(OPT_TIME1, 0); + TimeWrd2 = g_plugin.getWord(OPT_TIME2, 0); + QuietTime = g_plugin.getByte(OPT_QUIETTIME, 0); + EnPreview = g_plugin.getByte(OPT_PREVIEW, 0); + StatMask = g_plugin.getWord(OPT_STATUS, 0x3ff); BASS_Init(device, 44100, 0, g_clistApi.hwndContactList, nullptr); - Volume = db_get_b(NULL, MODULENAME, OPT_VOLUME, 33); + Volume = g_plugin.getByte(OPT_VOLUME, 33); BASS_SetConfig(BASS_CONFIG_GVOL_STREAM, Volume * 100); hPlaySound = HookEvent(ME_SKIN_PLAYINGSOUND, OnPlaySnd); CreateFrame(); @@ -537,9 +537,9 @@ int OnModulesLoaded(WPARAM, LPARAM) } else { DBVARIANT dbv; - if (db_get_ws(NULL, MODULENAME, OPT_BASSPATH, &dbv)) { + if (g_plugin.getWString(OPT_BASSPATH, &dbv)) { mir_wstrncpy(CurrBassPath, VARSW(L"Plugins\\BASS\\bass.dll"), _countof(CurrBassPath)); - db_set_ws(NULL, MODULENAME, OPT_BASSPATH, CurrBassPath); + g_plugin.setWString(OPT_BASSPATH, CurrBassPath); } else { mir_wstrcpy(CurrBassPath, dbv.pwszVal); diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index 293708c2b6..f1434cf30e 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -272,58 +272,58 @@ void Options::Load(void) g_plugin.addHotkey(&hid); } - showContacts = db_get_b(0, MODULENAME, "showContacts", 0) ? true : false; - showContactGroups = db_get_b(0, MODULENAME, "showContactGroups", 1) ? true : false; - noFindBorder = db_get_b(0, MODULENAME, "noFindBorder", 0) ? true : false; - groupNewOnTop = db_get_b(0, MODULENAME, "groupNewOnTop", 1) ? true : false; - groupShowEvents = db_get_b(0, MODULENAME, "groupShowEvents", 1) ? true : false; - groupShowTime = db_get_b(0, MODULENAME, "groupShowTime", 1) ? true : false; - groupShowName = db_get_b(0, MODULENAME, "groupShowName", 0) ? true : false; - groupShowMessage = db_get_b(0, MODULENAME, "groupShowMessage", 1) ? true : false; - groupMessageLen = db_get_dw(0, MODULENAME, "groupMessageLen", 43); + showContacts = g_plugin.getByte("showContacts", 0) ? true : false; + showContactGroups = g_plugin.getByte("showContactGroups", 1) ? true : false; + noFindBorder = g_plugin.getByte("noFindBorder", 0) ? true : false; + groupNewOnTop = g_plugin.getByte("groupNewOnTop", 1) ? true : false; + groupShowEvents = g_plugin.getByte("groupShowEvents", 1) ? true : false; + groupShowTime = g_plugin.getByte("groupShowTime", 1) ? true : false; + groupShowName = g_plugin.getByte("groupShowName", 0) ? true : false; + groupShowMessage = g_plugin.getByte("groupShowMessage", 1) ? true : false; + groupMessageLen = g_plugin.getDword("groupMessageLen", 43); if (groupMessageLen < 5) groupMessageLen = 5; - groupTime = db_get_dw(0, MODULENAME, "groupTime", 5); + groupTime = g_plugin.getDword("groupTime", 5); if (groupTime < 1) groupTime = 1; - groupMessagesNumber = db_get_dw(0, MODULENAME, "groupMessagesNumber", 100); + groupMessagesNumber = g_plugin.getDword("groupMessagesNumber", 100); if (groupMessagesNumber < 1) groupMessagesNumber = 1; - messagesNewOnTop = db_get_b(0, MODULENAME, "messagesNewOnTop", 0) ? true : false; - messagesShowDate = db_get_b(0, MODULENAME, "messagesShowDate", 0) ? true : false; - messagesShowSec = db_get_b(0, MODULENAME, "messagesShowSec", 0) ? true : false; - messagesShowName = db_get_b(0, MODULENAME, "messagesShowName", 1) ? true : false; - messagesShowEvents = db_get_b(0, MODULENAME, "messagesShowEvents", 0) ? true : false; - messagesUseSmileys = db_get_b(0, MODULENAME, "messagesUseSmileys", 1) ? true : false; - searchForInList = db_get_b(0, MODULENAME, "searchForInList", 1) ? true : false; - searchForInMess = db_get_b(0, MODULENAME, "searchForInMess", 1) ? true : false; - searchMatchCase = db_get_b(0, MODULENAME, "searchMatchCase", 0) ? true : false; - searchMatchWhole = db_get_b(0, MODULENAME, "searchMatchWhole", 0) ? true : false; - searchOnlyIn = db_get_b(0, MODULENAME, "searchOnlyIn", 0) ? true : false; - searchOnlyOut = db_get_b(0, MODULENAME, "searchOnlyOut", 0) ? true : false; - searchOnlyGroup = db_get_b(0, MODULENAME, "searchOnlyGroup", 0) ? true : false; - searchAllContacts = db_get_b(0, MODULENAME, "searchAllContacts", 0) ? true : false; - schedulerAlerts = db_get_b(0, MODULENAME, "schedulerAlerts", 1) ? true : false; - schedulerHistoryAlerts = db_get_b(0, MODULENAME, "schedulerHistoryAlerts", 1) ? true : false; - - defFilter = db_get_b(0, MODULENAME, "defFilter", defFilter); - int filtersCount = db_get_dw(0, MODULENAME, "customFiltersCount", 0); + messagesNewOnTop = g_plugin.getByte("messagesNewOnTop", 0) ? true : false; + messagesShowDate = g_plugin.getByte("messagesShowDate", 0) ? true : false; + messagesShowSec = g_plugin.getByte("messagesShowSec", 0) ? true : false; + messagesShowName = g_plugin.getByte("messagesShowName", 1) ? true : false; + messagesShowEvents = g_plugin.getByte("messagesShowEvents", 0) ? true : false; + messagesUseSmileys = g_plugin.getByte("messagesUseSmileys", 1) ? true : false; + searchForInList = g_plugin.getByte("searchForInList", 1) ? true : false; + searchForInMess = g_plugin.getByte("searchForInMess", 1) ? true : false; + searchMatchCase = g_plugin.getByte("searchMatchCase", 0) ? true : false; + searchMatchWhole = g_plugin.getByte("searchMatchWhole", 0) ? true : false; + searchOnlyIn = g_plugin.getByte("searchOnlyIn", 0) ? true : false; + searchOnlyOut = g_plugin.getByte("searchOnlyOut", 0) ? true : false; + searchOnlyGroup = g_plugin.getByte("searchOnlyGroup", 0) ? true : false; + searchAllContacts = g_plugin.getByte("searchAllContacts", 0) ? true : false; + schedulerAlerts = g_plugin.getByte("schedulerAlerts", 1) ? true : false; + schedulerHistoryAlerts = g_plugin.getByte("schedulerHistoryAlerts", 1) ? true : false; + + defFilter = g_plugin.getByte("defFilter", defFilter); + int filtersCount = g_plugin.getDword("customFiltersCount", 0); for (int i = 0; i < filtersCount; ++i) { char buf[256]; FilterOptions fo; mir_snprintf(buf, "filterName_%d", i); DBVARIANT nameV; - if (!db_get_ws(0, MODULENAME, buf, &nameV)) { + if (!g_plugin.getWString(buf, &nameV)) { fo.name = nameV.pwszVal; db_free(&nameV); } else break; mir_snprintf(buf, "filterInOut_%d", i); - int inOut = db_get_b(0, MODULENAME, buf, 0); + int inOut = g_plugin.getByte(buf, 0); if (inOut == 1) fo.onlyIncomming = true; else if (inOut == 2) fo.onlyOutgoing = true; mir_snprintf(buf, "filterEvents_%d", i); DBVARIANT eventsV; - if (!db_get_s(0, MODULENAME, buf, &eventsV)) { + if (!g_plugin.getString(buf, &eventsV)) { int k = 0; char* id = eventsV.pszVal; while (eventsV.pszVal[k]) { @@ -346,7 +346,7 @@ void Options::Load(void) defFilter = 0; DBVARIANT defFilterStrV; - if (!db_get_ws(0, MODULENAME, "defFilterStr", &defFilterStrV)) { + if (!g_plugin.getWString("defFilterStr", &defFilterStrV)) { std::wstring filterName = defFilterStrV.pwszVal; for (int i = 0; i < (int)customFilters.size(); ++i) { if (filterName == customFilters[i].name) { @@ -358,43 +358,43 @@ void Options::Load(void) } } - codepageTxt = db_get_dw(0, MODULENAME, "codepageTxt", CP_UTF8); - codepageHtml1 = db_get_dw(0, MODULENAME, "codepageHtml1", CP_UTF8); - codepageHtml2 = db_get_dw(0, MODULENAME, "codepageHtml2", CP_UTF8); + codepageTxt = g_plugin.getDword("codepageTxt", CP_UTF8); + codepageHtml1 = g_plugin.getDword("codepageHtml1", CP_UTF8); + codepageHtml2 = g_plugin.getDword("codepageHtml2", CP_UTF8); DBVARIANT encodingV; - if (!db_get_ws(0, MODULENAME, "encodingTxt", &encodingV)) { + if (!g_plugin.getWString("encodingTxt", &encodingV)) { encodingTxt = encodingV.pwszVal; db_free(&encodingV); } else encodingTxt = L"UTF-8"; - if (!db_get_ws(0, MODULENAME, "encodingHtml1", &encodingV)) { + if (!g_plugin.getWString("encodingHtml1", &encodingV)) { encodingHtml1 = encodingV.pwszVal; db_free(&encodingV); } else encodingHtml1 = L"UTF-8"; - if (!db_get_ws(0, MODULENAME, "encodingHtml2", &encodingV)) { + if (!g_plugin.getWString("encodingHtml2", &encodingV)) { encodingHtml2 = encodingV.pwszVal; db_free(&encodingV); } else encodingHtml2 = L"UTF-8"; - exportHtml1ShowDate = db_get_b(0, MODULENAME, "exportHtml1ShowDate", 1) ? true : false; - exportHtml2ShowDate = db_get_b(0, MODULENAME, "exportHtml2ShowDate", 0) ? true : false; - exportHtml2UseSmileys = db_get_b(0, MODULENAME, "exportHtml2UseSmileys", 1) ? true : false; - if (!db_get_ws(0, MODULENAME, "extCssHtml2", &encodingV)) { + exportHtml1ShowDate = g_plugin.getByte("exportHtml1ShowDate", 1) ? true : false; + exportHtml2ShowDate = g_plugin.getByte("exportHtml2ShowDate", 0) ? true : false; + exportHtml2UseSmileys = g_plugin.getByte("exportHtml2UseSmileys", 1) ? true : false; + if (!g_plugin.getWString("extCssHtml2", &encodingV)) { extCssHtml2 = encodingV.pwszVal; db_free(&encodingV); } else extCssHtml2 = L""; - if (!db_get_ws(0, MODULENAME, "ftpLogPath", &encodingV)) { + if (!g_plugin.getWString("ftpLogPath", &encodingV)) { ftpLogPath = encodingV.pwszVal; db_free(&encodingV); } - if (!db_get_ws(0, MODULENAME, "ftpExePath", &encodingV)) { + if (!g_plugin.getWString("ftpExePath", &encodingV)) { ftpExePath = encodingV.pwszVal; db_free(&encodingV); } @@ -415,51 +415,51 @@ COLORREF Options::GetColor(Colors colorId) void Options::Save() { - db_set_b(0, MODULENAME, "showContacts", showContacts ? 1 : 0); - db_set_b(0, MODULENAME, "showContactGroups", showContactGroups ? 1 : 0); - db_set_b(0, MODULENAME, "noFindBorder", noFindBorder ? 1 : 0); - db_set_b(0, MODULENAME, "groupNewOnTop", groupNewOnTop ? 1 : 0); - db_set_b(0, MODULENAME, "groupShowEvents", groupShowEvents ? 1 : 0); - db_set_b(0, MODULENAME, "groupShowTime", groupShowTime ? 1 : 0); - db_set_b(0, MODULENAME, "groupShowName", groupShowName ? 1 : 0); - db_set_b(0, MODULENAME, "groupShowMessage", groupShowMessage ? 1 : 0); + g_plugin.setByte("showContacts", showContacts ? 1 : 0); + g_plugin.setByte("showContactGroups", showContactGroups ? 1 : 0); + g_plugin.setByte("noFindBorder", noFindBorder ? 1 : 0); + g_plugin.setByte("groupNewOnTop", groupNewOnTop ? 1 : 0); + g_plugin.setByte("groupShowEvents", groupShowEvents ? 1 : 0); + g_plugin.setByte("groupShowTime", groupShowTime ? 1 : 0); + g_plugin.setByte("groupShowName", groupShowName ? 1 : 0); + g_plugin.setByte("groupShowMessage", groupShowMessage ? 1 : 0); if (groupMessageLen < 5) groupMessageLen = 5; - db_set_dw(0, MODULENAME, "groupMessageLen", groupMessageLen); + g_plugin.setDword("groupMessageLen", groupMessageLen); if (groupTime < 1) groupTime = 1; - db_set_dw(0, MODULENAME, "groupTime", groupTime); + g_plugin.setDword("groupTime", groupTime); if (groupMessagesNumber < 1) groupMessagesNumber = 1; - db_set_dw(0, MODULENAME, "groupMessagesNumber", groupMessagesNumber); - db_set_b(0, MODULENAME, "messagesNewOnTop", messagesNewOnTop ? 1 : 0); - db_set_b(0, MODULENAME, "messagesShowDate", messagesShowDate ? 1 : 0); - db_set_b(0, MODULENAME, "messagesShowSec", messagesShowSec ? 1 : 0); - db_set_b(0, MODULENAME, "messagesShowName", messagesShowName ? 1 : 0); - db_set_b(0, MODULENAME, "messagesShowEvents", messagesShowEvents ? 1 : 0); - db_set_b(0, MODULENAME, "messagesUseSmileys", messagesUseSmileys ? 1 : 0); - db_set_b(0, MODULENAME, "searchForInList", searchForInList ? 1 : 0); - db_set_b(0, MODULENAME, "searchForInMess", searchForInMess ? 1 : 0); - db_set_b(0, MODULENAME, "searchMatchCase", searchMatchCase ? 1 : 0); - db_set_b(0, MODULENAME, "searchMatchWhole", searchMatchWhole ? 1 : 0); - db_set_b(0, MODULENAME, "searchOnlyIn", searchOnlyIn ? 1 : 0); - db_set_b(0, MODULENAME, "searchOnlyOut", searchOnlyOut ? 1 : 0); - db_set_b(0, MODULENAME, "searchOnlyGroup", searchOnlyGroup ? 1 : 0); - db_set_b(0, MODULENAME, "searchAllContacts", searchAllContacts ? 1 : 0); - db_set_b(0, MODULENAME, "schedulerAlerts", schedulerAlerts ? 1 : 0); - db_set_b(0, MODULENAME, "schedulerHistoryAlerts", schedulerHistoryAlerts ? 1 : 0); + g_plugin.setDword("groupMessagesNumber", groupMessagesNumber); + g_plugin.setByte("messagesNewOnTop", messagesNewOnTop ? 1 : 0); + g_plugin.setByte("messagesShowDate", messagesShowDate ? 1 : 0); + g_plugin.setByte("messagesShowSec", messagesShowSec ? 1 : 0); + g_plugin.setByte("messagesShowName", messagesShowName ? 1 : 0); + g_plugin.setByte("messagesShowEvents", messagesShowEvents ? 1 : 0); + g_plugin.setByte("messagesUseSmileys", messagesUseSmileys ? 1 : 0); + g_plugin.setByte("searchForInList", searchForInList ? 1 : 0); + g_plugin.setByte("searchForInMess", searchForInMess ? 1 : 0); + g_plugin.setByte("searchMatchCase", searchMatchCase ? 1 : 0); + g_plugin.setByte("searchMatchWhole", searchMatchWhole ? 1 : 0); + g_plugin.setByte("searchOnlyIn", searchOnlyIn ? 1 : 0); + g_plugin.setByte("searchOnlyOut", searchOnlyOut ? 1 : 0); + g_plugin.setByte("searchOnlyGroup", searchOnlyGroup ? 1 : 0); + g_plugin.setByte("searchAllContacts", searchAllContacts ? 1 : 0); + g_plugin.setByte("schedulerAlerts", schedulerAlerts ? 1 : 0); + g_plugin.setByte("schedulerHistoryAlerts", schedulerHistoryAlerts ? 1 : 0); if (defFilter < 0 || defFilter - 2 >= (int)customFilters.size()) defFilter = 0; - db_set_b(0, MODULENAME, "defFilter", defFilter < 2 ? defFilter : 2); + g_plugin.setByte("defFilter", defFilter < 2 ? defFilter : 2); if (defFilter >= 2) - db_set_ws(0, MODULENAME, "defFilterStr", customFilters[defFilter - 2].name.c_str()); - db_set_dw(0, MODULENAME, "customFiltersCount", (DWORD)customFilters.size()); + g_plugin.setWString("defFilterStr", customFilters[defFilter - 2].name.c_str()); + g_plugin.setDword("customFiltersCount", (DWORD)customFilters.size()); for (int i = 0; i < (int)customFilters.size(); ++i) { char buf[256]; mir_snprintf(buf, "filterName_%d", i); - db_set_ws(0, MODULENAME, buf, customFilters[i].name.c_str()); + g_plugin.setWString(buf, customFilters[i].name.c_str()); mir_snprintf(buf, "filterInOut_%d", i); - db_set_b(0, MODULENAME, buf, customFilters[i].onlyIncomming ? 1 : (customFilters[i].onlyOutgoing ? 2 : 0)); + g_plugin.setByte(buf, customFilters[i].onlyIncomming ? 1 : (customFilters[i].onlyOutgoing ? 2 : 0)); std::string events; for (std::vector::iterator it = customFilters[i].events.begin(); it != customFilters[i].events.end(); ++it) { _itoa_s(*it, buf, 16); @@ -468,24 +468,24 @@ void Options::Save() } mir_snprintf(buf, "filterEvents_%d", i); - db_set_s(0, MODULENAME, buf, events.c_str()); + g_plugin.setString(buf, events.c_str()); } - db_set_dw(0, MODULENAME, "codepageTxt", codepageTxt); - db_set_dw(0, MODULENAME, "codepageHtml1", codepageHtml1); - db_set_dw(0, MODULENAME, "codepageHtml2", codepageHtml2); - db_set_ws(0, MODULENAME, "encodingTxt", encodingTxt.c_str()); - db_set_ws(0, MODULENAME, "encodingHtml1", encodingHtml1.c_str()); - db_set_ws(0, MODULENAME, "encodingHtml2", encodingHtml2.c_str()); - db_set_b(0, MODULENAME, "exportHtml1ShowDate", exportHtml1ShowDate ? 1 : 0); - db_set_b(0, MODULENAME, "exportHtml2ShowDate", exportHtml2ShowDate ? 1 : 0); - db_set_b(0, MODULENAME, "exportHtml2UseSmileys", exportHtml2UseSmileys ? 1 : 0); - db_set_ws(0, MODULENAME, "extCssHtml2", extCssHtml2.c_str()); - db_set_ws(0, MODULENAME, "ftpLogPath", ftpLogPath.c_str()); + g_plugin.setDword("codepageTxt", codepageTxt); + g_plugin.setDword("codepageHtml1", codepageHtml1); + g_plugin.setDword("codepageHtml2", codepageHtml2); + g_plugin.setWString("encodingTxt", encodingTxt.c_str()); + g_plugin.setWString("encodingHtml1", encodingHtml1.c_str()); + g_plugin.setWString("encodingHtml2", encodingHtml2.c_str()); + g_plugin.setByte("exportHtml1ShowDate", exportHtml1ShowDate ? 1 : 0); + g_plugin.setByte("exportHtml2ShowDate", exportHtml2ShowDate ? 1 : 0); + g_plugin.setByte("exportHtml2UseSmileys", exportHtml2UseSmileys ? 1 : 0); + g_plugin.setWString("extCssHtml2", extCssHtml2.c_str()); + g_plugin.setWString("ftpLogPath", ftpLogPath.c_str()); if (ftpExePath != ftpExePathDef) - db_set_ws(0, MODULENAME, "ftpExePath", ftpExePath.c_str()); + g_plugin.setWString("ftpExePath", ftpExePath.c_str()); else - db_unset(0, MODULENAME, "ftpExePath"); + g_plugin.delSetting("ftpExePath"); } void Options::SaveTasks(std::list* tasks) @@ -497,51 +497,51 @@ void Options::SaveTasks(std::list* tasks) char buf[256]; for (std::list::iterator it = tasks->begin(); it != tasks->end(); ++it) { mir_snprintf(buf, "Task_compress_%d", i); - db_set_b(0, MODULENAME, buf, it->compress); + g_plugin.setByte(buf, it->compress); mir_snprintf(buf, "Task_useFtp_%d", i); - db_set_b(0, MODULENAME, buf, it->useFtp); + g_plugin.setByte(buf, it->useFtp); mir_snprintf(buf, "Task_isSystem_%d", i); - db_set_b(0, MODULENAME, buf, it->isSystem); + g_plugin.setByte(buf, it->isSystem); mir_snprintf(buf, "Task_active_%d", i); - db_set_b(0, MODULENAME, buf, it->active); + g_plugin.setByte(buf, it->active); mir_snprintf(buf, "Task_exportImported_%d", i); - db_set_b(0, MODULENAME, buf, it->exportImported); + g_plugin.setByte(buf, it->exportImported); mir_snprintf(buf, "Task_type_%d", i); - db_set_b(0, MODULENAME, buf, it->type); + g_plugin.setByte(buf, it->type); mir_snprintf(buf, "Task_eventUnit_%d", i); - db_set_b(0, MODULENAME, buf, it->eventUnit); + g_plugin.setByte(buf, it->eventUnit); mir_snprintf(buf, "Task_trigerType_%d", i); - db_set_b(0, MODULENAME, buf, it->trigerType); + g_plugin.setByte(buf, it->trigerType); mir_snprintf(buf, "Task_exportType_%d", i); - db_set_b(0, MODULENAME, buf, it->exportType); + g_plugin.setByte(buf, it->exportType); mir_snprintf(buf, "Task_importType_%d", i); - db_set_b(0, MODULENAME, buf, it->importType); + g_plugin.setByte(buf, it->importType); mir_snprintf(buf, "Task_eventDeltaTime_%d", i); - db_set_dw(0, MODULENAME, buf, it->eventDeltaTime); + g_plugin.setDword(buf, it->eventDeltaTime); mir_snprintf(buf, "Task_filterId_%d", i); - db_set_dw(0, MODULENAME, buf, it->filterId); + g_plugin.setDword(buf, it->filterId); mir_snprintf(buf, "Task_dayTime_%d", i); - db_set_dw(0, MODULENAME, buf, it->dayTime); + g_plugin.setDword(buf, it->dayTime); mir_snprintf(buf, "Task_dayOfWeek_%d", i); - db_set_dw(0, MODULENAME, buf, it->dayOfWeek); + g_plugin.setDword(buf, it->dayOfWeek); mir_snprintf(buf, "Task_dayOfMonth_%d", i); - db_set_dw(0, MODULENAME, buf, it->dayOfMonth); + g_plugin.setDword(buf, it->dayOfMonth); mir_snprintf(buf, "Task_deltaTime_%d", i); - db_set_dw(0, MODULENAME, buf, it->deltaTime); + g_plugin.setDword(buf, it->deltaTime); mir_snprintf(buf, "Task_lastExport_low_%d", i); - db_set_dw(0, MODULENAME, buf, (int)it->lastExport); + g_plugin.setDword(buf, (int)it->lastExport); mir_snprintf(buf, "Task_lastExport_hi_%d", i); - db_set_dw(0, MODULENAME, buf, ((unsigned long long int)it->lastExport) >> 32); + g_plugin.setDword(buf, ((unsigned long long int)it->lastExport) >> 32); mir_snprintf(buf, "Task_ftpName_%d", i); - db_set_ws(0, MODULENAME, buf, it->ftpName.c_str()); + g_plugin.setWString(buf, it->ftpName.c_str()); mir_snprintf(buf, "Task_filterName_%d", i); - db_set_ws(0, MODULENAME, buf, it->filterName.c_str()); + g_plugin.setWString(buf, it->filterName.c_str()); mir_snprintf(buf, "Task_filePath_%d", i); - db_set_ws(0, MODULENAME, buf, it->filePath.c_str()); + g_plugin.setWString(buf, it->filePath.c_str()); mir_snprintf(buf, "Task_taskName_%d", i); - db_set_ws(0, MODULENAME, buf, it->taskName.c_str()); + g_plugin.setWString(buf, it->taskName.c_str()); mir_snprintf(buf, "Task_zipPassword_%d", i); - db_set_s(0, MODULENAME, buf, it->zipPassword.c_str()); + g_plugin.setString(buf, it->zipPassword.c_str()); mir_snprintf(buf, "IsInTask_%d", i); for (auto &hContact : Contacts()) @@ -554,49 +554,49 @@ void Options::SaveTasks(std::list* tasks) taskOptions.push_back(*it); } - db_set_dw(0, MODULENAME, "Task_count", i); + g_plugin.setDword("Task_count", i); for (i = (int)tasks->size(); i < oldTaskNr; ++i) { mir_snprintf(buf, "Task_compress_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_useFtp_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_isSystem_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_active_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_type_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_eventUnit_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_trigerType_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_exportType_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_eventDeltaTime_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_filterId_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_dayTime_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_dayOfWeek_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_dayOfMonth_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_deltaTime_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_lastExport_low_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_lastExport_hi_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_ftpName_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_filterName_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_filePath_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "Task_taskName_%d", i); - db_unset(NULL, MODULENAME, buf); + g_plugin.delSetting(buf); mir_snprintf(buf, "IsInTask_%d", i); for (auto &hContact : Contacts()) @@ -609,77 +609,77 @@ void Options::SaveTaskTime(TaskOptions& to) int i = to.orderNr; char buf[256]; mir_snprintf(buf, "Task_lastExport_low_%d", i); - db_set_dw(0, MODULENAME, buf, (int)to.lastExport); + g_plugin.setDword(buf, (int)to.lastExport); mir_snprintf(buf, "Task_lastExport_hi_%d", i); - db_set_dw(0, MODULENAME, buf, ((unsigned long long int)to.lastExport) >> 32); + g_plugin.setDword(buf, ((unsigned long long int)to.lastExport) >> 32); } void Options::LoadTasks() { - int taskCount = db_get_dw(0, MODULENAME, "Task_count", 0); + int taskCount = g_plugin.getDword("Task_count", 0); char buf[256]; for (int i = 0; i < taskCount; ++i) { TaskOptions to; mir_snprintf(buf, "Task_compress_%d", i); - to.compress = db_get_b(0, MODULENAME, buf, to.compress) != 0; + to.compress = g_plugin.getByte(buf, to.compress) != 0; mir_snprintf(buf, "Task_useFtp_%d", i); - to.useFtp = db_get_b(0, MODULENAME, buf, to.useFtp) != 0; + to.useFtp = g_plugin.getByte(buf, to.useFtp) != 0; mir_snprintf(buf, "Task_isSystem_%d", i); - to.isSystem = db_get_b(0, MODULENAME, buf, to.isSystem) != 0; + to.isSystem = g_plugin.getByte(buf, to.isSystem) != 0; mir_snprintf(buf, "Task_active_%d", i); - to.active = db_get_b(0, MODULENAME, buf, to.active) != 0; + to.active = g_plugin.getByte(buf, to.active) != 0; mir_snprintf(buf, "Task_exportImported_%d", i); - to.exportImported = db_get_b(0, MODULENAME, buf, to.exportImported) != 0; + to.exportImported = g_plugin.getByte(buf, to.exportImported) != 0; mir_snprintf(buf, "Task_type_%d", i); - to.type = (TaskOptions::TaskType)db_get_b(0, MODULENAME, buf, to.type); + to.type = (TaskOptions::TaskType)g_plugin.getByte(buf, to.type); mir_snprintf(buf, "Task_eventUnit_%d", i); - to.eventUnit = (TaskOptions::EventUnit)db_get_b(0, MODULENAME, buf, to.eventUnit); + to.eventUnit = (TaskOptions::EventUnit)g_plugin.getByte(buf, to.eventUnit); mir_snprintf(buf, "Task_trigerType_%d", i); - to.trigerType = (TaskOptions::TrigerType)db_get_b(0, MODULENAME, buf, to.trigerType); + to.trigerType = (TaskOptions::TrigerType)g_plugin.getByte(buf, to.trigerType); mir_snprintf(buf, "Task_exportType_%d", i); - to.exportType = (IExport::ExportType)db_get_b(0, MODULENAME, buf, to.exportType); + to.exportType = (IExport::ExportType)g_plugin.getByte(buf, to.exportType); mir_snprintf(buf, "Task_importType_%d", i); - to.importType = (IImport::ImportType)db_get_b(0, MODULENAME, buf, to.importType); + to.importType = (IImport::ImportType)g_plugin.getByte(buf, to.importType); mir_snprintf(buf, "Task_eventDeltaTime_%d", i); - to.eventDeltaTime = db_get_dw(0, MODULENAME, buf, to.eventDeltaTime); + to.eventDeltaTime = g_plugin.getDword(buf, to.eventDeltaTime); mir_snprintf(buf, "Task_filterId_%d", i); - to.filterId = db_get_dw(0, MODULENAME, buf, to.filterId); + to.filterId = g_plugin.getDword(buf, to.filterId); mir_snprintf(buf, "Task_dayTime_%d", i); - to.dayTime = db_get_dw(0, MODULENAME, buf, to.dayTime); + to.dayTime = g_plugin.getDword(buf, to.dayTime); mir_snprintf(buf, "Task_dayOfWeek_%d", i); - to.dayOfWeek = db_get_dw(0, MODULENAME, buf, to.dayOfWeek); + to.dayOfWeek = g_plugin.getDword(buf, to.dayOfWeek); mir_snprintf(buf, "Task_dayOfMonth_%d", i); - to.dayOfMonth = db_get_dw(0, MODULENAME, buf, to.dayOfMonth); + to.dayOfMonth = g_plugin.getDword(buf, to.dayOfMonth); mir_snprintf(buf, "Task_deltaTime_%d", i); - to.deltaTime = db_get_dw(0, MODULENAME, buf, to.deltaTime); + to.deltaTime = g_plugin.getDword(buf, to.deltaTime); unsigned long long int le = to.lastExport; mir_snprintf(buf, "Task_lastExport_low_%d", i); - to.lastExport = db_get_dw(0, MODULENAME, buf, (int)le) & 0xffffffff; + to.lastExport = g_plugin.getDword(buf, (int)le) & 0xffffffff; mir_snprintf(buf, "Task_lastExport_hi_%d", i); - to.lastExport |= ((unsigned long long int)db_get_dw(0, MODULENAME, buf, le >> 32)) << 32; + to.lastExport |= ((unsigned long long int)g_plugin.getDword(buf, le >> 32)) << 32; mir_snprintf(buf, "Task_ftpName_%d", i); DBVARIANT var; - if (!db_get_ws(0, MODULENAME, buf, &var)) { + if (!g_plugin.getWString(buf, &var)) { to.ftpName = var.pwszVal; db_free(&var); } mir_snprintf(buf, "Task_filterName_%d", i); - if (!db_get_ws(0, MODULENAME, buf, &var)) { + if (!g_plugin.getWString(buf, &var)) { to.filterName = var.pwszVal; db_free(&var); } mir_snprintf(buf, "Task_filePath_%d", i); - if (!db_get_ws(0, MODULENAME, buf, &var)) { + if (!g_plugin.getWString(buf, &var)) { to.filePath = var.pwszVal; db_free(&var); } mir_snprintf(buf, "Task_taskName_%d", i); - if (!db_get_ws(0, MODULENAME, buf, &var)) { + if (!g_plugin.getWString(buf, &var)) { to.taskName = var.pwszVal; db_free(&var); } mir_snprintf(buf, "Task_zipPassword_%d", i); - if (!db_get_s(0, MODULENAME, buf, &var)) { + if (!g_plugin.getString(buf, &var)) { to.zipPassword = var.pszVal; db_free(&var); } diff --git a/plugins/Boltun/src/actionQueue.cpp b/plugins/Boltun/src/actionQueue.cpp index d75952e392..1fd7834008 100644 --- a/plugins/Boltun/src/actionQueue.cpp +++ b/plugins/Boltun/src/actionQueue.cpp @@ -77,7 +77,7 @@ static bool NotifyTyping(MCONTACT hContact) { int res = db_get_b(hContact, "SRMsg", "SupportTyping", 2); if (res == 2) - res = db_get_b(NULL, "SRMsg", "DefaultTyping", 1); + res = db_get_b(0, "SRMsg", "DefaultTyping", 1); return res != 0; } diff --git a/plugins/Boltun/src/config.cpp b/plugins/Boltun/src/config.cpp index 314ff43ce1..700a8b5014 100644 --- a/plugins/Boltun/src/config.cpp +++ b/plugins/Boltun/src/config.cpp @@ -61,22 +61,22 @@ inline const wchar_t* SetString(char* key, const wchar_t* value) size_t len = mir_wstrlen(value) + 1; wchar_t* val = new wchar_t[len]; wcscpy_s(val, len, value); - db_set_ws(NULL, BOLTUN_KEY, key, val); + db_set_ws(0, BOLTUN_KEY, key, val); return val; } #define BUILDETTERS(x, str, def) \ const bool BoltunConfig::Get##x() { \ - return db_get_dw(NULL, BOLTUN_KEY, str, def) != 0; } \ + return db_get_dw(0, BOLTUN_KEY, str, def) != 0; } \ const bool BoltunConfig::Set##x(const bool value) { \ - db_set_dw(NULL, BOLTUN_KEY, str, value); \ + db_set_dw(0, BOLTUN_KEY, str, value); \ return value; } #define BUILDINTETTERS(x, str, def) \ const int BoltunConfig::Get##x() { \ - return db_get_dw(NULL, BOLTUN_KEY, str, def); } \ + return db_get_dw(0, BOLTUN_KEY, str, def); } \ const int BoltunConfig::Set##x(const int value) { \ - db_set_dw(NULL, BOLTUN_KEY, str, value); \ + db_set_dw(0, BOLTUN_KEY, str, value); \ return value; } #define BUILDSTRETTERS(x, str, def) \ diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index b3a6b10ded..b08d600000 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -263,14 +263,14 @@ static void RestoreOldSettings(void) CallService(MS_POPUP_QUERY, PUQS_ENABLEPOPUPS, 0); if (g_bOldSetting & OLD_SOUND) - db_set_b(NULL, "Skin", "UseSound", 1); + db_set_b(0, "Skin", "UseSound", 1); if (g_bOldSetting & OLD_FLTCONT) // show Floating contacts if needed { if (ServiceExists("FloatingContacts/MainHideAllThumbs")) CallService("FloatingContacts/MainHideAllThumbs", 0, 0); else - db_set_b(NULL, "FloatingContacts", "HideAll", 0); + db_set_b(0, "FloatingContacts", "HideAll", 0); } g_bOldSetting = 0; } @@ -303,7 +303,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara if (g_wMask & OPT_CHANGESTATUS) // is this even needed? { - BYTE bReqMode = db_get_b(NULL, MOD_NAME, "stattype", 2); + BYTE bReqMode = db_get_b(0, MOD_NAME, "stattype", 2); unsigned uMode = (STATUS_ARR_TO_ID[bReqMode]); DBVARIANT dbVar; if (g_wMask & OPT_USEDEFMSG || db_get_ws(NULL, MOD_NAME, "statmsg", &dbVar)) { @@ -336,16 +336,16 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara } // disable sounds - if ((g_wMask & OPT_DISABLESNDS) && db_get_b(NULL, "Skin", "UseSound", 1)) { + if ((g_wMask & OPT_DISABLESNDS) && db_get_b(0, "Skin", "UseSound", 1)) { // save current g_bOldSetting |= OLD_SOUND; - db_set_b(NULL, "Skin", "UseSound", 0); + db_set_b(0, "Skin", "UseSound", 0); } g_bWindowHidden = true; g_bOldSetting |= OLD_WASHIDDEN; - db_set_b(NULL, MOD_NAME, "OldSetting", g_bOldSetting); + db_set_b(0, MOD_NAME, "OldSetting", g_bOldSetting); } return 0; @@ -356,7 +356,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara if (g_wMask & OPT_REQPASS) { //password request DBVARIANT dbVar; - if (!db_get_s(NULL, MOD_NAME, "password", &dbVar)) { + if (!db_get_s(0, MOD_NAME, "password", &dbVar)) { g_fPassRequested = true; strncpy(g_password, dbVar.pszVal, MAXPASSLEN); @@ -405,7 +405,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPara PostMessage(hWnd, WM_MOUSEMOVE, 0, (LPARAM)MAKELONG(2, 2)); // reset core's IDLE g_bWindowHidden = false; - db_set_b(NULL, MOD_NAME, "OldSetting", 0); + db_set_b(0, MOD_NAME, "OldSetting", 0); } return 0; } @@ -473,7 +473,7 @@ static wchar_t *HokeyVkToName(WORD vkKey) static wchar_t *GetBossKeyText(void) { - WORD wHotKey = db_get_w(NULL, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12)); + WORD wHotKey = db_get_w(0, "SkinHotKeys", "Hide/Show Miranda", HOTKEYCODE(HOTKEYF_CONTROL, VK_F12)); BYTE key = LOBYTE(wHotKey); BYTE shift = HIBYTE(wHotKey); @@ -599,7 +599,7 @@ static int EnumProtos(WPARAM, LPARAM) static int MirandaLoaded(WPARAM, LPARAM) { - g_wMask = db_get_w(NULL, MOD_NAME, "optsmask", DEFAULTSETTING); + g_wMask = db_get_w(0, MOD_NAME, "optsmask", DEFAULTSETTING); RegisterCoreHotKeys(); @@ -660,18 +660,18 @@ static int MirandaLoaded(WPARAM, LPARAM) int CMPlugin::Load() { - g_wMaskAdv = db_get_w(NULL, MOD_NAME, "optsmaskadv", 0); - g_bOldSetting = db_get_b(NULL, MOD_NAME, "OldSetting", 0); + g_wMaskAdv = db_get_w(0, MOD_NAME, "optsmaskadv", 0); + g_bOldSetting = db_get_b(0, MOD_NAME, "OldSetting", 0); if ((g_bOldSetting & OLD_POPUP) && !(g_wMaskAdv & OPT_RESTORE)) // Restore popup settings if Miranda was crushed or killed in hidden mode and "Restore hiding on startup after failure" option is disabled { - if (db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) == 0) - db_set_b(NULL, "Popup", "ModuleIsEnabled", 1); + if (db_get_b(0, "Popup", "ModuleIsEnabled", 1) == 0) + db_set_b(0, "Popup", "ModuleIsEnabled", 1); } - if (g_wMaskAdv & OPT_HIDEONSTART && db_get_b(NULL, "Popup", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled + if (g_wMaskAdv & OPT_HIDEONSTART && db_get_b(0, "Popup", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled { g_bOldSetting |= OLD_POPUP; - db_set_b(NULL, "Popup", "ModuleIsEnabled", 0); + db_set_b(0, "Popup", "ModuleIsEnabled", 0); } g_plugin.registerIcon("BossKey", iconList); diff --git a/plugins/BossKeyPlus/src/BossKeyIdle.cpp b/plugins/BossKeyPlus/src/BossKeyIdle.cpp index c3d8762199..ba70b6cbdc 100644 --- a/plugins/BossKeyPlus/src/BossKeyIdle.cpp +++ b/plugins/BossKeyPlus/src/BossKeyIdle.cpp @@ -54,7 +54,7 @@ VOID CALLBACK IdleTimer(HWND, UINT, UINT_PTR idEvent, DWORD) void InitIdleTimer() { - minutes = db_get_b(NULL, MOD_NAME, "time", 10); + minutes = db_get_b(0, MOD_NAME, "time", 10); hTimer = SetTimer(nullptr, 0, 2000, IdleTimer); } diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index 46ebb3832a..39f335cfe3 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -41,7 +41,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam DBVARIANT dbVar; - if (!db_get_s(NULL, MOD_NAME, "password", &dbVar)) { + if (!db_get_s(0, MOD_NAME, "password", &dbVar)) { SetDlgItemTextA(hwndDlg, IDC_MAINOPT_PASS, dbVar.pszVal); db_free(&dbVar); } @@ -57,7 +57,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam for (int i = ID_STATUS_OFFLINE; i <= ID_STATUS_OUTTOLUNCH; i++) SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_INSERTSTRING, -1, (LPARAM)Clist_GetStatusModeDescription(i, 0)); - SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, db_get_b(NULL, MOD_NAME, "stattype", 2), 0); + SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, db_get_b(0, MOD_NAME, "stattype", 2), 0); SendMessage(hwndDlg, WM_USER + 60, 0, 0); SendMessage(hwndDlg, WM_USER + 50, 0, 0); @@ -75,14 +75,14 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam // write down status type if (IsDlgButtonChecked(hwndDlg, IDC_MAINOPT_CHANGESTATUSBOX) == BST_CHECKED) { - db_set_b(NULL, MOD_NAME, "stattype", (BYTE)SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_GETCURSEL, 0, 0)); + db_set_b(0, MOD_NAME, "stattype", (BYTE)SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_GETCURSEL, 0, 0)); // status msg, if needed if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_MAINOPT_STATMSG))) { // meaning we should save it wchar_t tszMsg[1025]; GetDlgItemText(hwndDlg, IDC_MAINOPT_STATMSG, tszMsg, _countof(tszMsg)); if (tszMsg[0] != 0) - db_set_ws(NULL, MOD_NAME, "statmsg", tszMsg); + db_set_ws(0, MOD_NAME, "statmsg", tszMsg); else // delete current setting db_unset(NULL, MOD_NAME, "statmsg"); } @@ -94,7 +94,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam char szPass[MAXPASSLEN + 1]; GetDlgItemTextA(hwndDlg, IDC_MAINOPT_PASS, szPass, _countof(szPass)); if (szPass[0] != 0){ - db_set_s(NULL, MOD_NAME, "password", szPass); + db_set_s(0, MOD_NAME, "password", szPass); wMask |= OPT_REQPASS; } } @@ -104,7 +104,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam if (IsDlgButtonChecked(hwndDlg, IDC_MAINOPT_USEDEFMSG) == BST_CHECKED) wMask |= OPT_USEDEFMSG; if (IsDlgButtonChecked(hwndDlg, IDC_MAINOPT_TRAYICON) == BST_CHECKED) wMask |= OPT_TRAYICON; - db_set_w(NULL, MOD_NAME, "optsmask", wMask); + db_set_w(0, MOD_NAME, "optsmask", wMask); g_wMask = wMask; return true; } @@ -216,7 +216,7 @@ INT_PTR CALLBACK AdvOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { g_fOptionsOpen = true; - minutes = db_get_b(NULL, MOD_NAME, "time", 10); + minutes = db_get_b(0, MOD_NAME, "time", 10); wchar_t szMinutes[4] = { 0 }; _itow(minutes, szMinutes, 10); SendDlgItemMessage(hwndDlg, IDC_MAINOPT_TIME, EM_LIMITTEXT, 2, 0); @@ -257,8 +257,8 @@ INT_PTR CALLBACK AdvOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) GetDlgItemText(hwndDlg, IDC_MAINOPT_TIME, szMinutes, _countof(szMinutes)); minutes = _wtoi(szMinutes); if (minutes < 1) minutes = 1; - db_set_b(NULL, MOD_NAME, "time", minutes); - db_set_w(NULL, MOD_NAME, "optsmaskadv", wMaskAdv); + db_set_b(0, MOD_NAME, "time", minutes); + db_set_w(0, MOD_NAME, "optsmaskadv", wMaskAdv); g_wMaskAdv = wMaskAdv; return true; } diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 01b36144dc..aeac064fb6 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -32,57 +32,57 @@ Options options; void LoadOptions() { - options.iAbsencePeriod = db_get_dw(NULL, MODULENAME, "iAbsencePeriod", 14); - options.iAbsencePeriod2 = db_get_dw(NULL, MODULENAME, "iAbsencePeriod2", 30 * 3); - options.iSilencePeriod = db_get_dw(NULL, MODULENAME, "iSilencePeriod", 30); - - options.iShowPopup = db_get_b(NULL, MODULENAME, "iShowPopUp", 1); - options.iShowEvent = db_get_b(NULL, MODULENAME, "iShowEvent", 0); - options.iShowUDetails = db_get_b(NULL, MODULENAME, "iShowUDetails", 0); - options.iShowMessageWindow = db_get_b(NULL, MODULENAME, "iShowMessageWindow", 1); - - options.iPopupColorBack = db_get_dw(NULL, MODULENAME, "iPopUpColorBack", DEF_COLOR_BACK); - options.iPopupColorFore = db_get_dw(NULL, MODULENAME, "iPopUpColorFore", DEF_COLOR_FORE); - - options.iUsePopupColors = db_get_b(NULL, MODULENAME, "iUsePopupColors", 0); - options.iUseWinColors = db_get_b(NULL, MODULENAME, "iUseWinColors", 0); - options.iPopupDelay = db_get_b(NULL, MODULENAME, "iPopUpDelay", 0); - - options.iShowPopup2 = db_get_b(NULL, MODULENAME, "iShowPopUp2", 1); - options.iShowEvent2 = db_get_b(NULL, MODULENAME, "iShowEvent2", 0); - options.action2 = (GoneContactAction)db_get_b(NULL, MODULENAME, "Action2", (BYTE)GCA_NOACTION); - options.notifyFirstOnline = db_get_b(NULL, MODULENAME, "bShowFirstSight", 0) ? true : false; - options.hideInactive = db_get_b(NULL, MODULENAME, "bHideInactive", 0) ? true : false; - options.enableMissYou = db_get_b(NULL, MODULENAME, "bMissYouEnabled", 1) ? true : false; + options.iAbsencePeriod = g_plugin.getDword("iAbsencePeriod", 14); + options.iAbsencePeriod2 = g_plugin.getDword("iAbsencePeriod2", 30 * 3); + options.iSilencePeriod = g_plugin.getDword("iSilencePeriod", 30); + + options.iShowPopup = g_plugin.getByte("iShowPopUp", 1); + options.iShowEvent = g_plugin.getByte("iShowEvent", 0); + options.iShowUDetails = g_plugin.getByte("iShowUDetails", 0); + options.iShowMessageWindow = g_plugin.getByte("iShowMessageWindow", 1); + + options.iPopupColorBack = g_plugin.getDword("iPopUpColorBack", DEF_COLOR_BACK); + options.iPopupColorFore = g_plugin.getDword("iPopUpColorFore", DEF_COLOR_FORE); + + options.iUsePopupColors = g_plugin.getByte("iUsePopupColors", 0); + options.iUseWinColors = g_plugin.getByte("iUseWinColors", 0); + options.iPopupDelay = g_plugin.getByte("iPopUpDelay", 0); + + options.iShowPopup2 = g_plugin.getByte("iShowPopUp2", 1); + options.iShowEvent2 = g_plugin.getByte("iShowEvent2", 0); + options.action2 = (GoneContactAction)g_plugin.getByte("Action2", (BYTE)GCA_NOACTION); + options.notifyFirstOnline = g_plugin.getByte("bShowFirstSight", 0) ? true : false; + options.hideInactive = g_plugin.getByte("bHideInactive", 0) ? true : false; + options.enableMissYou = g_plugin.getByte("bMissYouEnabled", 1) ? true : false; } void SaveOptions() { - db_set_dw(NULL, MODULENAME, "iAbsencePeriod", options.iAbsencePeriod); - db_set_dw(NULL, MODULENAME, "iAbsencePeriod2", options.iAbsencePeriod2); - db_set_dw(NULL, MODULENAME, "iSilencePeriod", options.iSilencePeriod); - - db_set_b(NULL, MODULENAME, "iShowPopUp", options.iShowPopup); - db_set_b(NULL, MODULENAME, "iShowEvent", options.iShowEvent); - db_set_b(NULL, MODULENAME, "iShowUDetails", options.iShowUDetails); - db_set_b(NULL, MODULENAME, "iShowMessageWindow", options.iShowMessageWindow); - - db_set_b(NULL, MODULENAME, "iShowPopUp2", options.iShowPopup2); - db_set_b(NULL, MODULENAME, "iShowEvent2", options.iShowEvent2); - db_set_b(NULL, MODULENAME, "Action2", (BYTE)options.action2); - db_set_b(NULL, MODULENAME, "bShowFirstSight", options.notifyFirstOnline ? 1 : 0); - db_set_b(NULL, MODULENAME, "bHideInactive", options.hideInactive ? 1 : 0); - db_set_b(NULL, MODULENAME, "bMissYouEnabled", options.enableMissYou ? 1 : 0); + g_plugin.setDword("iAbsencePeriod", options.iAbsencePeriod); + g_plugin.setDword("iAbsencePeriod2", options.iAbsencePeriod2); + g_plugin.setDword("iSilencePeriod", options.iSilencePeriod); + + g_plugin.setByte("iShowPopUp", options.iShowPopup); + g_plugin.setByte("iShowEvent", options.iShowEvent); + g_plugin.setByte("iShowUDetails", options.iShowUDetails); + g_plugin.setByte("iShowMessageWindow", options.iShowMessageWindow); + + g_plugin.setByte("iShowPopUp2", options.iShowPopup2); + g_plugin.setByte("iShowEvent2", options.iShowEvent2); + g_plugin.setByte("Action2", (BYTE)options.action2); + g_plugin.setByte("bShowFirstSight", options.notifyFirstOnline ? 1 : 0); + g_plugin.setByte("bHideInactive", options.hideInactive ? 1 : 0); + g_plugin.setByte("bMissYouEnabled", options.enableMissYou ? 1 : 0); } void SavePopupOptions() { - db_set_dw(NULL, MODULENAME, "iPopUpColorBack", options.iPopupColorBack); - db_set_dw(NULL, MODULENAME, "iPopUpColorFore", options.iPopupColorFore); + g_plugin.setDword("iPopUpColorBack", options.iPopupColorBack); + g_plugin.setDword("iPopUpColorFore", options.iPopupColorFore); - db_set_b(NULL, MODULENAME, "iUsePopupColors", options.iUsePopupColors); - db_set_b(NULL, MODULENAME, "iUseWinColors", options.iUseWinColors); - db_set_b(NULL, MODULENAME, "iPopUpDelay", options.iPopupDelay); + g_plugin.setByte("iUsePopupColors", options.iUsePopupColors); + g_plugin.setByte("iUseWinColors", options.iUseWinColors); + g_plugin.setByte("iPopUpDelay", options.iPopupDelay); } /** diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index 430f6359c5..3761a141b0 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -69,7 +69,7 @@ void getDefaultMessage(HWND hwnd, UINT control, MCONTACT hContact) SetDlgItemText(hwnd, control, dbv.pwszVal); db_free(&dbv); } - else if (!db_get_ws(NULL, MODULENAME, "PounceMsg", &dbv)) { + else if (!g_plugin.getWString("PounceMsg", &dbv)) { SetDlgItemText(hwnd, control, dbv.pwszVal); db_free(&dbv); } @@ -318,12 +318,12 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM mir_snwprintf(msg, TranslateT("The Message (%d Characters)"), GetWindowTextLength(GetDlgItem(hwnd, IDC_MESSAGE))); SetDlgItemText(hwnd, GRP_MSG, msg); - db_set_w(wi->hContact, MODULENAME, "SendIfMyStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfMyStatusIsFLAG", 0)); - db_set_w(wi->hContact, MODULENAME, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfTheirStatusIsFLAG", 0)); - db_set_b(wi->hContact, MODULENAME, "Reuse", (BYTE)db_get_b(NULL, MODULENAME, "Reuse", 0)); - db_set_b(wi->hContact, MODULENAME, "GiveUpDays", (BYTE)db_get_b(NULL, MODULENAME, "GiveUpDays", 0)); - db_set_dw(wi->hContact, MODULENAME, "GiveUpDate", (DWORD)db_get_dw(NULL, MODULENAME, "GiveUpDate", 0)); - db_set_w(wi->hContact, MODULENAME, "ConfirmTimeout", (WORD)db_get_w(NULL, MODULENAME, "ConfirmTimeout", 0)); + db_set_w(wi->hContact, MODULENAME, "SendIfMyStatusIsFLAG", (WORD)g_plugin.getWord("SendIfMyStatusIsFLAG", 0)); + db_set_w(wi->hContact, MODULENAME, "SendIfTheirStatusIsFLAG", (WORD)g_plugin.getWord("SendIfTheirStatusIsFLAG", 0)); + db_set_b(wi->hContact, MODULENAME, "Reuse", (BYTE)g_plugin.getByte("Reuse", 0)); + db_set_b(wi->hContact, MODULENAME, "GiveUpDays", (BYTE)g_plugin.getByte("GiveUpDays", 0)); + db_set_dw(wi->hContact, MODULENAME, "GiveUpDate", (DWORD)g_plugin.getDword("GiveUpDate", 0)); + db_set_w(wi->hContact, MODULENAME, "ConfirmTimeout", (WORD)g_plugin.getWord("ConfirmTimeout", 0)); break; case IDC_SETTINGS: @@ -394,8 +394,8 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, SetDlgItemText(hwnd, GRP_MSG, msg); populateSettingsList(GetDlgItem(hwnd, IDC_SETTINGS)); SendDlgItemMessage(hwnd, IDC_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG((short)1024, (short)0)); - CheckDlgButton(hwnd, IDC_USEADVANCED, db_get_b(NULL, MODULENAME, "UseAdvanced", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_SHOWDELIVERYMSGS, db_get_b(NULL, MODULENAME, "ShowDeliveryMessages", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd, IDC_USEADVANCED, g_plugin.getByte("UseAdvanced", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd, IDC_SHOWDELIVERYMSGS, g_plugin.getByte("ShowDeliveryMessages", 1) ? BST_CHECKED : BST_UNCHECKED); db_set_b(wi->hContact, MODULENAME, "LastSetting", 0); } return FALSE; @@ -419,8 +419,8 @@ INT_PTR CALLBACK BuddyPounceOptionsDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, mir_free(text); } else db_unset(hContact, MODULENAME, "PounceMsg"); - db_set_b(NULL, MODULENAME, "UseAdvanced", (BYTE)IsDlgButtonChecked(hwnd, IDC_USEADVANCED)); - db_set_b(NULL, MODULENAME, "ShowDeliveryMessages", (BYTE)IsDlgButtonChecked(hwnd, IDC_SHOWDELIVERYMSGS)); + g_plugin.setByte("UseAdvanced", (BYTE)IsDlgButtonChecked(hwnd, IDC_USEADVANCED)); + g_plugin.setByte("ShowDeliveryMessages", (BYTE)IsDlgButtonChecked(hwnd, IDC_SHOWDELIVERYMSGS)); if (wi->SendIfMy) DestroyWindow(wi->SendIfMy); if (wi->SendWhenThey) DestroyWindow(wi->SendWhenThey); diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index 90b28e8e42..03c5bb3fe0 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -32,7 +32,7 @@ int MsgAck(WPARAM, LPARAM lParam) if (ack && ack->type == ACKTYPE_MESSAGE) { if (ack->hProcess == (HANDLE)WindowList_Find(hWindowList, ack->hContact)) { - if (db_get_b(NULL, MODULENAME, "ShowDeliveryMessages", 1)) + if (g_plugin.getByte("ShowDeliveryMessages", 1)) CreateMessageAcknowlegedWindow(ack->hContact, ack->result == ACKRESULT_SUCCESS); if (ack->result == ACKRESULT_SUCCESS) { // wrtie it to the DB @@ -164,7 +164,7 @@ int UserOnlineSettingChanged(WPARAM hContact, LPARAM lParam) INT_PTR BuddyPounceMenuCommand(WPARAM hContact, LPARAM) { - if (db_get_b(NULL, MODULENAME, "UseAdvanced", 0) || db_get_b(hContact, MODULENAME, "UseAdvanced", 0)) + if (g_plugin.getByte("UseAdvanced", 0) || db_get_b(hContact, MODULENAME, "UseAdvanced", 0)) CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_POUNCE), nullptr, BuddyPounceDlgProc, hContact); else CreateDialogParam(g_plugin.getInst(), MAKEINTRESOURCE(IDD_POUNCE_SIMPLE), nullptr, BuddyPounceSimpleDlgProc, hContact); @@ -176,10 +176,10 @@ INT_PTR AddSimpleMessage(WPARAM wParam, LPARAM lParam) MCONTACT hContact = wParam; wchar_t* message = (wchar_t*)lParam; db_set_ws(hContact, MODULENAME, "PounceMsg", message); - db_set_w(hContact, MODULENAME, "SendIfMyStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfMyStatusIsFLAG", 1)); - db_set_w(hContact, MODULENAME, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, MODULENAME, "SendIfTheirStatusIsFLAG", 1)); - db_set_b(hContact, MODULENAME, "Reuse", (BYTE)db_get_b(NULL, MODULENAME, "Reuse", 0)); - db_set_b(hContact, MODULENAME, "GiveUpDays", (BYTE)db_get_b(NULL, MODULENAME, "GiveUpDays", 0)); + db_set_w(hContact, MODULENAME, "SendIfMyStatusIsFLAG", (WORD)g_plugin.getWord("SendIfMyStatusIsFLAG", 1)); + db_set_w(hContact, MODULENAME, "SendIfTheirStatusIsFLAG", (WORD)g_plugin.getWord("SendIfTheirStatusIsFLAG", 1)); + db_set_b(hContact, MODULENAME, "Reuse", (BYTE)g_plugin.getByte("Reuse", 0)); + db_set_b(hContact, MODULENAME, "GiveUpDays", (BYTE)g_plugin.getByte("GiveUpDays", 0)); db_set_dw(hContact, MODULENAME, "GiveUpDate", (DWORD)(db_get_b(hContact, MODULENAME, "GiveUpDays", 0)*SECONDSINADAY)); return 0; } diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h index e651bc45b0..cf29d76da1 100644 --- a/plugins/CSList/src/stdafx.h +++ b/plugins/CSList/src/stdafx.h @@ -91,14 +91,14 @@ struct CMPlugin : public PLUGIN #define ListView_SetSelectionMark( x, y ) 0 #endif -#define getByte(setting, error) db_get_b(NULL, MODNAME, setting, error) -#define setByte(setting, value) db_set_b(NULL, MODNAME, setting, value) -#define getWord(setting, error) db_get_w(NULL, MODNAME, setting, error) -#define setWord(setting, value) db_set_w(NULL, MODNAME, setting, value) -#define getDword(setting, error) db_get_dw(NULL, MODNAME, setting, error) -#define setDword(setting, value) db_set_dw(NULL, MODNAME, setting, value) +#define getByte(setting, error) db_get_b(0, MODNAME, setting, error) +#define setByte(setting, value) db_set_b(0, MODNAME, setting, value) +#define getWord(setting, error) db_get_w(0, MODNAME, setting, error) +#define setWord(setting, value) db_set_w(0, MODNAME, setting, value) +#define getDword(setting, error) db_get_dw(0, MODNAME, setting, error) +#define setDword(setting, value) db_set_dw(0, MODNAME, setting, value) #define getWString(setting, dest) db_get_ws(NULL, MODNAME, setting, dest) -#define setWString(setting, value) db_set_ws(NULL, MODNAME, setting, value) +#define setWString(setting, value) db_set_ws(0, MODNAME, setting, value) #define deleteSetting(setting) db_unset(NULL, MODNAME, setting) // -- diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 79cad93fdc..15c18f7e28 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -22,54 +22,54 @@ INT_PTR APIChangeTextLayout(WPARAM wParam, LPARAM lParam) void ReadMainOptions() { - moOptions.dwHotkey_Layout = db_get_dw(NULL, MODULENAME, "HotkeyLayout", 119); - moOptions.dwHotkey_Layout2 = db_get_dw(NULL, MODULENAME, "HotkeyLayout2", 120); - moOptions.dwHotkey_Case = db_get_dw(NULL, MODULENAME, "HotkeyCase", 121); - moOptions.CurrentWordLayout = db_get_b(NULL, MODULENAME, "CurrentWordLayout", 0); - moOptions.CurrentWordLayout2 = db_get_b(NULL, MODULENAME, "CurrentWordLayout2", 1); - moOptions.CurrentWordCase = db_get_b(NULL, MODULENAME, "CurrentWordCase", 0); - moOptions.TwoWay = db_get_b(NULL, MODULENAME, "TwoWay", 1); - moOptions.ChangeSystemLayout = db_get_b(NULL, MODULENAME, "ChangeSystemLayout", 1); - moOptions.CopyToClipboard = db_get_b(NULL, MODULENAME, "CopyToClipboard", 0); - moOptions.ShowPopup = db_get_b(NULL, MODULENAME, "ShowPopup", 1); - moOptions.bCaseOperations = db_get_b(NULL, MODULENAME, "CaseOperations", 0); + moOptions.dwHotkey_Layout = g_plugin.getDword("HotkeyLayout", 119); + moOptions.dwHotkey_Layout2 = g_plugin.getDword("HotkeyLayout2", 120); + moOptions.dwHotkey_Case = g_plugin.getDword("HotkeyCase", 121); + moOptions.CurrentWordLayout = g_plugin.getByte("CurrentWordLayout", 0); + moOptions.CurrentWordLayout2 = g_plugin.getByte("CurrentWordLayout2", 1); + moOptions.CurrentWordCase = g_plugin.getByte("CurrentWordCase", 0); + moOptions.TwoWay = g_plugin.getByte("TwoWay", 1); + moOptions.ChangeSystemLayout = g_plugin.getByte("ChangeSystemLayout", 1); + moOptions.CopyToClipboard = g_plugin.getByte("CopyToClipboard", 0); + moOptions.ShowPopup = g_plugin.getByte("ShowPopup", 1); + moOptions.bCaseOperations = g_plugin.getByte("CaseOperations", 0); } void WriteMainOptions() { - db_set_dw(NULL, MODULENAME, "HotkeyLayout", moOptions.dwHotkey_Layout); - db_set_dw(NULL, MODULENAME, "HotkeyLayout2", moOptions.dwHotkey_Layout2); - db_set_dw(NULL, MODULENAME, "HotkeyCase", moOptions.dwHotkey_Case); - db_set_b(NULL, MODULENAME, "CurrentWordLayout", moOptions.CurrentWordLayout); - db_set_b(NULL, MODULENAME, "CurrentWordLayout2", moOptions.CurrentWordLayout2); - db_set_b(NULL, MODULENAME, "CurrentWordCase", moOptions.CurrentWordCase); - db_set_b(NULL, MODULENAME, "TwoWay", moOptions.TwoWay); - db_set_b(NULL, MODULENAME, "ChangeSystemLayout", moOptions.ChangeSystemLayout); - db_set_b(NULL, MODULENAME, "CopyToClipboard", moOptions.CopyToClipboard); - db_set_b(NULL, MODULENAME, "ShowPopup", moOptions.ShowPopup); - db_set_b(NULL, MODULENAME, "CaseOperations", moOptions.bCaseOperations); + g_plugin.setDword("HotkeyLayout", moOptions.dwHotkey_Layout); + g_plugin.setDword("HotkeyLayout2", moOptions.dwHotkey_Layout2); + g_plugin.setDword("HotkeyCase", moOptions.dwHotkey_Case); + g_plugin.setByte("CurrentWordLayout", moOptions.CurrentWordLayout); + g_plugin.setByte("CurrentWordLayout2", moOptions.CurrentWordLayout2); + g_plugin.setByte("CurrentWordCase", moOptions.CurrentWordCase); + g_plugin.setByte("TwoWay", moOptions.TwoWay); + g_plugin.setByte("ChangeSystemLayout", moOptions.ChangeSystemLayout); + g_plugin.setByte("CopyToClipboard", moOptions.CopyToClipboard); + g_plugin.setByte("ShowPopup", moOptions.ShowPopup); + g_plugin.setByte("CaseOperations", moOptions.bCaseOperations); } void ReadPopupOptions() { - poOptions.bColourType = db_get_b(NULL, MODULENAME, "ColourType", 0); - poOptions.crBackColour = (COLORREF)db_get_dw(NULL, MODULENAME, "BackColor", 0xD2CABF); - poOptions.crTextColour = (COLORREF)db_get_dw(NULL, MODULENAME, "TextColor", 0x000000); - poOptions.bTimeoutType = db_get_b(NULL, MODULENAME, "TimeoutType", 0); - poOptions.bTimeout = db_get_b(NULL, MODULENAME, "Timeout", 10); - poOptions.bLeftClick = db_get_b(NULL, MODULENAME, "LeftClick", 0); - poOptions.bRightClick = db_get_b(NULL, MODULENAME, "RightClick", 1); + poOptions.bColourType = g_plugin.getByte("ColourType", 0); + poOptions.crBackColour = (COLORREF)g_plugin.getDword("BackColor", 0xD2CABF); + poOptions.crTextColour = (COLORREF)g_plugin.getDword("TextColor", 0x000000); + poOptions.bTimeoutType = g_plugin.getByte("TimeoutType", 0); + poOptions.bTimeout = g_plugin.getByte("Timeout", 10); + poOptions.bLeftClick = g_plugin.getByte("LeftClick", 0); + poOptions.bRightClick = g_plugin.getByte("RightClick", 1); } void WritePopupOptions() { - db_set_b(NULL, MODULENAME, "ColourType", poOptions.bColourType); - db_set_dw(NULL, MODULENAME, "BackColor", poOptions.crBackColour); - db_set_dw(NULL, MODULENAME, "TextColor", poOptions.crTextColour); - db_set_b(NULL, MODULENAME, "TimeoutType", poOptions.bTimeoutType); - db_set_b(NULL, MODULENAME, "Timeout", poOptions.bTimeout); - db_set_b(NULL, MODULENAME, "LeftClick", poOptions.bLeftClick); - db_set_b(NULL, MODULENAME, "RightClick", poOptions.bRightClick); + g_plugin.setByte("ColourType", poOptions.bColourType); + g_plugin.setDword("BackColor", poOptions.crBackColour); + g_plugin.setDword("TextColor", poOptions.crTextColour); + g_plugin.setByte("TimeoutType", poOptions.bTimeoutType); + g_plugin.setByte("Timeout", poOptions.bTimeout); + g_plugin.setByte("LeftClick", poOptions.bLeftClick); + g_plugin.setByte("RightClick", poOptions.bRightClick); } void RegPopupActions() @@ -101,7 +101,7 @@ int ModulesLoaded(WPARAM, LPARAM) for (int i = 0; i < bLayNum; i++) { LPTSTR ptszCurrLayout = GenerateLayoutString(hklLayouts[i]); LPSTR ptszTemp = GetNameOfLayout(hklLayouts[i]); - ptrW tszValue(db_get_wsa(NULL, MODULENAME, ptszTemp)); + ptrW tszValue(g_plugin.getWStringA(ptszTemp)); if (tszValue == 0) ptszLayStrings[i] = ptszCurrLayout; else if (!mir_wstrcmp(tszValue, ptszEmptySting)) @@ -109,7 +109,7 @@ int ModulesLoaded(WPARAM, LPARAM) else { ptszLayStrings[i] = tszValue.detach(); if (!mir_wstrcmp(ptszCurrLayout, ptszLayStrings[i])) - db_unset(NULL, MODULENAME, ptszTemp); + g_plugin.delSetting(ptszTemp); mir_free(ptszCurrLayout); } mir_free(ptszTemp); @@ -134,7 +134,7 @@ int ModulesLoaded(WPARAM, LPARAM) RegPopupActions(); - db_set_dw(NULL, MODULENAME, "CurrentVer", PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)); + g_plugin.setDword("CurrentVer", PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)); return 0; } diff --git a/plugins/ChangeKeyboardLayout/src/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp index d70b37048e..a27d12566f 100644 --- a/plugins/ChangeKeyboardLayout/src/options.cpp +++ b/plugins/ChangeKeyboardLayout/src/options.cpp @@ -211,9 +211,9 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP pszNameLay = GetNameOfLayout(hklLayouts[i]); if (mir_wstrcmp(ptszMemLay, ptszGenLay) != 0) - db_set_ws(NULL, MODULENAME, pszNameLay, ptszMemLay); + g_plugin.setWString(pszNameLay, ptszMemLay); else - db_unset(NULL, MODULENAME, pszNameLay); + g_plugin.delSetting(pszNameLay); mir_free(pszNameLay); mir_free(ptszGenLay); diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index c8fbf90916..086c447f38 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -291,7 +291,7 @@ INT_PTR CALLBACK CCNErrorDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM) case WM_DESTROY: if (IsDlgButtonChecked(hwndDlg, IDC_DONTREMIND)) - db_set_b(NULL, MODULENAME, DB_NO_FINGERPRINT_ERROR, 1); + g_plugin.setByte(DB_NO_FINGERPRINT_ERROR, 1); break; } return 0; @@ -334,7 +334,7 @@ static int MirandaLoaded(WPARAM, LPARAM) } // seems that Fingerprint is not installed - if (!bFingerprintExists && !db_get_b(NULL, MODULENAME, DB_NO_FINGERPRINT_ERROR, 0)) + if (!bFingerprintExists && !g_plugin.getByte(DB_NO_FINGERPRINT_ERROR, 0)) CreateDialog(g_plugin.getInst(), MAKEINTRESOURCE(IDD_CCN_ERROR), nullptr, CCNErrorDlgProc); return 0; @@ -350,13 +350,12 @@ int CMPlugin::Load() InitOptions(); - if (db_get_b(NULL, MODULENAME, DB_SETTINGSVER, 0) < 1) { - TCString Str; - Str = db_get_s(NULL, MODULENAME, DB_IGNORESUBSTRINGS, L""); + if (g_plugin.getByte(DB_SETTINGSVER, 0) < 1) { + TCString Str = db_get_s(0, MODULENAME, DB_IGNORESUBSTRINGS, L""); if (Str.GetLen()) // fix incorrect regexp from v0.1.1.0 - db_set_ws(NULL, MODULENAME, DB_IGNORESUBSTRINGS, Str.Replace(L"/Miranda[0-9A-F]{8}/", L"/[0-9A-F]{8}(\\W|$)/")); + g_plugin.setWString(DB_IGNORESUBSTRINGS, Str.Replace(L"/Miranda[0-9A-F]{8}/", L"/[0-9A-F]{8}(\\W|$)/")); - db_set_b(NULL, MODULENAME, DB_SETTINGSVER, 1); + g_plugin.setByte(DB_SETTINGSVER, 1); } return 0; } diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index c806b5f56f..5c6dfc3e99 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -128,7 +128,7 @@ INT_PTR CALLBACK PopupOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara DBCONTACTWRITESETTING cws = {}; cws.szModule = "ICQ"; cws.szSetting = DB_MIRVER; - db_set_s(NULL, MODULENAME, DB_OLDMIRVER, "ICQ Lite v5"); + g_plugin.setString(DB_OLDMIRVER, "ICQ Lite v5"); ContactSettingChanged(NULL, (LPARAM)&cws); // simulate a version change delete g_PreviewOptPage; g_PreviewOptPage = nullptr; diff --git a/plugins/ClientChangeNotify/src/Options.cpp b/plugins/ClientChangeNotify/src/Options.cpp index cc30202f41..e5fcc70ca7 100644 --- a/plugins/ClientChangeNotify/src/Options.cpp +++ b/plugins/ClientChangeNotify/src/Options.cpp @@ -143,7 +143,7 @@ TCString COptItem::GetStrDBVal(const CString &sModule, CString *sDBSettingPrefix { if (sDBSetting != nullptr) { _ASSERT(GetDefValue()); - return db_get_s(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, *(TCString*)GetDefValue()); + return db_get_s(0, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, *(TCString*)GetDefValue()); } return *(TCString*)GetDefValue(); } @@ -151,7 +151,7 @@ TCString COptItem::GetStrDBVal(const CString &sModule, CString *sDBSettingPrefix void COptItem::SetStrDBVal(const CString &sModule, TCString &Str, CString *sDBSettingPrefix) { if (sDBSetting != nullptr && !m_bReadOnly) { - db_set_ws(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str); + db_set_ws(0, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str); } } @@ -271,11 +271,11 @@ int TreeReadEnum(const char *szSetting, void *lParam) int Len = pData->TreeCtrl->sDBSetting.GetLen() + _countof(TREEITEM_DBSTR_TITLE) - 1; if (!strncmp(szSetting, pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_TITLE, Len) && isdigit(szSetting[Len])) { int ID = atol(szSetting + Len); - short ParentID = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) ? 0 : db_get_w(NULL, pData->sModule, + short ParentID = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) ? 0 : db_get_w(0, pData->sModule, pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_PARENT + (szSetting + Len), -1); - short Order = db_get_w(NULL, pData->sModule, + short Order = db_get_w(0, pData->sModule, pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_ORDER + (szSetting + Len), -1); - char Flags = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL && !(pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES)) ? 0 : db_get_b(NULL, pData->sModule, + char Flags = (pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL && !(pData->TreeCtrl->TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES)) ? 0 : db_get_b(0, pData->sModule, pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_FLAGS + (szSetting + Len), 0); if (ParentID >= 0 && Order >= 0) { CString tmp(pData->sDBSettingPrefix + pData->TreeCtrl->sDBSetting + pData->TreeCtrl->User_Str1_DBName + CString(szSetting + Len)); @@ -285,8 +285,8 @@ int TreeReadEnum(const char *szSetting, void *lParam) pItem.ParentID = ParentID; pItem.Flags = Flags; pItem.hItem = nullptr; - pItem.Title = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, L""); - pItem.User_Str1 = (pData->TreeCtrl->User_Str1_DBName == nullptr) ? nullptr : db_get_s(NULL, pData->sModule, tmp, (wchar_t*)nullptr); + pItem.Title = db_get_s(0, pData->sModule, *pData->sDBSettingPrefix + szSetting, L""); + pItem.User_Str1 = (pData->TreeCtrl->User_Str1_DBName == nullptr) ? nullptr : db_get_s(0, pData->sModule, tmp, (wchar_t*)nullptr); } } return 0; @@ -326,16 +326,16 @@ void COptItem_TreeCtrl::MemToDB(const CString &sModule, CString *sDBSettingPrefi CString StrID; _itoa(m_value[i].ID, StrID.GetBuffer(64), 10); StrID.ReleaseBuffer(); - db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, m_value[i].Title); + db_set_ws(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, m_value[i].Title); if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL)) - db_set_w(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_PARENT + StrID, m_value[i].ParentID); + db_set_w(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_PARENT + StrID, m_value[i].ParentID); - db_set_w(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_ORDER + StrID, i); + db_set_w(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_ORDER + StrID, i); if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) || TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES) - db_set_b(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, m_value[i].Flags); + db_set_b(0, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, m_value[i].Flags); if (User_Str1_DBName != nullptr && m_value[i].User_Str1 != nullptr) - db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, m_value[i].User_Str1); + db_set_ws(0, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, m_value[i].User_Str1); } COptItem::MemToDB(sModule, sDBSettingPrefix); } @@ -650,7 +650,7 @@ int ListReadEnum(const char *szSetting, void *lParam) int Len = pData->sDBSettingPrefix.GetLen() + pData->ListCtrl->sDBSetting.GetLen() + _countof(LISTITEM_DBSTR_TEXT) - 1; if (!strncmp(szSetting, pData->sDBSettingPrefix + pData->ListCtrl->sDBSetting + LISTITEM_DBSTR_TEXT, Len) && isdigit(szSetting[Len])) { int ID = atol(szSetting + Len); - pData->ListCtrl->m_value.SetAtGrow(ID).Text = db_get_s(NULL, pData->sModule, *pData->sDBSettingPrefix + szSetting, L""); + pData->ListCtrl->m_value.SetAtGrow(ID).Text = db_get_s(0, pData->sModule, *pData->sDBSettingPrefix + szSetting, L""); } return 0; } @@ -689,7 +689,7 @@ void COptItem_ListCtrl::MemToDB(const CString &sModule, CString *sDBSettingPrefi CString StrID; _itoa(i, StrID.GetBuffer(64), 10); StrID.ReleaseBuffer(); - db_set_ws(NULL, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, m_value[i].Text); + db_set_ws(0, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, m_value[i].Text); } COptItem::MemToDB(sModule, sDBSettingPrefix); } diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index 8122c07614..5534c6f948 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -124,7 +124,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES); { - DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", Clist_GetDefaultExStyle()); + DWORD exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle()); for (auto &it : checkBoxToStyleEx) CheckDlgButton(hwndDlg, it.id, (exStyle & it.flag) ^ (it.flag * it.not) ? BST_CHECKED : BST_UNCHECKED); } @@ -133,24 +133,24 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETRANGE, 0, MAKELONG(999, 0)); SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETACCEL, _countof(accel), (LPARAM)& accel); SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETPOS, 0, - MAKELONG(db_get_w(NULL, "CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME), 0)); + MAKELONG(db_get_w(0, "CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME), 0)); } - CheckDlgButton(hwndDlg, IDC_IDLE, db_get_b(NULL, "CLC", "ShowIdle", CLCDEFAULT_SHOWIDLE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_IDLE, db_get_b(0, "CLC", "ShowIdle", CLCDEFAULT_SHOWIDLE) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_SETRANGE, 0, MAKELONG(64, 0)); SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_SETPOS, 0, - MAKELONG(db_get_b(NULL, "CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN), 0)); + MAKELONG(db_get_b(0, "CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN), 0)); SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETRANGE, 0, MAKELONG(50, 0)); SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETPOS, 0, - MAKELONG(db_get_b(NULL, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT), 0)); + MAKELONG(db_get_b(0, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT), 0)); CheckDlgButton(hwndDlg, IDC_GREYOUT, - db_get_dw(NULL, "CLC", "GreyoutFlags", CLCDEFAULT_GREYOUTFLAGS) ? BST_CHECKED : BST_UNCHECKED); + db_get_dw(0, "CLC", "GreyoutFlags", CLCDEFAULT_GREYOUTFLAGS) ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_SMOOTHTIME), IsDlgButtonChecked(hwndDlg, IDC_NOTNOSMOOTHSCROLLING)); EnableWindow(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), IsDlgButtonChecked(hwndDlg, IDC_GREYOUT)); FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), greyoutValues, _countof(greyoutValues), - db_get_dw(NULL, "CLC", "FullGreyoutFlags", CLCDEFAULT_FULLGREYOUTFLAGS)); + db_get_dw(0, "CLC", "FullGreyoutFlags", CLCDEFAULT_FULLGREYOUTFLAGS)); FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), offlineValues, _countof(offlineValues), - db_get_dw(NULL, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES)); - CheckDlgButton(hwndDlg, IDC_NOSCROLLBAR, db_get_b(NULL, "CLC", "NoVScrollBar", 0) ? BST_CHECKED : BST_UNCHECKED); + db_get_dw(0, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES)); + CheckDlgButton(hwndDlg, IDC_NOSCROLLBAR, db_get_b(0, "CLC", "NoVScrollBar", 0) ? BST_CHECKED : BST_UNCHECKED); SetDlgItemText(hwndDlg, IDC_T_CONTACT, MyDBGetContactSettingTString(NULL, "CLC", "TemplateContact", tmp, 1024, TranslateT("%name% [%status% %protocol%] %status_message%"))); SendDlgItemMessage(hwndDlg, IDC_T_CONTACT, EM_LIMITTEXT, 256, 0); @@ -206,33 +206,33 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam if ((IsDlgButtonChecked(hwndDlg, checkBoxToStyleEx[i].id) == 0) == checkBoxToStyleEx[i].not) exStyle |= checkBoxToStyleEx[i].flag; - db_set_dw(NULL, "CLC", "ExStyle", exStyle); + db_set_dw(0, "CLC", "ExStyle", exStyle); { DWORD fullGreyoutFlags = MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS)); - db_set_dw(NULL, "CLC", "FullGreyoutFlags", fullGreyoutFlags); + db_set_dw(0, "CLC", "FullGreyoutFlags", fullGreyoutFlags); if (IsDlgButtonChecked(hwndDlg, IDC_GREYOUT)) - db_set_dw(NULL, "CLC", "GreyoutFlags", fullGreyoutFlags); + db_set_dw(0, "CLC", "GreyoutFlags", fullGreyoutFlags); else - db_set_dw(NULL, "CLC", "GreyoutFlags", 0); + db_set_dw(0, "CLC", "GreyoutFlags", 0); } - db_set_b(NULL, "CLC", "ShowIdle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0)); - db_set_dw(NULL, "CLC", "OfflineModes", MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS))); - db_set_b(NULL, "CLC", "LeftMargin", + db_set_b(0, "CLC", "ShowIdle", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0)); + db_set_dw(0, "CLC", "OfflineModes", MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS))); + db_set_b(0, "CLC", "LeftMargin", (BYTE)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0)); - db_set_w(NULL, "CLC", "ScrollTime", + db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CLC", "GroupIndent", + db_set_b(0, "CLC", "GroupIndent", (BYTE)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CLC", "NoVScrollBar", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0)); + db_set_b(0, "CLC", "NoVScrollBar", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0)); GetDlgItemText(hwndDlg, IDC_T_CONTACT, tmp, _countof(tmp)); - db_set_ws(NULL, "CLC", "TemplateContact", tmp); + db_set_ws(0, "CLC", "TemplateContact", tmp); GetDlgItemText(hwndDlg, IDC_T_GROUP, tmp, _countof(tmp)); - db_set_ws(NULL, "CLC", "TemplateGroup", tmp); + db_set_ws(0, "CLC", "TemplateGroup", tmp); GetDlgItemText(hwndDlg, IDC_T_DIVIDER, tmp, _countof(tmp)); - db_set_ws(NULL, "CLC", "TemplateDivider", tmp); + db_set_ws(0, "CLC", "TemplateDivider", tmp); GetDlgItemText(hwndDlg, IDC_T_INFO, tmp, _countof(tmp)); - db_set_ws(NULL, "CLC", "TemplateInfo", tmp); + db_set_ws(0, "CLC", "TemplateInfo", tmp); Clist_ClcOptionsChanged(); return TRUE; diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index f0eb05dd78..2ad09982b0 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -43,28 +43,28 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1)); - CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED); - CheckDlgButton(hwndDlg, IDC_SORTBYNAME, !db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) && !db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SORTBYSTATUS, db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SORTBYPROTO, db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, db_get_b(0, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, db_get_b(0, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_SORTBYNAME, !db_get_b(0, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) && !db_get_b(0, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SORTBYSTATUS, db_get_b(0, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SORTBYPROTO, db_get_b(0, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, db_get_b(0, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_ONECLK, - db_get_b(NULL, "CList", "Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_ALWAYSSTATUS, - db_get_b(NULL, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_ALWAYSMULTI, - !db_get_b(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + !db_get_b(0, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DONTCYCLE, - db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CYCLE, - db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_CYCLE ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_CYCLE ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_MULTITRAY, - db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DISABLEBLINK, - db_get_b(NULL, "CList", "DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKTIME), BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKSPIN), BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); EnableWindow(GetDlgItem(hwndDlg, IDC_STMSDELAY), BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); @@ -83,7 +83,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP EnableWindow(GetDlgItem(hwndDlg, IDC_PRIMARYSTATUS), FALSE); } SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETRANGE, 0, MAKELONG(120, 1)); - SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); + SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); { ptrA szPrimaryStatus(db_get_sa(NULL, "CList", "PrimaryStatus")); @@ -104,7 +104,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0); SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_BLINKTIME), 0); // set buddy SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250)); - SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0)); + SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CList", "IconFlashTime", 550), 0)); return TRUE; case WM_COMMAND: @@ -135,31 +135,31 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case 0: switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: - db_set_b(NULL, "CList", "HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE)); - db_set_b(NULL, "CList", "HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS)); - db_set_b(NULL, "CList", "UseGroups", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS)); - db_set_b(NULL, "CList", "SortByStatus", (BYTE) (g_bSortByStatus = IsDlgButtonChecked(hwndDlg, IDC_SORTBYSTATUS))); - db_set_b(NULL, "CList", "SortByProto", (BYTE) (g_bSortByProto = IsDlgButtonChecked(hwndDlg, IDC_SORTBYPROTO))); - db_set_b(NULL, "CList", "ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE)); - db_set_b(NULL, "CList", "Tray1Click", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONECLK)); - db_set_b(NULL, "CList", "AlwaysStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS)); - db_set_b(NULL, "CList", "AlwaysMulti", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI)); - db_set_b(NULL, "CList", "TrayIcon", + db_set_b(0, "CList", "HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE)); + db_set_b(0, "CList", "HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS)); + db_set_b(0, "CList", "UseGroups", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS)); + db_set_b(0, "CList", "SortByStatus", (BYTE) (g_bSortByStatus = IsDlgButtonChecked(hwndDlg, IDC_SORTBYSTATUS))); + db_set_b(0, "CList", "SortByProto", (BYTE) (g_bSortByProto = IsDlgButtonChecked(hwndDlg, IDC_SORTBYPROTO))); + db_set_b(0, "CList", "ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE)); + db_set_b(0, "CList", "Tray1Click", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONECLK)); + db_set_b(0, "CList", "AlwaysStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS)); + db_set_b(0, "CList", "AlwaysMulti", (BYTE)!IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI)); + db_set_b(0, "CList", "TrayIcon", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE : (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI))); - db_set_w(NULL, "CList", "CycleTime", + db_set_w(0, "CList", "CycleTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0)); - db_set_w(NULL, "CList", "IconFlashTime", + db_set_w(0, "CList", "IconFlashTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CList", "DisableTrayFlash", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); + db_set_b(0, "CList", "DisableTrayFlash", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); { int cur = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0); PROTOACCOUNT* pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cur, 0); if (pa == nullptr) db_unset(NULL, "CList", "PrimaryStatus"); else - db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName); + db_set_s(0, "CList", "PrimaryStatus", pa->szModuleName); } Clist_TrayIconIconsChanged(); diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 56043c5bf5..8ef8108178 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -30,35 +30,35 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); CheckDlgButton(hwndDlg, IDC_BRINGTOFRONT, - db_get_b(NULL, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(0, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_TOOLWND, - db_get_b(NULL, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_MIN2TRAY, - db_get_b(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); if (IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)) EnableWindow(GetDlgItem(hwndDlg, IDC_MIN2TRAY), FALSE); CheckDlgButton(hwndDlg, IDC_SHOWCAPTION, - db_get_b(NULL, "CLUI", "ShowCaption", SETTING_SHOWCAPTION_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CLUI", "ShowCaption", SETTING_SHOWCAPTION_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWMAINMENU, - db_get_b(NULL, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CLIENTDRAG, - db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(0, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)) { EnableWindow(GetDlgItem(hwndDlg, IDC_MIN2TRAY), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_TOOLWND), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_TITLETEXT), FALSE); } - CheckDlgButton(hwndDlg, IDC_FADEINOUT, db_get_b(NULL, "CLUI", "FadeInOut", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_AUTOSIZE, db_get_b(NULL, "CLUI", "AutoSize", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DROPSHADOW, db_get_b(NULL, "CList", "WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONDESKTOP, db_get_b(NULL, "CList", "OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_FADEINOUT, db_get_b(0, "CLUI", "FadeInOut", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_AUTOSIZE, db_get_b(0, "CLUI", "AutoSize", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DROPSHADOW, db_get_b(0, "CList", "WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ONDESKTOP, db_get_b(0, "CList", "OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETRANGE, 0, MAKELONG(100, 0)); - SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETPOS, 0, db_get_b(NULL, "CLUI", "MaxSizeHeight", 75)); - CheckDlgButton(hwndDlg, IDC_AUTOSIZEUPWARD, db_get_b(NULL, "CLUI", "AutoSizeUpward", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_AUTOHIDE, db_get_b(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETPOS, 0, db_get_b(0, "CLUI", "MaxSizeHeight", 75)); + CheckDlgButton(hwndDlg, IDC_AUTOSIZEUPWARD, db_get_b(0, "CLUI", "AutoSizeUpward", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_AUTOHIDE, db_get_b(0, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETRANGE, 0, MAKELONG(900, 1)); - SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0)); + SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0)); EnableWindow(GetDlgItem(hwndDlg, IDC_HIDETIME), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); EnableWindow(GetDlgItem(hwndDlg, IDC_HIDETIMESPIN), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); EnableWindow(GetDlgItem(hwndDlg, IDC_STATIC01), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); @@ -78,7 +78,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } else SetDlgItemTextA(hwndDlg, IDC_TITLETEXT, MIRANDANAME); } - CheckDlgButton(hwndDlg, IDC_TRANSPARENT, db_get_b(NULL, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_TRANSPARENT, db_get_b(0, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) { EnableWindow(GetDlgItem(hwndDlg, IDC_STATIC11), FALSE); @@ -90,9 +90,9 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255)); SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_SETRANGE, FALSE, MAKELONG(1, 255)); - SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETPOS, TRUE, db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT)); + SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETPOS, TRUE, db_get_b(0, "CList", "Alpha", SETTING_ALPHA_DEFAULT)); SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_SETPOS, TRUE, - db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT)); + db_get_b(0, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT)); SendMessage(hwndDlg, WM_HSCROLL, 0x12345678, 0); return TRUE; @@ -148,28 +148,28 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break; case WM_NOTIFY: if (((LPNMHDR)lParam)->code == PSN_APPLY) { - db_set_b(NULL, "CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); - db_set_b(NULL, "CList", "ToolWindow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)); - db_set_b(NULL, "CList", "BringToFront", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT)); - db_set_b(NULL, "CLUI", "FadeInOut", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT)); - db_set_b(NULL, "CLUI", "AutoSize", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)); - db_set_b(NULL, "CLUI", "MaxSizeHeight", (BYTE)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE)); - db_set_b(NULL, "CLUI", "AutoSizeUpward", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD)); - db_set_b(NULL, "CList", "AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); - db_set_w(NULL, "CList", "HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CList", "Transparent", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)); - db_set_b(NULL, "CList", "Alpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0)); - db_set_b(NULL, "CList", "AutoAlpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0)); - db_set_b(NULL, "CList", "WindowShadow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW)); - db_set_b(NULL, "CList", "OnDesktop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)); - db_set_b(NULL, "CLUI", "ShowCaption", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)); - db_set_b(NULL, "CLUI", "ShowMainMenu", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU)); - db_set_b(NULL, "CLUI", "ClientAreaDrag", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG)); - db_set_b(NULL, "CList", "Min2Tray", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY)); + db_set_b(0, "CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); + db_set_b(0, "CList", "ToolWindow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)); + db_set_b(0, "CList", "BringToFront", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT)); + db_set_b(0, "CLUI", "FadeInOut", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT)); + db_set_b(0, "CLUI", "AutoSize", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)); + db_set_b(0, "CLUI", "MaxSizeHeight", (BYTE)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE)); + db_set_b(0, "CLUI", "AutoSizeUpward", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD)); + db_set_b(0, "CList", "AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); + db_set_w(0, "CList", "HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CList", "Transparent", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)); + db_set_b(0, "CList", "Alpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0)); + db_set_b(0, "CList", "AutoAlpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0)); + db_set_b(0, "CList", "WindowShadow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW)); + db_set_b(0, "CList", "OnDesktop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)); + db_set_b(0, "CLUI", "ShowCaption", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)); + db_set_b(0, "CLUI", "ShowMainMenu", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU)); + db_set_b(0, "CLUI", "ClientAreaDrag", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG)); + db_set_b(0, "CList", "Min2Tray", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY)); { wchar_t title[256]; GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, _countof(title)); - db_set_ws(NULL, "CList", "TitleText", title); + db_set_ws(0, "CList", "TitleText", title); SetWindowText(g_clistApi.hwndContactList, title); } g_clistApi.pfnLoadCluiGlobalOpts(); @@ -213,7 +213,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L ShowWindow(g_clistApi.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY) ? SW_HIDE : SW_SHOW); if (IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) { SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED); - SetLayeredWindowAttributes(g_clistApi.hwndContactList, RGB(0, 0, 0), (BYTE)db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA); + SetLayeredWindowAttributes(g_clistApi.hwndContactList, RGB(0, 0, 0), (BYTE)db_get_b(0, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA); } else SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED); @@ -230,18 +230,18 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_SHOWSBAR, db_get_b(NULL, "CLUI", "ShowSBar", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SHOWSBAR, db_get_b(0, "CLUI", "ShowSBar", 1) ? BST_CHECKED : BST_UNCHECKED); { - BYTE showOpts = db_get_b(NULL, "CLUI", "SBarShow", 1); + BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1); CheckDlgButton(hwndDlg, IDC_SHOWICON, showOpts & 1 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWPROTO, showOpts & 2 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWSTATUS, showOpts & 4 ? BST_CHECKED : BST_UNCHECKED); } - CheckDlgButton(hwndDlg, IDC_RIGHTSTATUS, db_get_b(NULL, "CLUI", "SBarRightClk", 0) ? BST_UNCHECKED : BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_RIGHTSTATUS, db_get_b(0, "CLUI", "SBarRightClk", 0) ? BST_UNCHECKED : BST_CHECKED); CheckDlgButton(hwndDlg, IDC_RIGHTMIRANDA, IsDlgButtonChecked(hwndDlg, IDC_RIGHTSTATUS) == BST_UNCHECKED ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_EQUALSECTIONS, db_get_b(NULL, "CLUI", "EqualSections", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SBPANELBEVEL, db_get_b(NULL, "CLUI", "SBarBevel", 1) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SHOWGRIP, db_get_b(NULL, "CLUI", "ShowGrip", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_EQUALSECTIONS, db_get_b(0, "CLUI", "EqualSections", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SBPANELBEVEL, db_get_b(0, "CLUI", "SBarBevel", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SHOWGRIP, db_get_b(0, "CLUI", "ShowGrip", 1) ? BST_CHECKED : BST_UNCHECKED); if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) { EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWICON), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWPROTO), FALSE); @@ -268,23 +268,23 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break; case WM_NOTIFY: if (((LPNMHDR)lParam)->code == PSN_APPLY) { - db_set_b(NULL, "CLUI", "ShowSBar", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)); - db_set_b(NULL, "CLUI", "SBarShow", + db_set_b(0, "CLUI", "ShowSBar", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)); + db_set_b(0, "CLUI", "SBarShow", (BYTE)((IsDlgButtonChecked(hwndDlg, IDC_SHOWICON) ? 1 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWPROTO) ? 2 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS) ? 4 : 0))); - db_set_b(NULL, "CLUI", "SBarRightClk", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA)); - db_set_b(NULL, "CLUI", "EqualSections", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS)); - db_set_b(NULL, "CLUI", "SBarBevel", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL)); + db_set_b(0, "CLUI", "SBarRightClk", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA)); + db_set_b(0, "CLUI", "EqualSections", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS)); + db_set_b(0, "CLUI", "SBarBevel", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL)); g_clistApi.pfnLoadCluiGlobalOpts(); - if (db_get_b(NULL, "CLUI", "ShowGrip", 1) != (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) { + if (db_get_b(0, "CLUI", "ShowGrip", 1) != (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) { HWND parent = GetParent(g_clistApi.hwndStatus); int flags = WS_CHILD | CCS_BOTTOM; - db_set_b(NULL, "CLUI", "ShowGrip", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)); + db_set_b(0, "CLUI", "ShowGrip", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)); ShowWindow(g_clistApi.hwndStatus, SW_HIDE); DestroyWindow(g_clistApi.hwndStatus); - flags |= db_get_b(NULL, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; - flags |= db_get_b(NULL, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; + flags |= db_get_b(0, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; + flags |= db_get_b(0, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; g_clistApi.hwndStatus = CreateWindow(STATUSCLASSNAME, nullptr, flags, 0, 0, 0, 0, parent, nullptr, g_plugin.getInst(), nullptr); } if (IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index f5417c93b3..e369207db3 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -117,8 +117,8 @@ static INT_PTR GetStatusMode(WPARAM, LPARAM) int CMPlugin::Load() { - g_bSortByStatus = db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT); - g_bSortByProto = db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT); + g_bSortByStatus = db_get_b(0, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT); + g_bSortByProto = db_get_b(0, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT); Clist_GetInterface(); coreCli = g_clistApi; diff --git a/plugins/Clist_nicer/src/CLCButton.cpp b/plugins/Clist_nicer/src/CLCButton.cpp index 4fcc9f8c71..3643f85e35 100644 --- a/plugins/Clist_nicer/src/CLCButton.cpp +++ b/plugins/Clist_nicer/src/CLCButton.cpp @@ -65,9 +65,9 @@ static void InitDefaultButtons() } g_index = -1; - ClcSetButtonState(IDC_TBHIDEOFFLINE, db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT)); - ClcSetButtonState(IDC_TBHIDEGROUPS, db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT)); - ClcSetButtonState(IDC_TBSOUND, db_get_b(NULL, "Skin", "UseSound", 1) ? BST_UNCHECKED : BST_CHECKED); + ClcSetButtonState(IDC_TBHIDEOFFLINE, db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT)); + ClcSetButtonState(IDC_TBHIDEGROUPS, db_get_b(0, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT)); + ClcSetButtonState(IDC_TBSOUND, db_get_b(0, "Skin", "UseSound", 1) ? BST_UNCHECKED : BST_CHECKED); } void ClcSetButtonState(int ctrlid, int status) diff --git a/plugins/Clist_nicer/src/Docking.cpp b/plugins/Clist_nicer/src/Docking.cpp index c7d9606433..69281f2a1f 100644 --- a/plugins/Clist_nicer/src/Docking.cpp +++ b/plugins/Clist_nicer/src/Docking.cpp @@ -97,21 +97,21 @@ int Docking_ProcessWindowMessage(WPARAM wParam, LPARAM lParam) MSG *msg = (MSG *)wParam; if (msg->message == WM_DESTROY) - db_set_b(NULL, "CList", "Docked", (BYTE)docked); + db_set_b(0, "CList", "Docked", (BYTE)docked); if (!docked && msg->message != WM_CREATE && msg->message != WM_MOVING && msg->message != WM_CREATEDOCKED && msg->message != WM_MOVE) return 0; switch (msg->message) { case WM_CREATE: //if (GetSystemMetrics(SM_CMONITORS)>1) return 0; - if (db_get_b(NULL, "CList", "Docked", 0)) + if (db_get_b(0, "CList", "Docked", 0)) PostMessage(msg->hwnd, WM_CREATEDOCKED, 0, 0); draggingTitle = 0; return 0; case WM_CREATEDOCKED: //we need to post a message just after creation to let main message function do some work - docked = (int)(char)db_get_b(NULL, "CList", "Docked", 0); + docked = (int)(char)db_get_b(0, "CList", "Docked", 0); if (IsWindowVisible(msg->hwnd) && !IsIconic(msg->hwnd)) { RECT rc, rcMonitor; memset(&abd, 0, sizeof(abd)); diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 9ed16ff995..5ba3d92a7f 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -133,7 +133,7 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam) if (!__strcmp(cws->szSetting, "Status")) { if (!db_get_b(hContact, "CList", "Hidden", 0)) if (cws->value.wVal == ID_STATUS_OFFLINE) - if (db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT)) + if (db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT)) return 0; SendMessage(g_clistApi.hwndContactTree, INTM_STATUSCHANGED, hContact, lParam); @@ -156,12 +156,12 @@ static int ClcSettingChanged(WPARAM hContact, LPARAM lParam) } } else if (!__strcmp(cws->szModule, "Skin") && !__strcmp(cws->szSetting, "UseSound")) { - cfg::dat.soundsOff = db_get_b(NULL, cws->szModule, cws->szSetting, 0) ? 0 : 1; + cfg::dat.soundsOff = db_get_b(0, cws->szModule, cws->szSetting, 0) ? 0 : 1; ClcSetButtonState(IDC_TBSOUND, cfg::dat.soundsOff ? BST_CHECKED : BST_UNCHECKED); SetButtonStates(); } else if (!__strcmp(cws->szModule, "CList") && !__strcmp(cws->szSetting, "UseGroups")) { - ClcSetButtonState(IDC_TBHIDEGROUPS, db_get_b(NULL, cws->szModule, cws->szSetting, SETTING_USEGROUPS_DEFAULT)); + ClcSetButtonState(IDC_TBHIDEGROUPS, db_get_b(0, cws->szModule, cws->szSetting, SETTING_USEGROUPS_DEFAULT)); SetButtonStates(); } else if (!__strcmp(cws->szModule, "TopToolBar") && !__strcmp(cws->szSetting, "UseFlatButton")) { diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index e877201fea..cc3f88ed5c 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -142,7 +142,7 @@ void RebuildEntireList(HWND hwnd, struct ClcData *dat) RowHeight::Clear(dat); RowHeight::getMaxRowHeight(dat, hwnd); - dat->SelectMode = db_get_b(NULL, "CLC", "SelectMode", 0); + dat->SelectMode = db_get_b(0, "CLC", "SelectMode", 0); coreCli.pfnRebuildEntireList(hwnd, dat); } diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index cfb7a37879..54f4b0a99f 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -117,7 +117,7 @@ static void cfgSetFlag(HWND hwndDlg, int ctrlId, DWORD dwMask) cfg::dat.dwFlags |= dwMask; else cfg::dat.dwFlags &= ~dwMask; - db_set_dw(NULL, "CLUI", "Frameflags", cfg::dat.dwFlags); + db_set_dw(0, "CLUI", "Frameflags", cfg::dat.dwFlags); } void GetDefaultFontSetting(int i, LOGFONT *lf, COLORREF *colour) @@ -155,26 +155,26 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam, SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Always right")); SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Automatic (RTL)")); - DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", Clist_GetDefaultExStyle()); + DWORD exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle()); for (auto &it : checkBoxToGroupStyleEx) CheckDlgButton(hwndDlg, it.id, (exStyle & it.flag) ^ (it.flag * it.not_t) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_NOGROUPICON, (cfg::dat.dwFlags & CLUI_FRAME_NOGROUPICON) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_CENTERGROUPNAMES, db_get_b(NULL, "CLCExt", "EXBK_CenterGroupnames", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CENTERGROUPNAMES, db_get_b(0, "CLCExt", "EXBK_CenterGroupnames", 0) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_SETCURSEL, cfg::dat.bGroupAlign, 0); SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_SETRANGE, 0, MAKELONG(64, 0)); - SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_SETPOS, 0, db_get_b(NULL, "CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN)); + SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_SETPOS, 0, db_get_b(0, "CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN)); SendDlgItemMessage(hwndDlg, IDC_RIGHTMARGINSPIN, UDM_SETRANGE, 0, MAKELONG(64, 0)); - SendDlgItemMessage(hwndDlg, IDC_RIGHTMARGINSPIN, UDM_SETPOS, 0, db_get_b(NULL, "CLC", "RightMargin", CLCDEFAULT_LEFTMARGIN)); + SendDlgItemMessage(hwndDlg, IDC_RIGHTMARGINSPIN, UDM_SETPOS, 0, db_get_b(0, "CLC", "RightMargin", CLCDEFAULT_LEFTMARGIN)); SendDlgItemMessage(hwndDlg, IDC_ROWGAPSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0)); SendDlgItemMessage(hwndDlg, IDC_ROWGAPSPIN, UDM_SETPOS, 0, cfg::dat.bRowSpacing); SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETRANGE, 0, MAKELONG(50, 0)); - SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETPOS, 0, db_get_b(NULL, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT)); + SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETPOS, 0, db_get_b(0, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT)); SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETRANGE, 0, MAKELONG(255, 8)); - SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETPOS, 0, db_get_b(NULL, "CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT)); + SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_SETPOS, 0, db_get_b(0, "CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT)); SendDlgItemMessage(hwndDlg, IDC_GROUPROWHEIGHTSPIN, UDM_SETRANGE, 0, MAKELONG(255, 8)); - SendDlgItemMessage(hwndDlg, IDC_GROUPROWHEIGHTSPIN, UDM_SETPOS, 0, db_get_b(NULL, "CLC", "GRowHeight", CLCDEFAULT_ROWHEIGHT)); + SendDlgItemMessage(hwndDlg, IDC_GROUPROWHEIGHTSPIN, UDM_SETPOS, 0, db_get_b(0, "CLC", "GRowHeight", CLCDEFAULT_ROWHEIGHT)); SendDlgItemMessage(hwndDlg, IDC_AVATARPADDINGSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0)); SendDlgItemMessage(hwndDlg, IDC_AVATARPADDINGSPIN, UDM_SETPOS, 0, cfg::dat.avatarPadding); } @@ -193,7 +193,7 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam, switch (((LPNMHDR)lParam)->idFrom) { case 0: if (((LPNMHDR)lParam)->code == PSN_APPLY) { - DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", Clist_GetDefaultExStyle()); + DWORD exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle()); for (auto &it : checkBoxToGroupStyleEx) { if ((IsDlgButtonChecked(hwndDlg, it.id) == 0) == it.not_t) @@ -201,30 +201,30 @@ static INT_PTR CALLBACK DlgProcDspGroups(HWND hwndDlg, UINT msg, WPARAM wParam, else exStyle &= ~(it.flag); } - db_set_dw(NULL, "CLC", "ExStyle", exStyle); + db_set_dw(0, "CLC", "ExStyle", exStyle); cfgSetFlag(hwndDlg, IDC_NOGROUPICON, CLUI_FRAME_NOGROUPICON); - db_set_b(NULL, "CLCExt", "EXBK_CenterGroupnames", IsDlgButtonChecked(hwndDlg, IDC_CENTERGROUPNAMES) ? 1 : 0); + db_set_b(0, "CLCExt", "EXBK_CenterGroupnames", IsDlgButtonChecked(hwndDlg, IDC_CENTERGROUPNAMES) ? 1 : 0); LRESULT curSel = SendDlgItemMessage(hwndDlg, IDC_GROUPALIGN, CB_GETCURSEL, 0, 0); if (curSel != CB_ERR) { cfg::dat.bGroupAlign = (BYTE)curSel; - db_set_b(NULL, "CLC", "GroupAlign", cfg::dat.bGroupAlign); + db_set_b(0, "CLC", "GroupAlign", cfg::dat.bGroupAlign); } cfg::dat.bRowSpacing = (BYTE)SendDlgItemMessage(hwndDlg, IDC_ROWGAPSPIN, UDM_GETPOS, 0, 0); - db_set_b(NULL, "CLC", "RowGap", cfg::dat.bRowSpacing); + db_set_b(0, "CLC", "RowGap", cfg::dat.bRowSpacing); BOOL translated; cfg::dat.avatarPadding = (BYTE)GetDlgItemInt(hwndDlg, IDC_AVATARPADDING, &translated, FALSE); - db_set_b(NULL, "CList", "AvatarPadding", cfg::dat.avatarPadding); + db_set_b(0, "CList", "AvatarPadding", cfg::dat.avatarPadding); - db_set_b(NULL, "CLC", "LeftMargin", (BYTE)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CLC", "RightMargin", (BYTE)SendDlgItemMessage(hwndDlg, IDC_RIGHTMARGINSPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CLC", "GroupIndent", (BYTE)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CLC", "RowHeight", (BYTE)SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CLC", "GRowHeight", (BYTE)SendDlgItemMessage(hwndDlg, IDC_GROUPROWHEIGHTSPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CLC", "LeftMargin", (BYTE)SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CLC", "RightMargin", (BYTE)SendDlgItemMessage(hwndDlg, IDC_RIGHTMARGINSPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CLC", "GroupIndent", (BYTE)SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CLC", "RowHeight", (BYTE)SendDlgItemMessage(hwndDlg, IDC_ROWHEIGHTSPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CLC", "GRowHeight", (BYTE)SendDlgItemMessage(hwndDlg, IDC_GROUPROWHEIGHTSPIN, UDM_GETPOS, 0, 0)); return TRUE; } break; @@ -255,7 +255,7 @@ static INT_PTR CALLBACK DlgProcDspItems(HWND hwndDlg, UINT msg, WPARAM wParam, L SendDlgItemMessage(hwndDlg, IDC_CLISTALIGN, CB_INSERTSTRING, -1, (LPARAM)TranslateT("For RTL only")); SendDlgItemMessage(hwndDlg, IDC_CLISTALIGN, CB_INSERTSTRING, -1, (LPARAM)TranslateT("RTL TEXT only")); - FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), offlineValues, sizeof(offlineValues) / sizeof(offlineValues[0]), db_get_dw(NULL, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES)); + FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), offlineValues, sizeof(offlineValues) / sizeof(offlineValues[0]), db_get_dw(0, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES)); CheckDlgButton(hwndDlg, IDC_EVENTSONTOP, (cfg::dat.dwFlags & CLUI_STICKYEVENTS) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DONTSEPARATE, cfg::dat.bDontSeparateOffline ? BST_CHECKED : BST_UNCHECKED); for (int i = 0; sortCtrlIDs[i] != 0; i++) @@ -302,17 +302,17 @@ static INT_PTR CALLBACK DlgProcDspItems(HWND hwndDlg, UINT msg, WPARAM wParam, L else cfg::dat.sortOrder[i] = (BYTE)curSel; } - db_set_dw(NULL, "CList", "SortOrder", MAKELONG(MAKEWORD(cfg::dat.sortOrder[0], cfg::dat.sortOrder[1]), MAKEWORD(cfg::dat.sortOrder[2], 0))); + db_set_dw(0, "CList", "SortOrder", MAKELONG(MAKEWORD(cfg::dat.sortOrder[0], cfg::dat.sortOrder[1]), MAKEWORD(cfg::dat.sortOrder[2], 0))); cfg::dat.bDontSeparateOffline = IsDlgButtonChecked(hwndDlg, IDC_DONTSEPARATE) ? 1 : 0; - db_set_b(NULL, "CList", "DontSeparateOffline", (BYTE)cfg::dat.bDontSeparateOffline); + db_set_b(0, "CList", "DontSeparateOffline", (BYTE)cfg::dat.bDontSeparateOffline); - db_set_dw(NULL, "CLC", "OfflineModes", MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS))); + db_set_dw(0, "CLC", "OfflineModes", MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS))); cfgSetFlag(hwndDlg, IDC_EVENTSONTOP, CLUI_STICKYEVENTS); cfg::dat.bUseDCMirroring = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CLISTALIGN, CB_GETCURSEL, 0, 0); - db_set_b(NULL, "CLC", "MirrorDC", cfg::dat.bUseDCMirroring); + db_set_b(0, "CLC", "MirrorDC", cfg::dat.bUseDCMirroring); return TRUE; } break; @@ -437,23 +437,23 @@ static INT_PTR CALLBACK DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam cfgSetFlag(hwndDlg, IDC_SHOWSTATUSMSG, CLUI_FRAME_SHOWSTATUSMSG); cfg::dat.avatarBorder = SendDlgItemMessage(hwndDlg, IDC_AVATARBORDERCLR, CPM_GETCOLOUR, 0, 0); - db_set_dw(NULL, "CLC", "avatarborder", cfg::dat.avatarBorder); + db_set_dw(0, "CLC", "avatarborder", cfg::dat.avatarBorder); BOOL translated; cfg::dat.avatarRadius = GetDlgItemInt(hwndDlg, IDC_RADIUS, &translated, FALSE); - db_set_dw(NULL, "CLC", "avatarradius", cfg::dat.avatarRadius); + db_set_dw(0, "CLC", "avatarradius", cfg::dat.avatarRadius); cfg::dat.avatarSize = GetDlgItemInt(hwndDlg, IDC_AVATARHEIGHT, &translated, FALSE); - db_set_w(NULL, "CList", "AvatarSize", (WORD)cfg::dat.avatarSize); + db_set_w(0, "CList", "AvatarSize", (WORD)cfg::dat.avatarSize); cfg::dat.bNoOfflineAvatars = IsDlgButtonChecked(hwndDlg, IDC_NOAVATARSOFFLINE) ? TRUE : FALSE; - db_set_b(NULL, "CList", "NoOfflineAV", (BYTE)cfg::dat.bNoOfflineAvatars); + db_set_b(0, "CList", "NoOfflineAV", (BYTE)cfg::dat.bNoOfflineAvatars); cfg::dat.bShowLocalTime = IsDlgButtonChecked(hwndDlg, IDC_SHOWLOCALTIME) ? 1 : 0; - db_set_b(NULL, "CLC", "ShowLocalTime", (BYTE)cfg::dat.bShowLocalTime); + db_set_b(0, "CLC", "ShowLocalTime", (BYTE)cfg::dat.bShowLocalTime); cfg::dat.bShowLocalTimeSelective = IsDlgButtonChecked(hwndDlg, IDC_SHOWLOCALTIMEONLYWHENDIFFERENT) ? 1 : 0; - db_set_b(NULL, "CLC", "SelectiveLocalTime", (BYTE)cfg::dat.bShowLocalTimeSelective); + db_set_b(0, "CLC", "SelectiveLocalTime", (BYTE)cfg::dat.bShowLocalTimeSelective); KillTimer(g_clistApi.hwndContactTree, TIMERID_REFRESH); if (cfg::dat.bShowLocalTime) @@ -462,7 +462,7 @@ static INT_PTR CALLBACK DlgProcDspAdvanced(HWND hwndDlg, UINT msg, WPARAM wParam cfg::dat.dualRowMode = (BYTE)SendDlgItemMessage(hwndDlg, IDC_DUALROWMODE, CB_GETCURSEL, 0, 0); if (cfg::dat.dualRowMode == CB_ERR) cfg::dat.dualRowMode = 0; - db_set_b(NULL, "CLC", "DualRowMode", cfg::dat.dualRowMode); + db_set_b(0, "CLC", "DualRowMode", cfg::dat.dualRowMode); return TRUE; } break; @@ -484,7 +484,7 @@ static INT_PTR CALLBACK DlgProcIcons(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPar CheckDlgButton(hwndDlg, IDC_SELECTIVEICONS, (cfg::dat.dwFlags & CLUI_FRAME_SELECTIVEICONS) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_STATUSICONSCENTERED, cfg::dat.bCenterStatusIcons ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_IDLE, db_get_b(NULL, "CLC", "ShowIdle", CLCDEFAULT_SHOWIDLE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_IDLE, db_get_b(0, "CLC", "ShowIdle", CLCDEFAULT_SHOWIDLE) ? BST_CHECKED : BST_UNCHECKED); return TRUE; case WM_COMMAND: @@ -500,10 +500,10 @@ static INT_PTR CALLBACK DlgProcIcons(HWND hwndDlg, UINT msg, WPARAM, LPARAM lPar cfgSetFlag(hwndDlg, IDC_XSTATUSASSTATUS, CLUI_FRAME_USEXSTATUSASSTATUS); cfgSetFlag(hwndDlg, IDC_SELECTIVEICONS, CLUI_FRAME_SELECTIVEICONS); - db_set_b(NULL, "CLC", "ShowIdle", IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0); + db_set_b(0, "CLC", "ShowIdle", IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0); cfg::dat.bCenterStatusIcons = IsDlgButtonChecked(hwndDlg, IDC_STATUSICONSCENTERED) ? 1 : 0; - db_set_b(NULL, "CLC", "si_centered", (BYTE)cfg::dat.bCenterStatusIcons); + db_set_b(0, "CLC", "si_centered", (BYTE)cfg::dat.bCenterStatusIcons); return TRUE; } break; @@ -594,11 +594,11 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam opt_clc_main_changed = 0; SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), GWL_STYLE, GetWindowLongPtr(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES); { - DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", Clist_GetDefaultExStyle()); + DWORD exStyle = db_get_dw(0, "CLC", "ExStyle", Clist_GetDefaultExStyle()); UDACCEL accel[2] = { { 0, 10 }, { 2, 50 } }; SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETRANGE, 0, MAKELONG(999, 0)); SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETACCEL, _countof(accel), (LPARAM)&accel); - SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME), 0)); + SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME), 0)); for (auto &it : checkBoxToStyleEx) CheckDlgButton(hwndDlg, it.id, (exStyle & it.flag) ^ (it.flag * it.not_t) ? BST_CHECKED : BST_UNCHECKED); @@ -606,11 +606,11 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam CheckDlgButton(hwndDlg, IDC_FULLROWSELECT, (cfg::dat.dwFlags & CLUI_FULLROWSELECT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DBLCLKAVATARS, cfg::dat.bDblClkAvatars ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_GREYOUT, db_get_dw(NULL, "CLC", "GreyoutFlags", CLCDEFAULT_GREYOUTFLAGS) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_GREYOUT, db_get_dw(0, "CLC", "GreyoutFlags", CLCDEFAULT_GREYOUTFLAGS) ? BST_CHECKED : BST_UNCHECKED); Utils::enableDlgControl(hwndDlg, IDC_SMOOTHTIME, IsDlgButtonChecked(hwndDlg, IDC_NOTNOSMOOTHSCROLLING)); Utils::enableDlgControl(hwndDlg, IDC_GREYOUTOPTS, IsDlgButtonChecked(hwndDlg, IDC_GREYOUT)); - FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), greyoutValues, sizeof(greyoutValues) / sizeof(greyoutValues[0]), db_get_dw(NULL, "CLC", "FullGreyoutFlags", CLCDEFAULT_FULLGREYOUTFLAGS)); - CheckDlgButton(hwndDlg, IDC_NOSCROLLBAR, db_get_b(NULL, "CLC", "NoVScrollBar", 0) ? BST_CHECKED : BST_UNCHECKED); + FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS), greyoutValues, sizeof(greyoutValues) / sizeof(greyoutValues[0]), db_get_dw(0, "CLC", "FullGreyoutFlags", CLCDEFAULT_FULLGREYOUTFLAGS)); + CheckDlgButton(hwndDlg, IDC_NOSCROLLBAR, db_get_b(0, "CLC", "NoVScrollBar", 0) ? BST_CHECKED : BST_UNCHECKED); return TRUE; case WM_VSCROLL: @@ -656,7 +656,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam if (!opt_clc_main_changed) return TRUE; - DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", CLCDEFAULT_EXSTYLE); + DWORD exStyle = db_get_dw(0, "CLC", "ExStyle", CLCDEFAULT_EXSTYLE); for (auto &it : checkBoxToStyleEx) exStyle &= ~(it.flag); @@ -665,21 +665,21 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam if ((IsDlgButtonChecked(hwndDlg, it.id) == 0) == it.not_t) exStyle |= it.flag; - db_set_dw(NULL, "CLC", "ExStyle", exStyle); + db_set_dw(0, "CLC", "ExStyle", exStyle); DWORD fullGreyoutFlags = MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS)); - db_set_dw(NULL, "CLC", "FullGreyoutFlags", fullGreyoutFlags); + db_set_dw(0, "CLC", "FullGreyoutFlags", fullGreyoutFlags); if (IsDlgButtonChecked(hwndDlg, IDC_GREYOUT)) - db_set_dw(NULL, "CLC", "GreyoutFlags", fullGreyoutFlags); + db_set_dw(0, "CLC", "GreyoutFlags", fullGreyoutFlags); else - db_set_dw(NULL, "CLC", "GreyoutFlags", 0); + db_set_dw(0, "CLC", "GreyoutFlags", 0); cfgSetFlag(hwndDlg, IDC_FULLROWSELECT, CLUI_FULLROWSELECT); - db_set_w(NULL, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CLC", "NoVScrollBar", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0)); + db_set_w(0, "CLC", "ScrollTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CLC", "NoVScrollBar", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0)); cfg::dat.bDblClkAvatars = IsDlgButtonChecked(hwndDlg, IDC_DBLCLKAVATARS) ? TRUE : FALSE; - db_set_b(NULL, "CLC", "dblclkav", (BYTE)cfg::dat.bDblClkAvatars); + db_set_b(0, "CLC", "dblclkav", (BYTE)cfg::dat.bDblClkAvatars); Clist_ClcOptionsChanged(); CoolSB_SetupScrollBar(); @@ -701,9 +701,9 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, case WM_INITDIALOG: opt_clc_bkg_changed = 0; TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_BITMAP, db_get_b(NULL, "CLC", "UseBitmap", CLCDEFAULT_USEBITMAP) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_BITMAP, db_get_b(0, "CLC", "UseBitmap", CLCDEFAULT_USEBITMAP) ? BST_CHECKED : BST_UNCHECKED); SendMessage(hwndDlg, WM_USER + 10, 0, 0); - CheckDlgButton(hwndDlg, IDC_WINCOLOUR, db_get_b(NULL, "CLC", "UseWinColours", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_WINCOLOUR, db_get_b(0, "CLC", "UseWinColours", 0) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SKINMODE, cfg::dat.bWallpaperMode ? BST_CHECKED : BST_UNCHECKED); { DBVARIANT dbv; @@ -715,7 +715,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, db_free(&dbv); } - WORD bmpUse = db_get_w(NULL, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE); + WORD bmpUse = db_get_w(0, "CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE); CheckDlgButton(hwndDlg, IDC_STRETCHH, bmpUse & CLB_STRETCHH ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_STRETCHV, bmpUse & CLB_STRETCHV ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_TILEH, bmpUse & CLBF_TILEH ? BST_CHECKED : BST_UNCHECKED); @@ -780,15 +780,15 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if (!opt_clc_bkg_changed) return TRUE; - db_set_b(NULL, "CLC", "UseBitmap", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); - db_set_b(NULL, "CLC", "UseWinColours", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_WINCOLOUR)); + db_set_b(0, "CLC", "UseBitmap", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); + db_set_b(0, "CLC", "UseWinColours", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_WINCOLOUR)); char str[MAX_PATH], strrel[MAX_PATH]; GetDlgItemTextA(hwndDlg, IDC_FILENAME, str, _countof(str)); if (PathToRelative(str, strrel)) - db_set_s(NULL, "CLC", "BkBitmap", strrel); + db_set_s(0, "CLC", "BkBitmap", strrel); else - db_set_s(NULL, "CLC", "BkBitmap", str); + db_set_s(0, "CLC", "BkBitmap", str); WORD flags = 0; if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHH)) @@ -803,9 +803,9 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, flags |= CLBF_SCROLL; if (IsDlgButtonChecked(hwndDlg, IDC_PROPORTIONAL)) flags |= CLBF_PROPORTIONAL; - db_set_w(NULL, "CLC", "BkBmpUse", flags); + db_set_w(0, "CLC", "BkBmpUse", flags); cfg::dat.bWallpaperMode = IsDlgButtonChecked(hwndDlg, IDC_SKINMODE) ? 1 : 0; - db_set_b(NULL, "CLUI", "UseBkSkin", (BYTE)cfg::dat.bWallpaperMode); + db_set_b(0, "CLUI", "UseBkSkin", (BYTE)cfg::dat.bWallpaperMode); Clist_ClcOptionsChanged(); PostMessage(g_clistApi.hwndContactList, CLUIINTM_REDRAW, 0, 0); diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 7b45f17c25..2ee0231852 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -749,7 +749,7 @@ set_bg_l: rc.top = y + sselected->MARGIN_TOP; rc.right = clRect->right - sselected->MARGIN_RIGHT - bg_indent_r; rc.bottom = y + rowHeight - sselected->MARGIN_BOTTOM; - if (db_get_b(NULL, "CLCExt", "EXBK_EqualSelection", 0) == 1 && savedCORNER != -1) + if (db_get_b(0, "CLCExt", "EXBK_EqualSelection", 0) == 1 && savedCORNER != -1) DrawAlpha(hdcMem, &rc, sselected->COLOR, sselected->ALPHA, sselected->COLOR2, sselected->COLOR2_TRANSPARENT, sselected->GRADIENT, savedCORNER, sselected->BORDERSTYLE, sselected->imageItem); else DrawAlpha(hdcMem, &rc, sselected->COLOR, sselected->ALPHA, sselected->COLOR2, sselected->COLOR2_TRANSPARENT, sselected->GRADIENT, sselected->CORNER, sselected->BORDERSTYLE, sselected->imageItem); @@ -1202,7 +1202,7 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint) BOOL bFirstNGdrawn = FALSE; int line_num = -1; COLORREF tmpbkcolour = style & CLS_CONTACTLIST ? (dat->bUseWindowsColours ? GetSysColor(COLOR_3DFACE) : dat->bkColour) : dat->bkColour; - selBlend = db_get_b(NULL, "CLCExt", "EXBK_SelBlend", 1); + selBlend = db_get_b(0, "CLCExt", "EXBK_SelBlend", 1); g_inCLCpaint = TRUE; g_focusWnd = GetFocus(); my_status = Clist_GetGeneralizedStatus(); @@ -1233,8 +1233,8 @@ void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT *rcPaint) mirror_always = (cfg::dat.bUseDCMirroring == 1); mirror_rtltext = (cfg::dat.bUseDCMirroring == 3); - g_center = db_get_b(NULL, "CLCExt", "EXBK_CenterGroupnames", 0) && !dat->bisEmbedded; - g_ignoreselforgroups = db_get_b(NULL, "CLC", "IgnoreSelforGroups", 0); + g_center = db_get_b(0, "CLCExt", "EXBK_CenterGroupnames", 0) && !dat->bisEmbedded; + g_ignoreselforgroups = db_get_b(0, "CLC", "IgnoreSelforGroups", 0); if (dat->greyoutFlags & Clist_ClcStatusToPf2(my_status) || style & WS_DISABLED) grey = 1; diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index 6ad33b5da5..09d5d66d29 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -584,12 +584,12 @@ void LoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst) } ReleaseDC(hwnd, hdc); - dat->min_row_heigh = (int)db_get_b(NULL, "CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT); - dat->group_row_height = (int)db_get_b(NULL, "CLC", "GRowHeight", CLCDEFAULT_ROWHEIGHT); + dat->min_row_heigh = (int)db_get_b(0, "CLC", "RowHeight", CLCDEFAULT_ROWHEIGHT); + dat->group_row_height = (int)db_get_b(0, "CLC", "GRowHeight", CLCDEFAULT_ROWHEIGHT); dat->row_border = 0; - dat->rightMargin = db_get_b(NULL, "CLC", "RightMargin", CLCDEFAULT_LEFTMARGIN); - dat->bkColour = db_get_b(NULL, "CLC", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS) ? - GetSysColor(COLOR_3DFACE) : db_get_dw(NULL, "CLC", "BkColour", CLCDEFAULT_BKCOLOUR); + dat->rightMargin = db_get_b(0, "CLC", "RightMargin", CLCDEFAULT_LEFTMARGIN); + dat->bkColour = db_get_b(0, "CLC", "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS) ? + GetSysColor(COLOR_3DFACE) : db_get_dw(0, "CLC", "BkColour", CLCDEFAULT_BKCOLOUR); coreCli.pfnLoadClcOptions(hwnd, dat, bFirst); @@ -616,7 +616,7 @@ void LoadClcOptions(HWND hwnd, struct ClcData *dat, BOOL bFirst) } } - if (db_get_b(NULL, "CLCExt", "EXBK_FillWallpaper", 0)) { + if (db_get_b(0, "CLCExt", "EXBK_FillWallpaper", 0)) { char wpbuf[MAX_PATH]; if (dat->hBmpBackground) { DeleteObject(dat->hBmpBackground); diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index c3adad09c8..56572798f9 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -176,7 +176,7 @@ int ShowHide() switch (iVisibleState) { case GWVS_PARTIALLY_COVERED: //If we don't want to bring it to top, we can use a simple break. This goes against readability ;-) but the comment explains it. - if (!db_get_b(NULL, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT)) + if (!db_get_b(0, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT)) break; case GWVS_COVERED: //Fall through (and we're already falling) case GWVS_HIDDEN: @@ -194,12 +194,12 @@ int ShowHide() RECT rcWindow; SetWindowPos(g_clistApi.hwndContactList, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW | SWP_NOSENDCHANGING | SWP_NOCOPYBITS); - if (!db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT)) + if (!db_get_b(0, "CList", "OnTop", SETTING_ONTOP_DEFAULT)) SetWindowPos(g_clistApi.hwndContactList, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE | SWP_NOREDRAW | SWP_NOSENDCHANGING | SWP_NOCOPYBITS); SetForegroundWindow(g_clistApi.hwndContactList); //SetActiveWindow(g_clistApi.hwndContactList); ShowWindow(g_clistApi.hwndContactList, SW_SHOW); - db_set_b(NULL, "CList", "State", SETTING_STATE_NORMAL); + db_set_b(0, "CList", "State", SETTING_STATE_NORMAL); GetWindowRect(g_clistApi.hwndContactList, &rcWindow); if (Utils_AssertInsideScreen(&rcWindow) == 1) { @@ -209,8 +209,8 @@ int ShowHide() } else { //It needs to be hidden ShowWindow(g_clistApi.hwndContactList, SW_HIDE); - db_set_b(NULL, "CList", "State", SETTING_STATE_HIDDEN); - if (db_get_b(NULL, "CList", "DisableWorkingSet", 1)) + db_set_b(0, "CList", "State", SETTING_STATE_HIDDEN); + if (db_get_b(0, "CList", "DisableWorkingSet", 1)) SetProcessWorkingSetSize(GetCurrentProcess(), -1, -1); } return 0; diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index c745fbcfb5..639c2d3fc9 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -51,22 +51,22 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP opt_gen_opts_changed = 0; TranslateDialogDefault(hwndDlg); SetWindowLongPtr(hwndDlg, GWLP_USERDATA, (LONG_PTR)HookEventMessage(ME_DB_CONTACT_SETTINGCHANGED, hwndDlg, WM_USER + 1)); - CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED); - CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, db_get_b(0, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, db_get_b(0, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, db_get_b(0, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWBOTTOMBUTTONS, cfg::dat.dwFlags & CLUI_FRAME_SHOWBOTTOMBUTTONS ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CLISTSUNKEN, cfg::dat.dwFlags & CLUI_FRAME_CLISTSUNKEN ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_EVENTAREAAUTOHIDE, cfg::dat.dwFlags & CLUI_FRAME_AUTOHIDENOTIFY ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_EVENTAREASUNKEN, (cfg::dat.dwFlags & CLUI_FRAME_EVENTAREASUNKEN) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONECLK, db_get_b(NULL, "CList", "Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ALWAYSSTATUS, db_get_b(NULL, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ALWAYSMULTI, !db_get_b(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DONTCYCLE, db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_CYCLE, db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_CYCLE ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MULTITRAY, db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DISABLEBLINK, db_get_b(NULL, "CList", "DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ICONBLINK, db_get_b(NULL, "CList", "NoIconBlink", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ONECLK, db_get_b(0, "CList", "Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ALWAYSSTATUS, db_get_b(0, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ALWAYSMULTI, !db_get_b(0, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DONTCYCLE, db_get_b(0, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CYCLE, db_get_b(0, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_CYCLE ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_MULTITRAY, db_get_b(0, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DISABLEBLINK, db_get_b(0, "CList", "DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ICONBLINK, db_get_b(0, "CList", "NoIconBlink", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); if (IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE)) { Utils::enableDlgControl(hwndDlg, IDC_CYCLETIMESPIN, FALSE); Utils::enableDlgControl(hwndDlg, IDC_CYCLETIME, FALSE); @@ -82,7 +82,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP Utils::enableDlgControl(hwndDlg, IDC_PRIMARYSTATUS, FALSE); } SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETRANGE, 0, MAKELONG(120, 1)); - SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); + SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); { ptrA szPrimaryStatus(db_get_sa(NULL, "CList", "PrimaryStatus")); @@ -103,9 +103,9 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, 0, 0); SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETRANGE, 0, MAKELONG(0x3FFF, 250)); - SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0)); + SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CList", "IconFlashTime", 550), 0)); CheckDlgButton(hwndDlg, IDC_NOTRAYINFOTIPS, cfg::dat.bNoTrayTips ? 1 : 0); - CheckDlgButton(hwndDlg, IDC_APPLYLASTVIEWMODE, db_get_b(NULL, "CList", "AutoApplyLastViewMode", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_APPLYLASTVIEWMODE, db_get_b(0, "CList", "AutoApplyLastViewMode", 0) ? BST_CHECKED : BST_UNCHECKED); return TRUE; case WM_COMMAND: @@ -135,19 +135,19 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (!opt_gen_opts_changed) return TRUE; - db_set_b(NULL, "CList", "HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE)); - db_set_b(NULL, "CList", "HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS)); - db_set_b(NULL, "CList", "UseGroups", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS)); - db_set_b(NULL, "CList", "ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE)); - db_set_b(NULL, "CList", "Tray1Click", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONECLK)); - db_set_b(NULL, "CList", "AlwaysStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS)); - db_set_b(NULL, "CList", "AlwaysMulti", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI)); - db_set_b(NULL, "CList", "TrayIcon", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE : (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI))); - db_set_w(NULL, "CList", "CycleTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0)); - db_set_w(NULL, "CList", "IconFlashTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CList", "DisableTrayFlash", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); - db_set_b(NULL, "CList", "NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK)); - db_set_b(NULL, "CList", "AutoApplyLastViewMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_APPLYLASTVIEWMODE)); + db_set_b(0, "CList", "HideOffline", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE)); + db_set_b(0, "CList", "HideEmptyGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS)); + db_set_b(0, "CList", "UseGroups", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS)); + db_set_b(0, "CList", "ConfirmDelete", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE)); + db_set_b(0, "CList", "Tray1Click", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONECLK)); + db_set_b(0, "CList", "AlwaysStatus", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS)); + db_set_b(0, "CList", "AlwaysMulti", (BYTE)BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI)); + db_set_b(0, "CList", "TrayIcon", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE : (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI))); + db_set_w(0, "CList", "CycleTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0)); + db_set_w(0, "CList", "IconFlashTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CList", "DisableTrayFlash", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); + db_set_b(0, "CList", "NoIconBlink", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ICONBLINK)); + db_set_b(0, "CList", "AutoApplyLastViewMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_APPLYLASTVIEWMODE)); __setFlag(CLUI_FRAME_EVENTAREASUNKEN, IsDlgButtonChecked(hwndDlg, IDC_EVENTAREASUNKEN)); __setFlag(CLUI_FRAME_AUTOHIDENOTIFY, IsDlgButtonChecked(hwndDlg, IDC_EVENTAREAAUTOHIDE)); @@ -156,17 +156,17 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP __setFlag(CLUI_FRAME_CLISTSUNKEN, IsDlgButtonChecked(hwndDlg, IDC_CLISTSUNKEN)); cfg::dat.bNoTrayTips = IsDlgButtonChecked(hwndDlg, IDC_NOTRAYINFOTIPS) ? 1 : 0; - db_set_b(NULL, "CList", "NoTrayTips", (BYTE)cfg::dat.bNoTrayTips); + db_set_b(0, "CList", "NoTrayTips", (BYTE)cfg::dat.bNoTrayTips); { int cursel = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0); PROTOACCOUNT *pa = (PROTOACCOUNT *)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0); if (!pa) db_unset(NULL, "CList", "PrimaryStatus"); else - db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName); + db_set_s(0, "CList", "PrimaryStatus", pa->szModuleName); } Clist_TrayIconIconsChanged(); - db_set_dw(NULL, "CLUI", "Frameflags", cfg::dat.dwFlags); + db_set_dw(0, "CLUI", "Frameflags", cfg::dat.dwFlags); ConfigureFrame(); ConfigureCLUIGeometry(1); ConfigureEventArea(); diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index affee6a037..9db6420c46 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -144,7 +144,7 @@ static void LayoutButtons(HWND hwnd, RECT *rc) static int FS_FontsChanged(WPARAM, LPARAM) { - COLORREF clr_cluiframes = db_get_dw(NULL, "CLUI", "clr_frameborder", RGB(40, 40, 40)); + COLORREF clr_cluiframes = db_get_dw(0, "CLUI", "clr_frameborder", RGB(40, 40, 40)); if (g_hPenCLUIFrames) DeleteObject(g_hPenCLUIFrames); @@ -161,9 +161,9 @@ static HWND PreCreateCLC(HWND parent) { g_clistApi.hwndContactTree = CreateWindow(CLISTCONTROL_CLASSW, L"", WS_CHILD | CLS_CONTACTLIST - | (db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0) - | (db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0) - | (db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? CLS_HIDEEMPTYGROUPS : 0) + | (db_get_b(0, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0) + | (db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0) + | (db_get_b(0, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? CLS_HIDEEMPTYGROUPS : 0) | CLS_MULTICOLUMN, 0, 0, 0, 0, parent, nullptr, g_plugin.getInst(), (LPVOID)0xff00ff00); @@ -342,7 +342,7 @@ void IcoLibReloadIcons() void ConfigureCLUIGeometry(int mode) { RECT rcStatus; - DWORD clmargins = db_get_dw(NULL, "CLUI", "clmargins", 0); + DWORD clmargins = db_get_dw(0, "CLUI", "clmargins", 0); cfg::dat.bCLeft = LOBYTE(LOWORD(clmargins)); cfg::dat.bCRight = HIBYTE(LOWORD(clmargins)); @@ -450,10 +450,10 @@ void SetButtonStates() SendMessage(buttonItem->hWnd, BM_SETCHECK, cfg::dat.soundsOff ? BST_CHECKED : BST_UNCHECKED, 0); break; case IDC_STBHIDEOFFLINE: - SendMessage(buttonItem->hWnd, BM_SETCHECK, db_get_b(NULL, "CList", "HideOffline", 0) ? BST_CHECKED : BST_UNCHECKED, 0); + SendMessage(buttonItem->hWnd, BM_SETCHECK, db_get_b(0, "CList", "HideOffline", 0) ? BST_CHECKED : BST_UNCHECKED, 0); break; case IDC_STBHIDEGROUPS: - SendMessage(buttonItem->hWnd, BM_SETCHECK, db_get_b(NULL, "CList", "UseGroups", 0) ? BST_CHECKED : BST_UNCHECKED, 0); + SendMessage(buttonItem->hWnd, BM_SETCHECK, db_get_b(0, "CList", "UseGroups", 0) ? BST_CHECKED : BST_UNCHECKED, 0); break; } } @@ -547,23 +547,23 @@ void BlitWallpaper(HDC hdc, RECT *rc, struct ClcData *dat) void ReloadThemedOptions() { - cfg::dat.bSkinnedStatusBar = db_get_b(NULL, "CLUI", "sb_skinned", 0); - cfg::dat.bUsePerProto = db_get_b(NULL, "CLCExt", "useperproto", 0); - cfg::dat.bOverridePerStatusColors = db_get_b(NULL, "CLCExt", "override_status", 0); - cfg::dat.bRowSpacing = db_get_b(NULL, "CLC", "RowGap", 0); - cfg::dat.bApplyIndentToBg = db_get_b(NULL, "CLCExt", "applyindentbg", 0); - cfg::dat.bWallpaperMode = db_get_b(NULL, "CLUI", "UseBkSkin", 1); - cfg::dat.bClipBorder = db_get_b(NULL, "CLUI", "clipborder", 0); - cfg::dat.cornerRadius = db_get_b(NULL, "CLCExt", "CornerRad", 6); - cfg::dat.gapBetweenFrames = (BYTE)db_get_dw(NULL, "CLUIFrames", "GapBetweenFrames", 1); - cfg::dat.bUseDCMirroring = db_get_b(NULL, "CLC", "MirrorDC", 0); - cfg::dat.bGroupAlign = db_get_b(NULL, "CLC", "GroupAlign", 0); + cfg::dat.bSkinnedStatusBar = db_get_b(0, "CLUI", "sb_skinned", 0); + cfg::dat.bUsePerProto = db_get_b(0, "CLCExt", "useperproto", 0); + cfg::dat.bOverridePerStatusColors = db_get_b(0, "CLCExt", "override_status", 0); + cfg::dat.bRowSpacing = db_get_b(0, "CLC", "RowGap", 0); + cfg::dat.bApplyIndentToBg = db_get_b(0, "CLCExt", "applyindentbg", 0); + cfg::dat.bWallpaperMode = db_get_b(0, "CLUI", "UseBkSkin", 1); + cfg::dat.bClipBorder = db_get_b(0, "CLUI", "clipborder", 0); + cfg::dat.cornerRadius = db_get_b(0, "CLCExt", "CornerRad", 6); + cfg::dat.gapBetweenFrames = (BYTE)db_get_dw(0, "CLUIFrames", "GapBetweenFrames", 1); + cfg::dat.bUseDCMirroring = db_get_b(0, "CLC", "MirrorDC", 0); + cfg::dat.bGroupAlign = db_get_b(0, "CLC", "GroupAlign", 0); if (cfg::dat.hBrushColorKey) DeleteObject(cfg::dat.hBrushColorKey); cfg::dat.hBrushColorKey = CreateSolidBrush(RGB(255, 0, 255)); - cfg::dat.bWantFastGradients = db_get_b(NULL, "CLCExt", "FastGradients", 0); - cfg::dat.titleBarHeight = db_get_b(NULL, "CLCExt", "frame_height", DEFAULT_TITLEBAR_HEIGHT); - cfg::dat.group_padding = db_get_dw(NULL, "CLCExt", "grp_padding", 0); + cfg::dat.bWantFastGradients = db_get_b(0, "CLCExt", "FastGradients", 0); + cfg::dat.titleBarHeight = db_get_b(0, "CLCExt", "frame_height", DEFAULT_TITLEBAR_HEIGHT); + cfg::dat.group_padding = db_get_dw(0, "CLCExt", "grp_padding", 0); } static RECT rcWindow = { 0 }; @@ -577,7 +577,7 @@ static void sttProcessResize(HWND hwnd, NMCLISTCONTROL *nmc) if (disableautoupd) return; - if (!db_get_b(NULL, "CLUI", "AutoSize", 0)) + if (!db_get_b(0, "CLUI", "AutoSize", 0)) return; if (Docking_IsDocked(0, 0)) @@ -585,7 +585,7 @@ static void sttProcessResize(HWND hwnd, NMCLISTCONTROL *nmc) if (hFrameContactTree == 0) return; - maxHeight = db_get_b(NULL, "CLUI", "MaxSizeHeight", 75); + maxHeight = db_get_b(0, "CLUI", "MaxSizeHeight", 75); rcOld = rcWindow; GetWindowRect(hwnd, &rcWindow); @@ -615,7 +615,7 @@ static void sttProcessResize(HWND hwnd, NMCLISTCONTROL *nmc) if (newHeight > (rcWorkArea.bottom - rcWorkArea.top) * maxHeight / 100) newHeight = (rcWorkArea.bottom - rcWorkArea.top) * maxHeight / 100; - if (db_get_b(NULL, "CLUI", "AutoSizeUpward", 0)) { + if (db_get_b(0, "CLUI", "AutoSizeUpward", 0)) { rcWindow.top = rcWindow.bottom - newHeight; if (rcWindow.top < rcWorkArea.top) rcWindow.top = rcWorkArea.top; } @@ -730,7 +730,7 @@ static int ServiceParamsOK(ButtonItem *item, WPARAM *wParam, LPARAM *lParam, MCO static void ShowCLUI(HWND hwnd) { int state = old_cliststate; - int onTop = db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT); + int onTop = db_get_b(0, "CList", "OnTop", SETTING_ONTOP_DEFAULT); SendMessage(hwnd, WM_SETREDRAW, FALSE, FALSE); @@ -775,8 +775,8 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l case WM_CREATE: { int flags = WS_CHILD | CCS_BOTTOM; - flags |= db_get_b(NULL, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; - flags |= db_get_b(NULL, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; + flags |= db_get_b(0, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; + flags |= db_get_b(0, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; g_clistApi.hwndStatus = CreateWindow(STATUSCLASSNAME, nullptr, flags, 0, 0, 0, 0, hwnd, nullptr, g_plugin.getInst(), nullptr); if (flags & WS_VISIBLE) { ShowWindow(g_clistApi.hwndStatus, SW_SHOW); @@ -786,8 +786,8 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l SetClassLong(g_clistApi.hwndStatus, GCL_STYLE, GetClassLong(g_clistApi.hwndStatus, GCL_STYLE) & ~(CS_VREDRAW | CS_HREDRAW)); } g_oldSize.cx = g_oldSize.cy = 0; - old_cliststate = db_get_b(NULL, "CList", "State", SETTING_STATE_NORMAL); - db_set_b(NULL, "CList", "State", SETTING_STATE_HIDDEN); + old_cliststate = db_get_b(0, "CList", "State", SETTING_STATE_NORMAL); + db_set_b(0, "CList", "State", SETTING_STATE_HIDDEN); SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) & ~WS_VISIBLE); SetWindowLongPtr(hwnd, GWL_STYLE, GetWindowLongPtr(hwnd, GWL_STYLE) | WS_CLIPCHILDREN); if (!cfg::dat.bFirstRun) @@ -822,13 +822,13 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l break; case M_CREATECLC: { - if (db_get_b(NULL, "CLUI", "useskin", 0)) + if (db_get_b(0, "CLUI", "useskin", 0)) IMG_LoadItems(); CreateButtonBar(hwnd); SendMessage(hwnd, WM_SETREDRAW, FALSE, FALSE); { LONG style; - BYTE windowStyle = db_get_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW); + BYTE windowStyle = db_get_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW); ShowWindow(g_clistApi.hwndContactList, SW_HIDE); style = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE); if (windowStyle != SETTING_WINDOWSTYLE_DEFAULT) { @@ -837,7 +837,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l } else { style &= ~(WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE); - if (db_get_b(NULL, "CList", "AlwaysHideOnTB", 1)) + if (db_get_b(0, "CList", "AlwaysHideOnTB", 1)) style &= ~WS_EX_APPWINDOW; else style |= WS_EX_APPWINDOW; @@ -866,13 +866,13 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l Tweak_It(cfg::clcdat->bkColour); } - db_set_b(NULL, "CList", "State", old_cliststate); + db_set_b(0, "CList", "State", old_cliststate); - if (db_get_b(NULL, "CList", "AutoApplyLastViewMode", 0)) { + if (db_get_b(0, "CList", "AutoApplyLastViewMode", 0)) { DBVARIANT dbv = { 0 }; - if (!db_get_s(NULL, "CList", "LastViewMode", &dbv)) { + if (!db_get_s(0, "CList", "LastViewMode", &dbv)) { if (mir_strlen(dbv.pszVal) > 2) { - if (db_get_dw(NULL, CLVM_MODULE, dbv.pszVal, -1) != 0xffffffff) + if (db_get_dw(0, CLVM_MODULE, dbv.pszVal, -1) != 0xffffffff) ApplyViewMode((char *)dbv.pszVal); } db_free(&dbv); @@ -1115,11 +1115,11 @@ skipbg: // if docked, dont remember pos (except for width) if (!Clist_IsDocked()) { - db_set_dw(NULL, "CList", "Height", (DWORD)(rc.bottom - rc.top)); - db_set_dw(NULL, "CList", "x", (DWORD)rc.left); - db_set_dw(NULL, "CList", "y", (DWORD)rc.top); + db_set_dw(0, "CList", "Height", (DWORD)(rc.bottom - rc.top)); + db_set_dw(0, "CList", "x", (DWORD)rc.left); + db_set_dw(0, "CList", "y", (DWORD)rc.top); } - db_set_dw(NULL, "CList", "Width", (DWORD)(rc.right - rc.left)); + db_set_dw(0, "CList", "Width", (DWORD)(rc.right - rc.left)); } } return TRUE; @@ -1129,8 +1129,8 @@ skipbg: return 0; case CLUIINTM_REMOVEFROMTASKBAR: { - BYTE windowStyle = db_get_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT); - if (windowStyle == SETTING_WINDOWSTYLE_DEFAULT && db_get_b(NULL, "CList", "AlwaysHideOnTB", 0)) + BYTE windowStyle = db_get_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT); + if (windowStyle == SETTING_WINDOWSTYLE_DEFAULT && db_get_b(0, "CList", "AlwaysHideOnTB", 0)) RemoveFromTaskBar(hwnd); return 0; } @@ -1152,7 +1152,7 @@ skipbg: SetLayeredWindowAttributes(hwnd, cfg::dat.bFullTransparent ? cfg::dat.colorkey : RGB(0, 0, 0), cfg::dat.alpha, LWA_ALPHA | (cfg::dat.bFullTransparent ? LWA_COLORKEY : 0)); transparentFocus = 1; } - SetWindowPos(g_clistApi.hwndContactList, db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW | SWP_NOSENDCHANGING); + SetWindowPos(g_clistApi.hwndContactList, db_get_b(0, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOREDRAW | SWP_NOSENDCHANGING); } PostMessage(hwnd, CLUIINTM_REMOVEFROMTASKBAR, 0, 0); return DefWindowProc(hwnd, msg, wParam, lParam); @@ -1175,7 +1175,7 @@ skipbg: GetWindowRect(hwnd, &r); GetCursorPos(&pt); - if (pt.y <= r.bottom && pt.y >= r.bottom - clip - 6 && !db_get_b(NULL, "CLUI", "AutoSize", 0)) { + if (pt.y <= r.bottom && pt.y >= r.bottom - clip - 6 && !db_get_b(0, "CLUI", "AutoSize", 0)) { if (pt.x > r.left + clip + 10 && pt.x < r.right - clip - 10) return HTBOTTOM; if (pt.x < r.left + clip + 10) @@ -1183,7 +1183,7 @@ skipbg: if (pt.x > r.right - clip - 10) return HTBOTTOMRIGHT; } - else if (pt.y >= r.top && pt.y <= r.top + 3 && !db_get_b(NULL, "CLUI", "AutoSize", 0)) { + else if (pt.y >= r.top && pt.y <= r.top + 3 && !db_get_b(0, "CLUI", "AutoSize", 0)) { if (pt.x > r.left + clip + 10 && pt.x < r.right - clip - 10) return HTTOP; if (pt.x < r.left + clip + 10) @@ -1286,14 +1286,14 @@ skipbg: case WM_SYSCOMMAND: { - BYTE bWindowStyle = db_get_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT); + BYTE bWindowStyle = db_get_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT); if (SETTING_WINDOWSTYLE_DEFAULT == bWindowStyle) { if (wParam == SC_RESTORE) { CallWindowProc(DefWindowProc, hwnd, msg, wParam, lParam); SendMessage(hwnd, WM_SIZE, 0, 0); SendMessage(hwnd, CLUIINTM_REDRAW, 0, 0); SendMessage(hwnd, CLUIINTM_STATUSBARUPDATE, 0, 0); - db_set_b(NULL, "CList", "State", SETTING_STATE_NORMAL); + db_set_b(0, "CList", "State", SETTING_STATE_NORMAL); break; } } @@ -1302,8 +1302,8 @@ skipbg: return 0; if (wParam == SC_MINIMIZE) { - if (SETTING_WINDOWSTYLE_DEFAULT == bWindowStyle && !db_get_b(NULL, "CList", "AlwaysHideOnTB", 0)) { - db_set_b(NULL, "CList", "State", SETTING_STATE_MINIMIZED); + if (SETTING_WINDOWSTYLE_DEFAULT == bWindowStyle && !db_get_b(0, "CList", "AlwaysHideOnTB", 0)) { + db_set_b(0, "CList", "State", SETTING_STATE_MINIMIZED); break; } g_clistApi.pfnShowHide(); @@ -1437,8 +1437,8 @@ skipbg: case IDC_TBSOUND: case IDC_STBSOUND: cfg::dat.soundsOff = !cfg::dat.soundsOff; - db_set_b(NULL, "CLUI", "NoSounds", (BYTE)cfg::dat.soundsOff); - db_set_b(NULL, "Skin", "UseSound", (BYTE)(cfg::dat.soundsOff ? 0 : 1)); + db_set_b(0, "CLUI", "NoSounds", (BYTE)cfg::dat.soundsOff); + db_set_b(0, "Skin", "UseSound", (BYTE)(cfg::dat.soundsOff ? 0 : 1)); return 0; case IDC_TBSELECTVIEWMODE: @@ -1523,7 +1523,7 @@ buttons_done: } if (dwOldFlags != cfg::dat.dwFlags) { InvalidateRect(g_clistApi.hwndContactTree, nullptr, FALSE); - db_set_dw(NULL, "CLUI", "Frameflags", cfg::dat.dwFlags); + db_set_dw(0, "CLUI", "Frameflags", cfg::dat.dwFlags); if ((dwOldFlags & (CLUI_FRAME_SHOWBOTTOMBUTTONS | CLUI_FRAME_CLISTSUNKEN)) != (cfg::dat.dwFlags & (CLUI_FRAME_SHOWBOTTOMBUTTONS | CLUI_FRAME_CLISTSUNKEN))) { ConfigureFrame(); ConfigureCLUIGeometry(1); @@ -1562,7 +1562,7 @@ buttons_done: if ((hitFlags & (CLCHT_NOWHERE | CLCHT_INLEFTMARGIN | CLCHT_BELOWITEMS)) == 0) break; - if (db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT)) { + if (db_get_b(0, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT)) { POINT pt; pt = nm->pt; ClientToScreen(g_clistApi.hwndContactTree, &pt); @@ -1597,7 +1597,7 @@ buttons_done: GetWindowRect(g_clistApi.hwndStatus, &rc); if (PtInRect(&rc, pt)) { HMENU hMenu; - if (db_get_b(NULL, "CLUI", "SBarRightClk", 0)) + if (db_get_b(0, "CLUI", "SBarRightClk", 0)) hMenu = Menu_GetMainMenu(); else hMenu = Menu_GetStatusMenu(); @@ -1638,7 +1638,7 @@ buttons_done: int nParts = SendMessage(g_clistApi.hwndStatus, SB_GETPARTS, 0, 0); SIZE textSize; - BYTE showOpts = db_get_b(NULL, "CLUI", "SBarShow", 1); + BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1); SetBkMode(dis->hDC, TRANSPARENT); int x = dis->rcItem.left; @@ -1672,7 +1672,7 @@ buttons_done: DrawIconEx(dis->hDC, x, (dis->rcItem.top + dis->rcItem.bottom - 16) >> 1, hIcon, 16, 16, 0, nullptr, DI_NORMAL); IcoLib_ReleaseIcon(hIcon); - if (db_get_b(NULL, "CLUI", "sbar_showlocked", 1)) { + if (db_get_b(0, "CLUI", "sbar_showlocked", 1)) { if (pa->bIsLocked) { hIcon = Skin_LoadIcon(SKINICON_OTHER_STATUS_LOCKED); if (hIcon != nullptr) { @@ -1716,7 +1716,7 @@ buttons_done: return 0; case WM_CLOSE: - if (SETTING_WINDOWSTYLE_DEFAULT == db_get_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT) && !db_get_b(NULL, "CList", "AlwaysHideOnTB", 0)) { + if (SETTING_WINDOWSTYLE_DEFAULT == db_get_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT) && !db_get_b(0, "CList", "AlwaysHideOnTB", 0)) { PostMessage(hwnd, WM_SYSCOMMAND, SC_MINIMIZE, 0); return 0; } @@ -1816,11 +1816,11 @@ void LoadCLUIModule(void) wndclass.lpszClassName = L"EventAreaClass"; RegisterClass(&wndclass); - oldhideoffline = db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT); - cluiPos.left = db_get_dw(NULL, "CList", "x", 600); - cluiPos.top = db_get_dw(NULL, "CList", "y", 200); - cluiPos.right = db_get_dw(NULL, "CList", "Width", 150); - cluiPos.bottom = db_get_dw(NULL, "CList", "Height", 350); + oldhideoffline = db_get_b(0, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT); + cluiPos.left = db_get_dw(0, "CList", "x", 600); + cluiPos.top = db_get_dw(0, "CList", "y", 200); + cluiPos.right = db_get_dw(0, "CList", "Width", 150); + cluiPos.bottom = db_get_dw(0, "CList", "Height", 350); LoadExtraIconModule(); LoadCLUIFramesModule(); @@ -1828,7 +1828,7 @@ void LoadCLUIModule(void) CreateServiceFunction(MS_CLUI_SHOWMAINMENU, CLN_ShowMainMenu); CreateServiceFunction(MS_CLUI_SHOWSTATUSMENU, CLN_ShowStatusMenu); - if (db_get_b(NULL, "CLUI", "FloaterMode", 0)) { + if (db_get_b(0, "CLUI", "FloaterMode", 0)) { MessageBox(nullptr, TranslateT("You need the FloatingContacts plugin, cause the embedded floating contacts were removed."), TranslateT("Warning"), MB_OK | MB_ICONWARNING); diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index 56ac254013..dc13bee1e7 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -396,26 +396,26 @@ int DBLoadFrameSettingsAtPos(int pos, int Frameid) { CMStringA buf; - Frames[Frameid].collapsed = 0 != db_get_b(NULL, CLUIFrameModule, buf.Format("Collapse%d", pos), Frames[Frameid].collapsed); + Frames[Frameid].collapsed = 0 != db_get_b(0, CLUIFrameModule, buf.Format("Collapse%d", pos), Frames[Frameid].collapsed); - Frames[Frameid].Locked = 0 != db_get_b(NULL, CLUIFrameModule, buf.Format("Locked%d", pos), Frames[Frameid].Locked); - Frames[Frameid].visible = 0 != db_get_b(NULL, CLUIFrameModule, buf.Format("Visible%d", pos), Frames[Frameid].visible); - Frames[Frameid].TitleBar.ShowTitleBar = 0 != db_get_b(NULL, CLUIFrameModule, buf.Format("TBVisile%d", pos), Frames[Frameid].TitleBar.ShowTitleBar); + Frames[Frameid].Locked = 0 != db_get_b(0, CLUIFrameModule, buf.Format("Locked%d", pos), Frames[Frameid].Locked); + Frames[Frameid].visible = 0 != db_get_b(0, CLUIFrameModule, buf.Format("Visible%d", pos), Frames[Frameid].visible); + Frames[Frameid].TitleBar.ShowTitleBar = 0 != db_get_b(0, CLUIFrameModule, buf.Format("TBVisile%d", pos), Frames[Frameid].TitleBar.ShowTitleBar); - Frames[Frameid].height = db_get_w(NULL, CLUIFrameModule, buf.Format("Height%d", pos), Frames[Frameid].height); - Frames[Frameid].HeightWhenCollapsed = db_get_w(NULL, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), 0); - Frames[Frameid].align = db_get_w(NULL, CLUIFrameModule, buf.Format("Align%d", pos), Frames[Frameid].align); + Frames[Frameid].height = db_get_w(0, CLUIFrameModule, buf.Format("Height%d", pos), Frames[Frameid].height); + Frames[Frameid].HeightWhenCollapsed = db_get_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), 0); + Frames[Frameid].align = db_get_w(0, CLUIFrameModule, buf.Format("Align%d", pos), Frames[Frameid].align); Frames[Frameid].FloatingPos.x = DBGetContactSettingRangedWord(0, CLUIFrameModule, buf.Format("FloatX%d", pos), 100, 0, 1024); Frames[Frameid].FloatingPos.y = DBGetContactSettingRangedWord(0, CLUIFrameModule, buf.Format("FloatY%d", pos), 100, 0, 1024); Frames[Frameid].FloatingSize.x = DBGetContactSettingRangedWord(0, CLUIFrameModule, buf.Format("FloatW%d", pos), 100, 0, 1024); Frames[Frameid].FloatingSize.y = DBGetContactSettingRangedWord(0, CLUIFrameModule, buf.Format("FloatH%d", pos), 100, 0, 1024); - Frames[Frameid].floating = 0 != db_get_b(NULL, CLUIFrameModule, buf.Format("Floating%d", pos), 0); - Frames[Frameid].order = db_get_w(NULL, CLUIFrameModule, buf.Format("Order%d", pos), 0); + Frames[Frameid].floating = 0 != db_get_b(0, CLUIFrameModule, buf.Format("Floating%d", pos), 0); + Frames[Frameid].order = db_get_w(0, CLUIFrameModule, buf.Format("Order%d", pos), 0); - Frames[Frameid].UseBorder = 0 != db_get_b(NULL, CLUIFrameModule, buf.Format("UseBorder%d", pos), Frames[Frameid].UseBorder); - Frames[Frameid].Skinned = 0 != db_get_b(NULL, CLUIFrameModule, buf.Format("Skinned%d", pos), Frames[Frameid].Skinned); + Frames[Frameid].UseBorder = 0 != db_get_b(0, CLUIFrameModule, buf.Format("UseBorder%d", pos), Frames[Frameid].UseBorder); + Frames[Frameid].Skinned = 0 != db_get_b(0, CLUIFrameModule, buf.Format("Skinned%d", pos), Frames[Frameid].Skinned); return 0; } @@ -430,20 +430,20 @@ int DBStoreFrameSettingsAtPos(int pos, int Frameid) db_set_b(0, CLUIFrameModule, buf.Format("Visible%d", pos), (BYTE)btoint(Frames[Frameid].visible)); db_set_b(0, CLUIFrameModule, buf.Format("TBVisile%d", pos), (BYTE)btoint(Frames[Frameid].TitleBar.ShowTitleBar)); - db_set_w(NULL, CLUIFrameModule, buf.Format("Height%d", pos), (WORD)Frames[Frameid].height); - db_set_w(NULL, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), (WORD)Frames[Frameid].HeightWhenCollapsed); - db_set_w(NULL, CLUIFrameModule, buf.Format("Align%d", pos), (WORD)Frames[Frameid].align); + db_set_w(0, CLUIFrameModule, buf.Format("Height%d", pos), (WORD)Frames[Frameid].height); + db_set_w(0, CLUIFrameModule, buf.Format("HeightCollapsed%d", pos), (WORD)Frames[Frameid].HeightWhenCollapsed); + db_set_w(0, CLUIFrameModule, buf.Format("Align%d", pos), (WORD)Frames[Frameid].align); //FloatingPos - db_set_w(NULL, CLUIFrameModule, buf.Format("FloatX%d", pos), (WORD)Frames[Frameid].FloatingPos.x); - db_set_w(NULL, CLUIFrameModule, buf.Format("FloatY%d", pos), (WORD)Frames[Frameid].FloatingPos.y); - db_set_w(NULL, CLUIFrameModule, buf.Format("FloatW%d", pos), (WORD)Frames[Frameid].FloatingSize.x); + db_set_w(0, CLUIFrameModule, buf.Format("FloatX%d", pos), (WORD)Frames[Frameid].FloatingPos.x); + db_set_w(0, CLUIFrameModule, buf.Format("FloatY%d", pos), (WORD)Frames[Frameid].FloatingPos.y); + db_set_w(0, CLUIFrameModule, buf.Format("FloatW%d", pos), (WORD)Frames[Frameid].FloatingSize.x); db_set_w(0, CLUIFrameModule, buf.Format("FloatH%d", pos), (WORD)Frames[Frameid].FloatingSize.y); db_set_b(0, CLUIFrameModule, buf.Format("Floating%d", pos), (BYTE)btoint(Frames[Frameid].floating)); db_set_b(0, CLUIFrameModule, buf.Format("UseBorder%d", pos), (BYTE)btoint(Frames[Frameid].UseBorder)); db_set_w(0, CLUIFrameModule, buf.Format("Order%d", pos), (WORD)Frames[Frameid].order); - db_set_b(NULL, CLUIFrameModule, buf.Format("Skinned%d", pos), Frames[Frameid].Skinned); + db_set_b(0, CLUIFrameModule, buf.Format("Skinned%d", pos), Frames[Frameid].Skinned); return 0; } @@ -469,7 +469,7 @@ int CLUIFramesLoadFrameSettings(int Frameid) if (Frameid < 0 || Frameid >= nFramescount) return -1; - int maxstored = db_get_w(NULL, CLUIFrameModule, "StoredFrames", -1); + int maxstored = db_get_w(0, CLUIFrameModule, "StoredFrames", -1); if (maxstored == -1) return 0; @@ -489,7 +489,7 @@ int CLUIFramesStoreFrameSettings(int Frameid) if (Frameid < 0 || Frameid >= nFramescount) return -1; - int maxstored = db_get_w(NULL, CLUIFrameModule, "StoredFrames", -1); + int maxstored = db_get_w(0, CLUIFrameModule, "StoredFrames", -1); if (maxstored == -1) maxstored = 0; @@ -500,7 +500,7 @@ int CLUIFramesStoreFrameSettings(int Frameid) } DBStoreFrameSettingsAtPos(storpos, Frameid); - db_set_w(NULL, CLUIFrameModule, "StoredFrames", (WORD)maxstored); + db_set_w(0, CLUIFrameModule, "StoredFrames", (WORD)maxstored); return 0; } @@ -1210,7 +1210,7 @@ INT_PTR CLUIFramesCollapseUnCollapseFrame(WPARAM wParam, LPARAM) if (Clist_IsDocked()) return 0; - if (db_get_b(NULL, "CLUI", "AutoSize", 0)) + if (db_get_b(0, "CLUI", "AutoSize", 0)) return 0; GetWindowRect(g_clistApi.hwndContactList, &rc); @@ -1593,7 +1593,7 @@ INT_PTR CLUIFramesAddFrame(WPARAM wParam, LPARAM lParam) // create frame Frames[nFramescount].TitleBar.hwnd = CreateWindow(CLUIFrameTitleBarClassName, Frames[nFramescount].name, - (db_get_b(NULL, CLUIFrameModule, "RemoveAllTitleBarBorders", 1) ? 0 : WS_BORDER) + (db_get_b(0, CLUIFrameModule, "RemoveAllTitleBarBorders", 1) ? 0 : WS_BORDER) | WS_CHILD | WS_CLIPCHILDREN | (Frames[nFramescount].TitleBar.ShowTitleBar ? WS_VISIBLE : 0) | WS_CLIPCHILDREN, 0, 0, 0, 0, g_clistApi.hwndContactList, nullptr, g_plugin.getInst(), nullptr); @@ -2116,19 +2116,19 @@ boolean AlignCOLLIconToLeft; //will hide frame icon int OnFrameTitleBarBackgroundChange() { - AlignCOLLIconToLeft = db_get_b(NULL, "FrameTitleBar", "AlignCOLLIconToLeft", 0); - bkColour = db_get_dw(NULL, "FrameTitleBar", "BkColour", CLCDEFAULT_BKCOLOUR); + AlignCOLLIconToLeft = db_get_b(0, "FrameTitleBar", "AlignCOLLIconToLeft", 0); + bkColour = db_get_dw(0, "FrameTitleBar", "BkColour", CLCDEFAULT_BKCOLOUR); if (hBmpBackground) { DeleteObject(hBmpBackground); hBmpBackground = nullptr; } - if (db_get_b(NULL, "FrameTitleBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) { + if (db_get_b(0, "FrameTitleBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) { ptrW tszBitmapName(db_get_wsa(NULL, "FrameTitleBar", "BkBitmap")); if (tszBitmapName != NULL) hBmpBackground = Bitmap_Load(tszBitmapName); } - backgroundBmpUse = db_get_w(NULL, "FrameTitleBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE); + backgroundBmpUse = db_get_w(0, "FrameTitleBar", "BkBmpUse", CLCDEFAULT_BKBMPUSE); CLUIFramesOnClistResize(0, 0); return 0; @@ -2362,7 +2362,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA } if ((!(wParam&MK_CONTROL)) && Frames[framepos].Locked && (!(Frames[framepos].floating))) { - if (db_get_b(NULL, "CLUI", "ClientAreaDrag", 0)) { + if (db_get_b(0, "CLUI", "ClientAreaDrag", 0)) { POINT pt; GetCursorPos(&pt); return SendMessage(GetParent(hwnd), WM_SYSCOMMAND, SC_MOVE | HTCAPTION, MAKELPARAM(pt.x, pt.y)); @@ -3009,7 +3009,7 @@ int LoadCLUIFramesModule(void) OnFrameTitleBarBackgroundChange(); FramesSysNotStarted = FALSE; - g_hPenCLUIFrames = CreatePen(PS_SOLID, 1, db_get_dw(NULL, "CLUI", "clr_frameborder", GetSysColor(COLOR_3DDKSHADOW))); + g_hPenCLUIFrames = CreatePen(PS_SOLID, 1, db_get_dw(0, "CLUI", "clr_frameborder", GetSysColor(COLOR_3DDKSHADOW))); return 0; } diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp index 6ac0c0af8d..4798167798 100644 --- a/plugins/Clist_nicer/src/cluiopts.cpp +++ b/plugins/Clist_nicer/src/cluiopts.cpp @@ -37,24 +37,24 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l TranslateDialogDefault(hwndDlg); opt_clui_changed = 0; - CheckDlgButton(hwndDlg, IDC_BRINGTOFRONT, db_get_b(NULL, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ALWAYSHIDEONTASKBAR, db_get_b(NULL, "CList", "AlwaysHideOnTB", 1) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SHOWMAINMENU, db_get_b(NULL, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_CLIENTDRAG, db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_BRINGTOFRONT, db_get_b(0, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ALWAYSHIDEONTASKBAR, db_get_b(0, "CList", "AlwaysHideOnTB", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(0, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SHOWMAINMENU, db_get_b(0, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_CLIENTDRAG, db_get_b(0, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_FADEINOUT, cfg::dat.fadeinout ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_AUTOSIZE, cfg::dat.autosize ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DROPSHADOW, db_get_b(NULL, "CList", "WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONDESKTOP, db_get_b(NULL, "CList", "OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DROPSHADOW, db_get_b(0, "CList", "WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ONDESKTOP, db_get_b(0, "CList", "OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Title bar")); SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Tool Window")); SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Thin border")); SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("No border")); - SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_SETCURSEL, db_get_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW), 0); + SendDlgItemMessage(hwndDlg, IDC_BORDERSTYLE, CB_SETCURSEL, db_get_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW), 0); SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETRANGE, 0, MAKELONG(100, 0)); - SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETPOS, 0, db_get_b(NULL, "CLUI", "MaxSizeHeight", 75)); + SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETPOS, 0, db_get_b(0, "CLUI", "MaxSizeHeight", 75)); SendDlgItemMessage(hwndDlg, IDC_CLIPBORDERSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0)); SendDlgItemMessage(hwndDlg, IDC_CLIPBORDERSPIN, UDM_SETPOS, 0, cfg::dat.bClipBorder); @@ -69,10 +69,10 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l SendDlgItemMessage(hwndDlg, IDC_CTOPSPIN, UDM_SETPOS, 0, cfg::dat.bCTop); SendDlgItemMessage(hwndDlg, IDC_CBOTTOMSPIN, UDM_SETPOS, 0, cfg::dat.bCBottom); - CheckDlgButton(hwndDlg, IDC_AUTOSIZEUPWARD, db_get_b(NULL, "CLUI", "AutoSizeUpward", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_AUTOHIDE, db_get_b(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_AUTOSIZEUPWARD, db_get_b(0, "CLUI", "AutoSizeUpward", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_AUTOHIDE, db_get_b(0, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETRANGE, 0, MAKELONG(900, 1)); - SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0)); + SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(0, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0)); Utils::enableDlgControl(hwndDlg, IDC_HIDETIME, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); Utils::enableDlgControl(hwndDlg, IDC_HIDETIMESPIN, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); Utils::enableDlgControl(hwndDlg, IDC_STATIC01, IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); @@ -166,16 +166,16 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l if (!opt_clui_changed) return TRUE; - db_set_b(NULL, "CLUI", "FadeInOut", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT)); + db_set_b(0, "CLUI", "FadeInOut", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT)); cfg::dat.fadeinout = IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT) ? 1 : 0; oldFading = cfg::dat.fadeinout; cfg::dat.fadeinout = FALSE; - db_set_b(NULL, "CLUI", "WindowStyle", windowStyle); + db_set_b(0, "CLUI", "WindowStyle", windowStyle); cfg::dat.gapBetweenFrames = GetDlgItemInt(hwndDlg, IDC_FRAMEGAP, &translated, FALSE); - db_set_dw(NULL, "CLUIFrames", "GapBetweenFrames", cfg::dat.gapBetweenFrames); - db_set_b(NULL, "CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); + db_set_dw(0, "CLUIFrames", "GapBetweenFrames", cfg::dat.gapBetweenFrames); + db_set_b(0, "CList", "OnTop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); SetWindowPos(g_clistApi.hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); cfg::dat.bCLeft = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CLEFTSPIN, UDM_GETPOS, 0, 0); @@ -183,11 +183,11 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l cfg::dat.bCTop = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CTOPSPIN, UDM_GETPOS, 0, 0); cfg::dat.bCBottom = (BYTE)SendDlgItemMessage(hwndDlg, IDC_CBOTTOMSPIN, UDM_GETPOS, 0, 0); - db_set_dw(NULL, "CLUI", "clmargins", MAKELONG(MAKEWORD(cfg::dat.bCLeft, cfg::dat.bCRight), MAKEWORD(cfg::dat.bCTop, cfg::dat.bCBottom))); + db_set_dw(0, "CLUI", "clmargins", MAKELONG(MAKEWORD(cfg::dat.bCLeft, cfg::dat.bCRight), MAKEWORD(cfg::dat.bCTop, cfg::dat.bCBottom))); SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); - db_set_b(NULL, "CList", "BringToFront", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT)); - db_set_b(NULL, "CList", "AlwaysHideOnTB", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSHIDEONTASKBAR)); + db_set_b(0, "CList", "BringToFront", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT)); + db_set_b(0, "CList", "AlwaysHideOnTB", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ALWAYSHIDEONTASKBAR)); if (windowStyle != SETTING_WINDOWSTYLE_DEFAULT) { LONG style; @@ -210,7 +210,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l LONG style; style = GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE); style &= ~(WS_EX_TOOLWINDOW | WS_EX_WINDOWEDGE); - if (db_get_b(NULL, "CList", "AlwaysHideOnTB", 1)) + if (db_get_b(0, "CList", "AlwaysHideOnTB", 1)) style &= ~WS_EX_APPWINDOW; else { style |= WS_EX_APPWINDOW; @@ -220,11 +220,11 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l } cfg::dat.bClipBorder = (BYTE)GetDlgItemInt(hwndDlg, IDC_CLIPBORDER, &translated, FALSE); - db_set_dw(NULL, "CLUI", "Frameflags", cfg::dat.dwFlags); - db_set_b(NULL, "CLUI", "clipborder", cfg::dat.bClipBorder); + db_set_dw(0, "CLUI", "Frameflags", cfg::dat.dwFlags); + db_set_b(0, "CLUI", "clipborder", cfg::dat.bClipBorder); - db_set_b(NULL, "CLUI", "ShowMainMenu", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU)); - db_set_b(NULL, "CLUI", "ClientAreaDrag", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG)); + db_set_b(0, "CLUI", "ShowMainMenu", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU)); + db_set_b(0, "CLUI", "ClientAreaDrag", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG)); ApplyCLUIBorderStyle(); @@ -235,33 +235,33 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l wchar_t title[256]; GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, _countof(title)); - db_set_ws(NULL, "CList", "TitleText", title); + db_set_ws(0, "CList", "TitleText", title); SetWindowText(g_clistApi.hwndContactList, title); cfg::dat.dwFlags = IsDlgButtonChecked(hwndDlg, IDC_ROUNDEDBORDER) ? cfg::dat.dwFlags | CLUI_FRAME_ROUNDEDFRAME : cfg::dat.dwFlags & ~CLUI_FRAME_ROUNDEDFRAME; - db_set_b(NULL, "CLUI", "AutoSize", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)); + db_set_b(0, "CLUI", "AutoSize", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)); if ((cfg::dat.autosize = IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE) ? 1 : 0)) { SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); SendMessage(g_clistApi.hwndContactTree, WM_SIZE, 0, 0); } - db_set_b(NULL, "CLUI", "MaxSizeHeight", (BYTE)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE)); - db_set_b(NULL, "CLUI", "AutoSizeUpward", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD)); - db_set_b(NULL, "CList", "AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); - db_set_w(NULL, "CList", "HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0)); + db_set_b(0, "CLUI", "MaxSizeHeight", (BYTE)GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, nullptr, FALSE)); + db_set_b(0, "CLUI", "AutoSizeUpward", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD)); + db_set_b(0, "CList", "AutoHide", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); + db_set_w(0, "CList", "HideTime", (WORD)SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0)); - db_set_b(NULL, "CList", "Transparent", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)); + db_set_b(0, "CList", "Transparent", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)); cfg::dat.isTransparent = IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT) ? 1 : 0; - db_set_b(NULL, "CList", "Alpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0)); + db_set_b(0, "CList", "Alpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0)); cfg::dat.alpha = (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0); - db_set_b(NULL, "CList", "AutoAlpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0)); + db_set_b(0, "CList", "AutoAlpha", (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0)); cfg::dat.autoalpha = (BYTE)SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0); - db_set_b(NULL, "CList", "WindowShadow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW)); - db_set_b(NULL, "CList", "OnDesktop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)); - db_set_dw(NULL, "CLUI", "Frameflags", cfg::dat.dwFlags); + db_set_b(0, "CList", "WindowShadow", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW)); + db_set_b(0, "CList", "OnDesktop", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)); + db_set_dw(0, "CLUI", "Frameflags", cfg::dat.dwFlags); cfg::dat.bFullTransparent = IsDlgButtonChecked(hwndDlg, IDC_FULLTRANSPARENT) ? 1 : 0; - db_set_b(NULL, "CLUI", "fulltransparent", (BYTE)cfg::dat.bFullTransparent); + db_set_b(0, "CLUI", "fulltransparent", (BYTE)cfg::dat.bFullTransparent); if (cfg::dat.bLayeredHack) SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED); @@ -269,7 +269,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l if (g_CLUISkinnedBkColorRGB) cfg::dat.colorkey = g_CLUISkinnedBkColorRGB; else if (cfg::dat.bClipBorder == 0 && !(cfg::dat.dwFlags & CLUI_FRAME_ROUNDEDFRAME)) - cfg::dat.colorkey = db_get_dw(NULL, "CLC", "BkColour", CLCDEFAULT_BKCOLOUR); + cfg::dat.colorkey = db_get_dw(0, "CLC", "BkColour", CLCDEFAULT_BKCOLOUR); else { SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); cfg::dat.colorkey = RGB(255, 0, 255); @@ -314,20 +314,20 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l case WM_INITDIALOG: opt_sbar_changed = 0; TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_SHOWSBAR, db_get_b(NULL, "CLUI", "ShowSBar", 1) ? BST_CHECKED : BST_UNCHECKED); { - BYTE showOpts = db_get_b(NULL, "CLUI", "SBarShow", 1); + CheckDlgButton(hwndDlg, IDC_SHOWSBAR, db_get_b(0, "CLUI", "ShowSBar", 1) ? BST_CHECKED : BST_UNCHECKED); { + BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1); CheckDlgButton(hwndDlg, IDC_SHOWICON, showOpts & 1 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWPROTO, showOpts & 2 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWSTATUS, showOpts & 4 ? BST_CHECKED : BST_UNCHECKED); } - CheckDlgButton(hwndDlg, IDC_RIGHTSTATUS, db_get_b(NULL, "CLUI", "SBarRightClk", 0) ? BST_UNCHECKED : BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_RIGHTSTATUS, db_get_b(0, "CLUI", "SBarRightClk", 0) ? BST_UNCHECKED : BST_CHECKED); CheckDlgButton(hwndDlg, IDC_RIGHTMIRANDA, BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_RIGHTSTATUS) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_EQUALSECTIONS, cfg::dat.bEqualSections ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SBPANELBEVEL, db_get_b(NULL, "CLUI", "SBarBevel", 1) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SHOWGRIP, db_get_b(NULL, "CLUI", "ShowGrip", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SBPANELBEVEL, db_get_b(0, "CLUI", "SBarBevel", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SHOWGRIP, db_get_b(0, "CLUI", "ShowGrip", 1) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SKINBACKGROUND, cfg::dat.bSkinnedStatusBar ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWXSTATUS, cfg::dat.bShowXStatusOnSbar ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_MARKLOCKED, db_get_b(NULL, "CLUI", "sbar_showlocked", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_MARKLOCKED, db_get_b(0, "CLUI", "sbar_showlocked", 1) ? BST_CHECKED : BST_UNCHECKED); if (BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) { Utils::enableDlgControl(hwndDlg, IDC_SHOWICON, FALSE); @@ -364,28 +364,28 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l if (!opt_sbar_changed) return TRUE; - db_set_b(NULL, "CLUI", "ShowSBar", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)); - db_set_b(NULL, "CLUI", "SBarShow", (BYTE)((IsDlgButtonChecked(hwndDlg, IDC_SHOWICON) ? 1 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWPROTO) ? 2 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS) ? 4 : 0))); - db_set_b(NULL, "CLUI", "SBarRightClk", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA)); - db_set_b(NULL, "CLUI", "EqualSections", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS)); - db_set_b(NULL, "CLUI", "sb_skinned", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SKINBACKGROUND)); - db_set_b(NULL, "CLUI", "sbar_showlocked", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MARKLOCKED)); + db_set_b(0, "CLUI", "ShowSBar", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)); + db_set_b(0, "CLUI", "SBarShow", (BYTE)((IsDlgButtonChecked(hwndDlg, IDC_SHOWICON) ? 1 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWPROTO) ? 2 : 0) | (IsDlgButtonChecked(hwndDlg, IDC_SHOWSTATUS) ? 4 : 0))); + db_set_b(0, "CLUI", "SBarRightClk", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA)); + db_set_b(0, "CLUI", "EqualSections", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS)); + db_set_b(0, "CLUI", "sb_skinned", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SKINBACKGROUND)); + db_set_b(0, "CLUI", "sbar_showlocked", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_MARKLOCKED)); cfg::dat.bEqualSections = IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS) ? 1 : 0; cfg::dat.bSkinnedStatusBar = IsDlgButtonChecked(hwndDlg, IDC_SKINBACKGROUND) ? 1 : 0; cfg::dat.bShowXStatusOnSbar = IsDlgButtonChecked(hwndDlg, IDC_SHOWXSTATUS) ? 1 : 0; - db_set_b(NULL, "CLUI", "xstatus_sbar", (BYTE)cfg::dat.bShowXStatusOnSbar); - db_set_b(NULL, "CLUI", "SBarBevel", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL)); - if (db_get_b(NULL, "CLUI", "ShowGrip", 1) != (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) { + db_set_b(0, "CLUI", "xstatus_sbar", (BYTE)cfg::dat.bShowXStatusOnSbar); + db_set_b(0, "CLUI", "SBarBevel", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL)); + if (db_get_b(0, "CLUI", "ShowGrip", 1) != (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) { HWND parent = GetParent(g_clistApi.hwndStatus); int flags = WS_CHILD | CCS_BOTTOM; - db_set_b(NULL, "CLUI", "ShowGrip", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)); + db_set_b(0, "CLUI", "ShowGrip", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)); ShowWindow(g_clistApi.hwndStatus, SW_HIDE); mir_unsubclassWindow(g_clistApi.hwndStatus, NewStatusBarWndProc); DestroyWindow(g_clistApi.hwndStatus); - flags |= db_get_b(NULL, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; - flags |= db_get_b(NULL, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; + flags |= db_get_b(0, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; + flags |= db_get_b(0, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; g_clistApi.hwndStatus = CreateWindow(STATUSCLASSNAME, nullptr, flags, 0, 0, 0, 0, parent, nullptr, g_plugin.getInst(), nullptr); mir_subclassWindow(g_clistApi.hwndStatus, NewStatusBarWndProc); @@ -399,7 +399,7 @@ INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l ShowWindow(g_clistApi.hwndStatus, SW_HIDE); cfg::dat.dwFlags &= ~CLUI_FRAME_SBARSHOW; } - db_set_dw(NULL, "CLUI", "Frameflags", cfg::dat.dwFlags); + db_set_dw(0, "CLUI", "Frameflags", cfg::dat.dwFlags); ConfigureCLUIGeometry(1); SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0); CluiProtocolStatusChanged(0, nullptr); @@ -428,7 +428,7 @@ DWORD GetCLUIWindowStyle(BYTE style) void ApplyCLUIBorderStyle() { - BYTE windowStyle = db_get_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW); + BYTE windowStyle = db_get_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW); WINDOWPLACEMENT p; bool minToTray = TRUE; diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp index 98c87934b2..60a05ed26c 100644 --- a/plugins/Clist_nicer/src/cluiservices.cpp +++ b/plugins/Clist_nicer/src/cluiservices.cpp @@ -87,7 +87,7 @@ void CluiProtocolStatusChanged(int, const char*) partCount = toshow; } else { - BYTE showOpts = db_get_b(NULL, "CLUI", "SBarShow", 1); + BYTE showOpts = db_get_b(0, "CLUI", "SBarShow", 1); wchar_t szName[32]; HDC hdc = GetDC(nullptr); @@ -134,7 +134,7 @@ void CluiProtocolStatusChanged(int, const char*) SendMessage(g_clistApi.hwndStatus, SB_SIMPLE, FALSE, 0); partWidths[partCount - 1] = -1; - BYTE windowStyle = db_get_b(NULL, "CLUI", "WindowStyle", 0); + BYTE windowStyle = db_get_b(0, "CLUI", "WindowStyle", 0); SendMessage(g_clistApi.hwndStatus, SB_SETMINHEIGHT, 18 + cfg::dat.bClipBorder + ((windowStyle == SETTING_WINDOWSTYLE_THINBORDER || windowStyle == SETTING_WINDOWSTYLE_NOBORDER) ? 3 : 0), 0); SendMessage(g_clistApi.hwndStatus, SB_SETPARTS, partCount, (LPARAM)partWidths); @@ -154,7 +154,7 @@ void CluiProtocolStatusChanged(int, const char*) PD->protopos = partCount; int flags = SBT_OWNERDRAW; - if (db_get_b(NULL, "CLUI", "SBarBevel", 1) == 0) + if (db_get_b(0, "CLUI", "SBarBevel", 1) == 0) flags |= SBT_NOBORDERS; SendMessageA(g_clistApi.hwndStatus, SB_SETTEXTA, partCount | flags, (LPARAM)PD); diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index 6ac1ab17cf..284b22380e 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -122,7 +122,7 @@ void API::updateState() if (sysConfig.isVistaPlus) { sysState.isDwmActive = (pfnDwmIsCompositionEnabled && (pfnDwmIsCompositionEnabled(&result) == S_OK) && result) ? true : false; - sysState.isAero = /* (CSkin::m_skinEnabled == false) && */ db_get_b(NULL, "CLUI", "useAero", 1) /* && CSkin::m_fAeroSkinsValid */ && sysState.isDwmActive; + sysState.isAero = /* (CSkin::m_skinEnabled == false) && */ db_get_b(0, "CLUI", "useAero", 1) /* && CSkin::m_fAeroSkinsValid */ && sysState.isDwmActive; } } diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp index e3b4016a02..2fcabf7dcb 100644 --- a/plugins/Clist_nicer/src/contact.cpp +++ b/plugins/Clist_nicer/src/contact.cpp @@ -128,11 +128,11 @@ void MF_UpdateThread(LPVOID) void MF_InitCheck(void) { - BYTE bMsgFrequency = db_get_b(NULL, "CList", "fhistdata", 0); + BYTE bMsgFrequency = db_get_b(0, "CList", "fhistdata", 0); if (!bMsgFrequency) { for (auto &hContact : Contacts()) MF_CalcFrequency(hContact, 100, 0); - db_set_b(NULL, "CList", "fhistdata", 1); + db_set_b(0, "CList", "fhistdata", 1); } } diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 964b91fc4b..6cffd44a57 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -299,31 +299,31 @@ void LoadExtBkSettingsFromDB() p->imageItem = nullptr; CMStringA buffer; buffer.Format("%s_IGNORE", p->szDBname); - p->IGNORED = (BYTE)db_get_b(NULL, "CLCExt", buffer, p->IGNORED); + p->IGNORED = (BYTE)db_get_b(0, "CLCExt", buffer, p->IGNORED); buffer.Format("%s_GRADIENT", p->szDBname); - p->GRADIENT = (BYTE)db_get_dw(NULL, "CLCExt", buffer, p->GRADIENT); + p->GRADIENT = (BYTE)db_get_dw(0, "CLCExt", buffer, p->GRADIENT); buffer.Format("%s_CORNER", p->szDBname); - p->CORNER = (BYTE)db_get_dw(NULL, "CLCExt", buffer, p->CORNER); + p->CORNER = (BYTE)db_get_dw(0, "CLCExt", buffer, p->CORNER); buffer.Format("%s_COLOR", p->szDBname); - p->COLOR = db_get_dw(NULL, "CLCExt", buffer, p->COLOR); + p->COLOR = db_get_dw(0, "CLCExt", buffer, p->COLOR); buffer.Format("%s_COLOR2", p->szDBname); - p->COLOR2 = db_get_dw(NULL, "CLCExt", buffer, p->COLOR2); + p->COLOR2 = db_get_dw(0, "CLCExt", buffer, p->COLOR2); buffer.Format("%s_COLOR2_TRANSPARENT", p->szDBname); - p->COLOR2_TRANSPARENT = (BYTE)db_get_b(NULL, "CLCExt", buffer, p->COLOR2_TRANSPARENT); + p->COLOR2_TRANSPARENT = (BYTE)db_get_b(0, "CLCExt", buffer, p->COLOR2_TRANSPARENT); buffer.Format("%s_TEXTCOLOR", p->szDBname); - p->TEXTCOLOR = db_get_dw(NULL, "CLCExt", buffer, p->TEXTCOLOR); + p->TEXTCOLOR = db_get_dw(0, "CLCExt", buffer, p->TEXTCOLOR); buffer.Format("%s_ALPHA", p->szDBname); - p->ALPHA = db_get_b(NULL, "CLCExt", buffer, p->ALPHA); + p->ALPHA = db_get_b(0, "CLCExt", buffer, p->ALPHA); buffer.Format("%s_MRGN_LEFT", p->szDBname); - p->MARGIN_LEFT = db_get_b(NULL, "CLCExt", buffer, p->MARGIN_LEFT); + p->MARGIN_LEFT = db_get_b(0, "CLCExt", buffer, p->MARGIN_LEFT); buffer.Format("%s_MRGN_TOP", p->szDBname); - p->MARGIN_TOP = db_get_b(NULL, "CLCExt", buffer, p->MARGIN_TOP); + p->MARGIN_TOP = db_get_b(0, "CLCExt", buffer, p->MARGIN_TOP); buffer.Format("%s_MRGN_RIGHT", p->szDBname); - p->MARGIN_RIGHT = db_get_b(NULL, "CLCExt", buffer, p->MARGIN_RIGHT); + p->MARGIN_RIGHT = db_get_b(0, "CLCExt", buffer, p->MARGIN_RIGHT); buffer.Format("%s_MRGN_BOTTOM", p->szDBname); - p->MARGIN_BOTTOM = db_get_b(NULL, "CLCExt", buffer, p->MARGIN_BOTTOM); + p->MARGIN_BOTTOM = db_get_b(0, "CLCExt", buffer, p->MARGIN_BOTTOM); buffer.Format("%s_BDRSTYLE", p->szDBname); - p->BORDERSTYLE = db_get_dw(NULL, "CLCExt", buffer, p->BORDERSTYLE); + p->BORDERSTYLE = db_get_dw(0, "CLCExt", buffer, p->BORDERSTYLE); } if (cfg::dat.bFirstRun) { @@ -346,39 +346,39 @@ static void SaveCompleteStructToDB() if (p->statusID != ID_EXTBKSEPARATOR) { char buffer[255]; mir_snprintf(buffer, "%s_IGNORE", p->szDBname); - db_set_b(NULL, "CLCExt", buffer, p->IGNORED); + db_set_b(0, "CLCExt", buffer, p->IGNORED); mir_snprintf(buffer, "%s_GRADIENT", p->szDBname); - db_set_dw(NULL, "CLCExt", buffer, p->GRADIENT); + db_set_dw(0, "CLCExt", buffer, p->GRADIENT); mir_snprintf(buffer, "%s_CORNER", p->szDBname); - db_set_dw(NULL, "CLCExt", buffer, p->CORNER); + db_set_dw(0, "CLCExt", buffer, p->CORNER); mir_snprintf(buffer, "%s_COLOR", p->szDBname); - db_set_dw(NULL, "CLCExt", buffer, p->COLOR); + db_set_dw(0, "CLCExt", buffer, p->COLOR); mir_snprintf(buffer, "%s_COLOR2", p->szDBname); - db_set_dw(NULL, "CLCExt", buffer, p->COLOR2); + db_set_dw(0, "CLCExt", buffer, p->COLOR2); mir_snprintf(buffer, "%s_COLOR2_TRANSPARENT", p->szDBname); - db_set_b(NULL, "CLCExt", buffer, p->COLOR2_TRANSPARENT); + db_set_b(0, "CLCExt", buffer, p->COLOR2_TRANSPARENT); mir_snprintf(buffer, "%s_TEXTCOLOR", p->szDBname); - db_set_dw(NULL, "CLCExt", buffer, p->TEXTCOLOR); + db_set_dw(0, "CLCExt", buffer, p->TEXTCOLOR); mir_snprintf(buffer, "%s_ALPHA", p->szDBname); - db_set_b(NULL, "CLCExt", buffer, (BYTE)p->ALPHA); + db_set_b(0, "CLCExt", buffer, (BYTE)p->ALPHA); mir_snprintf(buffer, "%s_MRGN_LEFT", p->szDBname); - db_set_b(NULL, "CLCExt", buffer, (BYTE)p->MARGIN_LEFT); + db_set_b(0, "CLCExt", buffer, (BYTE)p->MARGIN_LEFT); mir_snprintf(buffer, "%s_MRGN_TOP", p->szDBname); - db_set_b(NULL, "CLCExt", buffer, (BYTE)p->MARGIN_TOP); + db_set_b(0, "CLCExt", buffer, (BYTE)p->MARGIN_TOP); mir_snprintf(buffer, "%s_MRGN_RIGHT", p->szDBname); - db_set_b(NULL, "CLCExt", buffer, (BYTE)p->MARGIN_RIGHT); + db_set_b(0, "CLCExt", buffer, (BYTE)p->MARGIN_RIGHT); mir_snprintf(buffer, "%s_MRGN_BOTTOM", p->szDBname); - db_set_b(NULL, "CLCExt", buffer, (BYTE)p->MARGIN_BOTTOM); + db_set_b(0, "CLCExt", buffer, (BYTE)p->MARGIN_BOTTOM); mir_snprintf(buffer, "%s_BDRSTYLE", p->szDBname); - db_set_dw(NULL, "CLCExt", buffer, p->BORDERSTYLE); + db_set_dw(0, "CLCExt", buffer, p->BORDERSTYLE); } } } void SetButtonToSkinned() { - bool bSkinned = (cfg::dat.bSkinnedButtonMode = db_get_b(NULL, "CLCExt", "bskinned", 0)) != 0; - bool bFlat = bSkinned || (db_get_b(NULL, "TopToolBar", "UseFlatButton", 0) != 0); + bool bSkinned = (cfg::dat.bSkinnedButtonMode = db_get_b(0, "CLCExt", "bskinned", 0)) != 0; + bool bFlat = bSkinned || (db_get_b(0, "TopToolBar", "UseFlatButton", 0) != 0); for (int i = 0;; i++) { if (BTNS[i].pszButtonID == nullptr) @@ -399,8 +399,8 @@ void Reload3dBevelColors() if (cfg::dat.hPen3DDark) DeleteObject(cfg::dat.hPen3DDark); - cfg::dat.hPen3DBright = CreatePen(PS_SOLID, 1, db_get_dw(NULL, "CLCExt", "3dbright", GetSysColor(COLOR_3DLIGHT))); - cfg::dat.hPen3DDark = CreatePen(PS_SOLID, 1, db_get_dw(NULL, "CLCExt", "3ddark", GetSysColor(COLOR_3DSHADOW))); + cfg::dat.hPen3DBright = CreatePen(PS_SOLID, 1, db_get_dw(0, "CLCExt", "3dbright", GetSysColor(COLOR_3DLIGHT))); + cfg::dat.hPen3DDark = CreatePen(PS_SOLID, 1, db_get_dw(0, "CLCExt", "3ddark", GetSysColor(COLOR_3DSHADOW))); } // Save Non-arStatusItems Settings @@ -408,8 +408,8 @@ void SaveNonStatusItemsSettings(HWND hwndDlg) { BOOL translated; - db_set_b(NULL, "CLCExt", "EXBK_EqualSelection", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSELECTION)); - db_set_b(NULL, "CLCExt", "EXBK_SelBlend", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SELBLEND)); + db_set_b(0, "CLCExt", "EXBK_EqualSelection", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_EQUALSELECTION)); + db_set_b(0, "CLCExt", "EXBK_SelBlend", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SELBLEND)); cfg::dat.cornerRadius = GetDlgItemInt(hwndDlg, IDC_CORNERRAD, &translated, FALSE); cfg::dat.bApplyIndentToBg = IsDlgButtonChecked(hwndDlg, IDC_APPLYINDENTBG) ? 1 : 0; @@ -419,16 +419,16 @@ void SaveNonStatusItemsSettings(HWND hwndDlg) cfg::dat.titleBarHeight = (BYTE)GetDlgItemInt(hwndDlg, IDC_LASTITEMPADDING, &translated, FALSE); cfg::dat.group_padding = GetDlgItemInt(hwndDlg, IDC_GRPTOPPADDING, &translated, FALSE); - db_set_b(NULL, "CLCExt", "CornerRad", cfg::dat.cornerRadius); - db_set_b(NULL, "CLCExt", "applyindentbg", (BYTE)cfg::dat.bApplyIndentToBg); - db_set_b(NULL, "CLCExt", "useperproto", (BYTE)cfg::dat.bUsePerProto); - db_set_b(NULL, "CLCExt", "override_status", (BYTE)cfg::dat.bOverridePerStatusColors); - db_set_b(NULL, "CLCExt", "bskinned", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_SETALLBUTTONSKINNED) ? 1 : 0)); - db_set_b(NULL, "CLCExt", "FastGradients", cfg::dat.bWantFastGradients); - db_set_b(NULL, "CLC", "IgnoreSelforGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_IGNORESELFORGROUPS)); + db_set_b(0, "CLCExt", "CornerRad", cfg::dat.cornerRadius); + db_set_b(0, "CLCExt", "applyindentbg", (BYTE)cfg::dat.bApplyIndentToBg); + db_set_b(0, "CLCExt", "useperproto", (BYTE)cfg::dat.bUsePerProto); + db_set_b(0, "CLCExt", "override_status", (BYTE)cfg::dat.bOverridePerStatusColors); + db_set_b(0, "CLCExt", "bskinned", (BYTE)(IsDlgButtonChecked(hwndDlg, IDC_SETALLBUTTONSKINNED) ? 1 : 0)); + db_set_b(0, "CLCExt", "FastGradients", cfg::dat.bWantFastGradients); + db_set_b(0, "CLC", "IgnoreSelforGroups", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_IGNORESELFORGROUPS)); - db_set_dw(NULL, "CLCExt", "grp_padding", cfg::dat.group_padding); - db_set_b(NULL, "CLCExt", "frame_height", cfg::dat.titleBarHeight); + db_set_dw(0, "CLCExt", "grp_padding", cfg::dat.group_padding); + db_set_b(0, "CLCExt", "frame_height", cfg::dat.titleBarHeight); Reload3dBevelColors(); SetButtonToSkinned(); @@ -508,32 +508,32 @@ void extbk_export(char *file) mir_snprintf(szSection, "Font%d", n); mir_snprintf(szKey, "Font%dName", n); - if (!db_get_s(NULL, "CLC", szKey, &dbv)) { + if (!db_get_s(0, "CLC", szKey, &dbv)) { WritePrivateProfileStringA(szSection, "Name", dbv.pszVal, file); mir_free(dbv.pszVal); } mir_snprintf(szKey, "Font%dSize", n); - data = (DWORD)db_get_b(NULL, "CLC", szKey, 8); + data = (DWORD)db_get_b(0, "CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Size", &data, 1, file); mir_snprintf(szKey, "Font%dSty", n); - data = (DWORD)db_get_b(NULL, "CLC", szKey, 8); + data = (DWORD)db_get_b(0, "CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Style", &data, 1, file); mir_snprintf(szKey, "Font%dSet", n); - data = (DWORD)db_get_b(NULL, "CLC", szKey, 8); + data = (DWORD)db_get_b(0, "CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Set", &data, 1, file); mir_snprintf(szKey, "Font%dCol", n); - data = db_get_dw(NULL, "CLC", szKey, 8); + data = db_get_dw(0, "CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Color", &data, 4, file); mir_snprintf(szKey, "Font%dFlags", n); - data = (DWORD)db_get_dw(NULL, "CLC", szKey, 8); + data = (DWORD)db_get_dw(0, "CLC", szKey, 8); WritePrivateProfileStructA(szSection, "Flags", &data, 4, file); mir_snprintf(szKey, "Font%dAs", n); - data = (DWORD)db_get_w(NULL, "CLC", szKey, 8); + data = (DWORD)db_get_w(0, "CLC", szKey, 8); WritePrivateProfileStructA(szSection, "SameAs", &data, 2, file); } @@ -542,20 +542,20 @@ void extbk_export(char *file) data = 0; switch (_tagSettings[i].size) { case 1: - data = (DWORD)db_get_b(NULL, _tagSettings[i].szModule, _tagSettings[i].szSetting, (BYTE)_tagSettings[i].defaultval); + data = (DWORD)db_get_b(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (BYTE)_tagSettings[i].defaultval); break; case 2: - data = (DWORD)db_get_w(NULL, _tagSettings[i].szModule, _tagSettings[i].szSetting, (DWORD)_tagSettings[i].defaultval); + data = (DWORD)db_get_w(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (DWORD)_tagSettings[i].defaultval); break; case 4: - data = (DWORD)db_get_dw(NULL, _tagSettings[i].szModule, _tagSettings[i].szSetting, (DWORD)_tagSettings[i].defaultval); + data = (DWORD)db_get_dw(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (DWORD)_tagSettings[i].defaultval); break; } WritePrivateProfileStructA("Global", _tagSettings[i].szSetting, &data, _tagSettings[i].size, file); i++; } - if (!db_get_s(NULL, "CLC", "BkBitmap", &dbv)) { + if (!db_get_s(0, "CLC", "BkBitmap", &dbv)) { WritePrivateProfileStringA("Global", "BkBitmap", dbv.pszVal, file); db_free(&dbv); } @@ -891,7 +891,7 @@ done_with_glyph: GetPrivateProfileStringA(itemname, "Colorkey", "e5e5e5", buffer, 500, szFileName); COLORREF clr = HexStringToLong(buffer); cfg::dat.colorkey = clr; - db_set_dw(NULL, "CLUI", "ColorKey", clr); + db_set_dw(0, "CLUI", "ColorKey", clr); if (g_CLUISkinnedBkColor) DeleteObject(g_CLUISkinnedBkColor); g_CLUISkinnedBkColor = CreateSolidBrush(clr); @@ -1224,14 +1224,14 @@ void IMG_LoadItems() free(szSections); if (g_ImageItems) { - db_set_b(NULL, "CLCExt", "bskinned", 1); + db_set_b(0, "CLCExt", "bskinned", 1); SetButtonToSkinned(); } if (g_CLUIImageItem) { cfg::dat.bFullTransparent = TRUE; cfg::dat.dwFlags &= ~CLUI_FRAME_CLISTSUNKEN; - db_set_b(NULL, "CLUI", "fulltransparent", (BYTE)cfg::dat.bFullTransparent); - db_set_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_NOBORDER); + db_set_b(0, "CLUI", "fulltransparent", (BYTE)cfg::dat.bFullTransparent); + db_set_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_NOBORDER); ApplyCLUIBorderStyle(); SetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE, GetWindowLongPtr(g_clistApi.hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED); SetLayeredWindowAttributes(g_clistApi.hwndContactList, cfg::dat.colorkey, 0, LWA_COLORKEY); @@ -1384,37 +1384,37 @@ void extbk_import(char *file, HWND hwndDlg) mir_snprintf(szKey, "Font%dName", n); GetPrivateProfileStringA(szSection, "Name", "Arial", buffer, sizeof(buffer), file); - db_set_s(NULL, "CLC", szKey, buffer); + db_set_s(0, "CLC", szKey, buffer); mir_snprintf(szKey, "Font%dSize", n); data = 0; GetPrivateProfileStructA(szSection, "Size", &data, 1, file); - db_set_b(NULL, "CLC", szKey, (BYTE)data); + db_set_b(0, "CLC", szKey, (BYTE)data); mir_snprintf(szKey, "Font%dSty", n); data = 0; GetPrivateProfileStructA(szSection, "Style", &data, 1, file); - db_set_b(NULL, "CLC", szKey, (BYTE)data); + db_set_b(0, "CLC", szKey, (BYTE)data); mir_snprintf(szKey, "Font%dSet", n); data = 0; GetPrivateProfileStructA(szSection, "Set", &data, 1, file); - db_set_b(NULL, "CLC", szKey, (BYTE)data); + db_set_b(0, "CLC", szKey, (BYTE)data); mir_snprintf(szKey, "Font%dCol", n); data = 0; GetPrivateProfileStructA(szSection, "Color", &data, 4, file); - db_set_dw(NULL, "CLC", szKey, data); + db_set_dw(0, "CLC", szKey, data); mir_snprintf(szKey, "Font%dFlags", n); data = 0; GetPrivateProfileStructA(szSection, "Flags", &data, 4, file); - db_set_dw(NULL, "CLC", szKey, (WORD)data); + db_set_dw(0, "CLC", szKey, (WORD)data); mir_snprintf(szKey, "Font%dAs", n); data = 0; GetPrivateProfileStructA(szSection, "SameAs", &data, 2, file); - db_set_dw(NULL, "CLC", szKey, (WORD)data); + db_set_dw(0, "CLC", szKey, (WORD)data); } } i = 0; @@ -1427,20 +1427,20 @@ void extbk_import(char *file, HWND hwndDlg) GetPrivateProfileStructA("Global", _tagSettings[i].szSetting, &data, _tagSettings[i].size, file); switch (_tagSettings[i].size) { case 1: - db_set_b(NULL, _tagSettings[i].szModule, _tagSettings[i].szSetting, (BYTE)data); + db_set_b(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (BYTE)data); break; case 4: - db_set_dw(NULL, _tagSettings[i].szModule, _tagSettings[i].szSetting, data); + db_set_dw(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, data); break; case 2: - db_set_w(NULL, _tagSettings[i].szModule, _tagSettings[i].szSetting, (WORD)data); + db_set_w(0, _tagSettings[i].szModule, _tagSettings[i].szSetting, (WORD)data); break; } i++; } GetPrivateProfileStringA("Global", "BkBitmap", "", szString, MAX_PATH, file); if (szString[0] != 0) - db_set_s(NULL, "CLC", "BkBitmap", szString); + db_set_s(0, "CLC", "BkBitmap", szString); } Reload3dBevelColors(); @@ -1465,10 +1465,10 @@ static void ApplyCLUISkin() WideCharToMultiByte(CP_ACP, 0, tszFinalName, MAX_PATH, szFinalName, MAX_PATH, nullptr, nullptr); - if (db_get_b(NULL, "CLUI", "skin_changed", 0)) { + if (db_get_b(0, "CLUI", "skin_changed", 0)) { extbk_import(szFinalName, nullptr); SaveCompleteStructToDB(); - db_set_b(NULL, "CLUI", "skin_changed", 0); + db_set_b(0, "CLUI", "skin_changed", 0); } IMG_LoadItems(); ShowWindow(g_clistApi.hwndContactList, SW_SHOWNORMAL); @@ -1486,9 +1486,9 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L DBVARIANT dbv; TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_EQUALSELECTION, (db_get_b(NULL, "CLCExt", "EXBK_EqualSelection", 1) == 1) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SELBLEND, db_get_b(NULL, "CLCExt", "EXBK_SelBlend", 1) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SETALLBUTTONSKINNED, db_get_b(NULL, "CLCExt", "bskinned", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_EQUALSELECTION, (db_get_b(0, "CLCExt", "EXBK_EqualSelection", 1) == 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SELBLEND, db_get_b(0, "CLCExt", "EXBK_SelBlend", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SETALLBUTTONSKINNED, db_get_b(0, "CLCExt", "bskinned", 0) ? BST_CHECKED : BST_UNCHECKED); SendDlgItemMessage(hwndDlg, IDC_CORNERSPIN, UDM_SETRANGE, 0, MAKELONG(10, 0)); SendDlgItemMessage(hwndDlg, IDC_CORNERSPIN, UDM_SETPOS, 0, cfg::dat.cornerRadius); @@ -1503,16 +1503,16 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L CheckDlgButton(hwndDlg, IDC_USEPERPROTO, cfg::dat.bUsePerProto ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_OVERRIDEPERSTATUSCOLOR, cfg::dat.bOverridePerStatusColors ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_FASTGRADIENT, cfg::dat.bWantFastGradients ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_IGNORESELFORGROUPS, db_get_b(NULL, "CLC", "IgnoreSelforGroups", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_IGNORESELFORGROUPS, db_get_b(0, "CLC", "IgnoreSelforGroups", 0) ? BST_CHECKED : BST_UNCHECKED); - if (!db_get_s(NULL, "CLC", "ContactSkins", &dbv)) { + if (!db_get_s(0, "CLC", "ContactSkins", &dbv)) { SetDlgItemTextA(hwndDlg, IDC_SKINFILE, dbv.pszVal); db_free(&dbv); Utils::enableDlgControl(hwndDlg, IDC_RELOAD, TRUE); } else Utils::enableDlgControl(hwndDlg, IDC_RELOAD, FALSE); - CheckDlgButton(hwndDlg, IDC_USESKIN, db_get_b(NULL, "CLUI", "useskin", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_USESKIN, db_get_b(0, "CLUI", "useskin", 0) ? BST_CHECKED : BST_UNCHECKED); if (!db_get_ws(NULL, "CLC", "AdvancedSkin", &dbv)) { SetDlgItemText(hwndDlg, IDC_SKINFILENAME, dbv.pwszVal); db_free(&dbv); @@ -1526,7 +1526,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L case IDC_USESKIN: { int useskin = IsDlgButtonChecked(hwndDlg, IDC_USESKIN); - db_set_b(NULL, "CLUI", "useskin", (BYTE)(useskin ? 1 : 0)); + db_set_b(0, "CLUI", "useskin", (BYTE)(useskin ? 1 : 0)); } break; @@ -1571,15 +1571,15 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } else skinChanged = TRUE; - db_set_ws(NULL, "CLC", "AdvancedSkin", final_path); - db_set_b(NULL, "CLUI", "skin_changed", (BYTE)skinChanged); + db_set_ws(0, "CLC", "AdvancedSkin", final_path); + db_set_b(0, "CLUI", "skin_changed", (BYTE)skinChanged); SetDlgItemText(hwndDlg, IDC_SKINFILENAME, final_path); } } break; case IDC_RELOADSKIN: - db_set_b(NULL, "CLUI", "skin_changed", 1); + db_set_b(0, "CLUI", "skin_changed", 1); ApplyCLUISkin(); break; @@ -1628,7 +1628,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara case WM_INITDIALOG: TranslateDialogDefault(hwnd); { - int oPage = db_get_b(NULL, "CLUI", "opage", 0); + int oPage = db_get_b(0, "CLUI", "opage", 0); RECT rcClient; GetClientRect(hwnd, &rcClient); @@ -1745,7 +1745,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara tci.mask = TCIF_PARAM; TabCtrl_GetItem(GetDlgItem(hwnd, IDC_OPTIONSTAB), TabCtrl_GetCurSel(GetDlgItem(hwnd, IDC_OPTIONSTAB)), &tci); ShowWindow((HWND)tci.lParam, SW_SHOW); - db_set_b(NULL, "CLUI", "opage", (BYTE)TabCtrl_GetCurSel(GetDlgItem(hwnd, IDC_OPTIONSTAB))); + db_set_b(0, "CLUI", "opage", (BYTE)TabCtrl_GetCurSel(GetDlgItem(hwnd, IDC_OPTIONSTAB))); Utils::enableDlgControl(hwnd, IDC_EXPORT, TabCtrl_GetCurSel(GetDlgItem(hwnd, IDC_OPTIONSTAB)) != 0); Utils::enableDlgControl(hwnd, IDC_IMPORT, TabCtrl_GetCurSel(GetDlgItem(hwnd, IDC_OPTIONSTAB)) != 0); break; @@ -1787,7 +1787,7 @@ int CoolSB_SetupScrollBar() !arStatusItems[ID_EXTBKSCROLLBUTTONPRESSED - ID_STATUS_OFFLINE]->imageItem) cfg::dat.bSkinnedScrollbar = FALSE; - if (db_get_b(NULL, "CLC", "NoVScrollBar", 0)) { + if (db_get_b(0, "CLC", "NoVScrollBar", 0)) { UninitializeCoolSB(g_clistApi.hwndContactTree); return 0; } diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index 4bf1266d31..94465ed1c6 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -124,49 +124,49 @@ int CMPlugin::Load() cfg::dat.hMenuNotify = CreatePopupMenu(); cfg::dat.wNextMenuID = 1; - cfg::dat.sortTimer = db_get_dw(NULL, "CLC", "SortTimer", 150); - cfg::dat.avatarBorder = (COLORREF)db_get_dw(NULL, "CLC", "avatarborder", 0); - cfg::dat.avatarRadius = (COLORREF)db_get_dw(NULL, "CLC", "avatarradius", 4); + cfg::dat.sortTimer = db_get_dw(0, "CLC", "SortTimer", 150); + cfg::dat.avatarBorder = (COLORREF)db_get_dw(0, "CLC", "avatarborder", 0); + cfg::dat.avatarRadius = (COLORREF)db_get_dw(0, "CLC", "avatarradius", 4); cfg::dat.hBrushAvatarBorder = CreateSolidBrush(cfg::dat.avatarBorder); - cfg::dat.avatarSize = db_get_w(NULL, "CList", "AvatarSize", 24); - cfg::dat.dualRowMode = db_get_b(NULL, "CLC", "DualRowMode", 0); - cfg::dat.avatarPadding = db_get_b(NULL, "CList", "AvatarPadding", 0); - cfg::dat.isTransparent = db_get_b(NULL, "CList", "Transparent", 0); - cfg::dat.alpha = db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT); - cfg::dat.autoalpha = db_get_b(NULL, "CList", "AutoAlpha", SETTING_ALPHA_DEFAULT); - cfg::dat.fadeinout = db_get_b(NULL, "CLUI", "FadeInOut", 0); - cfg::dat.autosize = db_get_b(NULL, "CLUI", "AutoSize", 0); - cfg::dat.bNoOfflineAvatars = db_get_b(NULL, "CList", "NoOfflineAV", 1); - cfg::dat.bFullTransparent = db_get_b(NULL, "CLUI", "fulltransparent", 0); - cfg::dat.bDblClkAvatars = db_get_b(NULL, "CLC", "dblclkav", 0); - cfg::dat.bEqualSections = db_get_b(NULL, "CLUI", "EqualSections", 0); - cfg::dat.bCenterStatusIcons = db_get_b(NULL, "CLC", "si_centered", 1); + cfg::dat.avatarSize = db_get_w(0, "CList", "AvatarSize", 24); + cfg::dat.dualRowMode = db_get_b(0, "CLC", "DualRowMode", 0); + cfg::dat.avatarPadding = db_get_b(0, "CList", "AvatarPadding", 0); + cfg::dat.isTransparent = db_get_b(0, "CList", "Transparent", 0); + cfg::dat.alpha = db_get_b(0, "CList", "Alpha", SETTING_ALPHA_DEFAULT); + cfg::dat.autoalpha = db_get_b(0, "CList", "AutoAlpha", SETTING_ALPHA_DEFAULT); + cfg::dat.fadeinout = db_get_b(0, "CLUI", "FadeInOut", 0); + cfg::dat.autosize = db_get_b(0, "CLUI", "AutoSize", 0); + cfg::dat.bNoOfflineAvatars = db_get_b(0, "CList", "NoOfflineAV", 1); + cfg::dat.bFullTransparent = db_get_b(0, "CLUI", "fulltransparent", 0); + cfg::dat.bDblClkAvatars = db_get_b(0, "CLC", "dblclkav", 0); + cfg::dat.bEqualSections = db_get_b(0, "CLUI", "EqualSections", 0); + cfg::dat.bCenterStatusIcons = db_get_b(0, "CLC", "si_centered", 1); cfg::dat.boldHideOffline = -1; cfg::dat.bSecIMAvail = ServiceExists("SecureIM/IsContactSecured") ? 1 : 0; - cfg::dat.bNoTrayTips = db_get_b(NULL, "CList", "NoTrayTips", 0); - cfg::dat.bShowLocalTime = db_get_b(NULL, "CLC", "ShowLocalTime", 1); - cfg::dat.bShowLocalTimeSelective = db_get_b(NULL, "CLC", "SelectiveLocalTime", 1); - cfg::dat.bDontSeparateOffline = db_get_b(NULL, "CList", "DontSeparateOffline", 0); - cfg::dat.bShowXStatusOnSbar = db_get_b(NULL, "CLUI", "xstatus_sbar", 0); - cfg::dat.bLayeredHack = db_get_b(NULL, "CLUI", "layeredhack", 1); - cfg::dat.bFirstRun = db_get_b(NULL, "CLUI", "firstrun", 1); + cfg::dat.bNoTrayTips = db_get_b(0, "CList", "NoTrayTips", 0); + cfg::dat.bShowLocalTime = db_get_b(0, "CLC", "ShowLocalTime", 1); + cfg::dat.bShowLocalTimeSelective = db_get_b(0, "CLC", "SelectiveLocalTime", 1); + cfg::dat.bDontSeparateOffline = db_get_b(0, "CList", "DontSeparateOffline", 0); + cfg::dat.bShowXStatusOnSbar = db_get_b(0, "CLUI", "xstatus_sbar", 0); + cfg::dat.bLayeredHack = db_get_b(0, "CLUI", "layeredhack", 1); + cfg::dat.bFirstRun = db_get_b(0, "CLUI", "firstrun", 1); cfg::dat.langPackCP = Langpack_GetDefaultCodePage(); - cfg::dat.realTimeSaving = db_get_b(NULL, "CLUI", "save_pos_always", 0); + cfg::dat.realTimeSaving = db_get_b(0, "CLUI", "save_pos_always", 0); - DWORD sortOrder = db_get_dw(NULL, "CList", "SortOrder", SORTBY_NAME); + DWORD sortOrder = db_get_dw(0, "CList", "SortOrder", SORTBY_NAME); cfg::dat.sortOrder[0] = LOBYTE(LOWORD(sortOrder)); cfg::dat.sortOrder[1] = HIBYTE(LOWORD(sortOrder)); cfg::dat.sortOrder[2] = LOBYTE(HIWORD(sortOrder)); if (cfg::dat.bFirstRun) - db_set_b(NULL, "CLUI", "firstrun", 0); + db_set_b(0, "CLUI", "firstrun", 0); ReloadThemedOptions(); Reload3dBevelColors(); - cfg::dat.dwFlags = db_get_dw(NULL, "CLUI", "Frameflags", CLUI_FRAME_STATUSICONS | CLUI_FRAME_SHOWBOTTOMBUTTONS | CLUI_FRAME_BUTTONSFLAT | CLUI_FRAME_CLISTSUNKEN); - cfg::dat.dwFlags |= (db_get_b(NULL, "CLUI", "ShowSBar", 1) ? CLUI_FRAME_SBARSHOW : 0); - cfg::dat.soundsOff = db_get_b(NULL, "Skin", "UseSound", 1) ? 0 : 1; + cfg::dat.dwFlags = db_get_dw(0, "CLUI", "Frameflags", CLUI_FRAME_STATUSICONS | CLUI_FRAME_SHOWBOTTOMBUTTONS | CLUI_FRAME_BUTTONSFLAT | CLUI_FRAME_CLISTSUNKEN); + cfg::dat.dwFlags |= (db_get_b(0, "CLUI", "ShowSBar", 1) ? CLUI_FRAME_SBARSHOW : 0); + cfg::dat.soundsOff = db_get_b(0, "Skin", "UseSound", 1) ? 0 : 1; Profile_GetPathW(MAX_PATH, cfg::dat.tszProfilePath); wcslwr(cfg::dat.tszProfilePath); diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp index 007fdb34e5..b1352384c7 100644 --- a/plugins/Clist_nicer/src/statusbar.cpp +++ b/plugins/Clist_nicer/src/statusbar.cpp @@ -87,7 +87,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM HDC hdc = BeginPaint(hwnd, &ps); HDC hdcMem = CreateCompatibleDC(hdc); RECT rcClient, rcWindow; - BYTE windowStyle = db_get_b(NULL, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT); + BYTE windowStyle = db_get_b(0, "CLUI", "WindowStyle", SETTING_WINDOWSTYLE_DEFAULT); LONG b_offset = cfg::dat.bClipBorder + (windowStyle == SETTING_WINDOWSTYLE_NOBORDER ? 2 : (windowStyle == SETTING_WINDOWSTYLE_THINBORDER ? 1 : 0)); GetClientRect(hwnd, &rcClient); @@ -154,7 +154,7 @@ LRESULT CALLBACK NewStatusBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM if (NotifyEventHooks(hStatusBarShowToolTipEvent, (WPARAM)PD->RealName, 0) > 0) // a plugin handled this event tooltip_active = TRUE; - else if (db_get_dw(NULL, "mToolTip", "ShowStatusTip", 0)) { + else if (db_get_dw(0, "mToolTip", "ShowStatusTip", 0)) { PROTOACCOUNT *pa = Proto_GetAccount(PD->RealName); if (pa == nullptr) break; diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 2951f8d44f..9a36ba6b49 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -293,19 +293,19 @@ void SaveViewMode(const char *name, const wchar_t *szGroupFilter, const char *sz char szSetting[512]; mir_snprintf(szSetting, "%c%s_PF", 246, name); - db_set_s(NULL, CLVM_MODULE, szSetting, szProtoFilter); + db_set_s(0, CLVM_MODULE, szSetting, szProtoFilter); mir_snprintf(szSetting, "%c%s_GF", 246, name); - db_set_ws(NULL, CLVM_MODULE, szSetting, szGroupFilter); + db_set_ws(0, CLVM_MODULE, szSetting, szGroupFilter); mir_snprintf(szSetting, "%c%s_SM", 246, name); - db_set_dw(NULL, CLVM_MODULE, szSetting, statusMask); + db_set_dw(0, CLVM_MODULE, szSetting, statusMask); mir_snprintf(szSetting, "%c%s_SSM", 246, name); - db_set_dw(NULL, CLVM_MODULE, szSetting, stickyStatusMask); + db_set_dw(0, CLVM_MODULE, szSetting, stickyStatusMask); mir_snprintf(szSetting, "%c%s_OPT", 246, name); - db_set_dw(NULL, CLVM_MODULE, szSetting, options); + db_set_dw(0, CLVM_MODULE, szSetting, options); mir_snprintf(szSetting, "%c%s_LM", 246, name); - db_set_dw(NULL, CLVM_MODULE, szSetting, lmdat); + db_set_dw(0, CLVM_MODULE, szSetting, lmdat); - db_set_dw(NULL, CLVM_MODULE, name, MAKELONG((unsigned short)operators, (unsigned short)stickies)); + db_set_dw(0, CLVM_MODULE, name, MAKELONG((unsigned short)operators, (unsigned short)stickies)); } // saves the state of the filter definitions for the current item @@ -430,7 +430,7 @@ void UpdateFilters() } mir_snprintf(szSetting, "%c%s_PF", 246, szBuf); - if (db_get_s(NULL, CLVM_MODULE, szSetting, &dbv_pf)) + if (db_get_s(0, CLVM_MODULE, szSetting, &dbv_pf)) goto cleanup; mir_snprintf(szSetting, "%c%s_GF", 246, szBuf); @@ -438,17 +438,17 @@ void UpdateFilters() goto cleanup; mir_snprintf(szSetting, "%c%s_OPT", 246, szBuf); - if ((opt = db_get_dw(NULL, CLVM_MODULE, szSetting, -1)) != -1) { + if ((opt = db_get_dw(0, CLVM_MODULE, szSetting, -1)) != -1) { SendDlgItemMessage(sttClvmHwnd, IDC_AUTOCLEARSPIN, UDM_SETPOS, 0, MAKELONG(LOWORD(opt), 0)); } mir_snprintf(szSetting, "%c%s_SM", 246, szBuf); - statusMask = db_get_dw(NULL, CLVM_MODULE, szSetting, -1); + statusMask = db_get_dw(0, CLVM_MODULE, szSetting, -1); mir_snprintf(szSetting, "%c%s_SSM", 246, szBuf); - sttStickyStatusMask = db_get_dw(NULL, CLVM_MODULE, szSetting, -1); + sttStickyStatusMask = db_get_dw(0, CLVM_MODULE, szSetting, -1); - dwFlags = db_get_dw(NULL, CLVM_MODULE, szBuf, 0); + dwFlags = db_get_dw(0, CLVM_MODULE, szBuf, 0); { char szMask[256]; HWND hwndList = GetDlgItem(sttClvmHwnd, IDC_PROTOCOLS); @@ -520,7 +520,7 @@ void UpdateFilters() Utils::enableDlgControl(sttClvmHwnd, IDC_LASTMESSAGEUNIT, useLastMsg); mir_snprintf(szSetting, "%c%s_LM", 246, szBuf); - lmdat = db_get_dw(NULL, CLVM_MODULE, szSetting, 0); + lmdat = db_get_dw(0, CLVM_MODULE, szSetting, 0); SetDlgItemInt(sttClvmHwnd, IDC_LASTMSGVALUE, LOWORD(lmdat), FALSE); bTmp = LOBYTE(HIWORD(lmdat)); @@ -672,7 +672,7 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP szBuf[255] = 0; if (mir_strlen(szBuf) > 2) { - if (db_get_dw(NULL, CLVM_MODULE, szBuf, -1) != -1) + if (db_get_dw(0, CLVM_MODULE, szBuf, -1) != -1) MessageBox(nullptr, TranslateT("A view mode with this name does already exist"), TranslateT("Duplicate name"), MB_OK); else { int iNewItem = SendDlgItemMessageA(hwndDlg, IDC_VIEWMODES, LB_INSERTSTRING, -1, (LPARAM)szBuf); @@ -864,7 +864,7 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_USER + 100: { - bool bSkinned = db_get_b(NULL, "CLCExt", "bskinned", 0) != 0; + bool bSkinned = db_get_b(0, "CLCExt", "bskinned", 0) != 0; for (auto &it : _buttons) { HWND hwndButton = GetDlgItem(hwnd, it.btn_id); SendMessage(hwndButton, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(it.icon)); @@ -967,7 +967,7 @@ clvm_reset_command: SetButtonStates(); cfg::dat.current_viewmode[0] = 0; cfg::dat.old_viewmode[0] = 0; - db_set_s(NULL, "CList", "LastViewMode", ""); + db_set_s(0, "CList", "LastViewMode", ""); break; case IDC_CONFIGUREMODES: @@ -1039,23 +1039,23 @@ void ApplyViewMode(const char *name) } mir_snprintf(szSetting, "%c%s_SM", 246, name); - cfg::dat.statusMaskFilter = db_get_dw(NULL, CLVM_MODULE, szSetting, -1); + cfg::dat.statusMaskFilter = db_get_dw(0, CLVM_MODULE, szSetting, -1); if (cfg::dat.statusMaskFilter >= 1) cfg::dat.bFilterEffective |= CLVM_FILTER_STATUS; mir_snprintf(szSetting, "%c%s_SSM", 246, name); - cfg::dat.stickyMaskFilter = db_get_dw(NULL, CLVM_MODULE, szSetting, -1); + cfg::dat.stickyMaskFilter = db_get_dw(0, CLVM_MODULE, szSetting, -1); if (cfg::dat.stickyMaskFilter != -1) cfg::dat.bFilterEffective |= CLVM_FILTER_STICKYSTATUS; - cfg::dat.filterFlags = db_get_dw(NULL, CLVM_MODULE, name, 0); + cfg::dat.filterFlags = db_get_dw(0, CLVM_MODULE, name, 0); KillTimer(g_hwndViewModeFrame, TIMERID_VIEWMODEEXPIRE); if (cfg::dat.filterFlags & CLVM_AUTOCLEAR) { DWORD timerexpire; mir_snprintf(szSetting, "%c%s_OPT", 246, name); - timerexpire = LOWORD(db_get_dw(NULL, CLVM_MODULE, szSetting, 0)); + timerexpire = LOWORD(db_get_dw(0, CLVM_MODULE, szSetting, 0)); strncpy(cfg::dat.old_viewmode, cfg::dat.current_viewmode, 256); cfg::dat.old_viewmode[255] = 0; SetTimer(g_hwndViewModeFrame, TIMERID_VIEWMODEEXPIRE, timerexpire * 1000, nullptr); @@ -1073,7 +1073,7 @@ void ApplyViewMode(const char *name) cfg::dat.bFilterEffective |= CLVM_FILTER_LASTMSG; mir_snprintf(szSetting, "%c%s_LM", 246, name); - cfg::dat.lastMsgFilter = db_get_dw(NULL, CLVM_MODULE, szSetting, 0); + cfg::dat.lastMsgFilter = db_get_dw(0, CLVM_MODULE, szSetting, 0); if (LOBYTE(HIWORD(cfg::dat.lastMsgFilter))) cfg::dat.bFilterEffective |= CLVM_FILTER_LASTMSG_NEWERTHAN; else @@ -1099,7 +1099,7 @@ void ApplyViewMode(const char *name) cfg::dat.bFilterEffective |= CLVM_STICKY_CONTACTS; if (cfg::dat.boldHideOffline == (BYTE)-1) - cfg::dat.boldHideOffline = db_get_b(NULL, "CList", "HideOffline", 0); + cfg::dat.boldHideOffline = db_get_b(0, "CList", "HideOffline", 0); g_clistApi.pfnSetHideOffline(false); if (name == nullptr) { @@ -1112,5 +1112,5 @@ void ApplyViewMode(const char *name) Clist_Broadcast(CLM_AUTOREBUILD, 0, 0); SetButtonStates(); - db_set_s(NULL, "CList", "LastViewMode", cfg::dat.current_viewmode); + db_set_s(0, "CList", "LastViewMode", cfg::dat.current_viewmode); } diff --git a/plugins/Cln_skinedit/src/main.cpp b/plugins/Cln_skinedit/src/main.cpp index 8c95c929ff..1637cf86ed 100644 --- a/plugins/Cln_skinedit/src/main.cpp +++ b/plugins/Cln_skinedit/src/main.cpp @@ -688,8 +688,8 @@ static INT_PTR CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa SendDlgItemMessage(hwndDlg, IDC_BORDERTYPE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Bumped")); SendDlgItemMessage(hwndDlg, IDC_BORDERTYPE, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Etched")); - SendDlgItemMessage(hwndDlg, IDC_3DDARKCOLOR, CPM_SETCOLOUR, 0, db_get_dw(NULL, "CLCExt", "3ddark", RGB(224, 224, 224))); - SendDlgItemMessage(hwndDlg, IDC_3DLIGHTCOLOR, CPM_SETCOLOUR, 0, db_get_dw(NULL, "CLCExt", "3dbright", RGB(224, 224, 224))); + SendDlgItemMessage(hwndDlg, IDC_3DDARKCOLOR, CPM_SETCOLOUR, 0, db_get_dw(0, "CLCExt", "3ddark", RGB(224, 224, 224))); + SendDlgItemMessage(hwndDlg, IDC_3DLIGHTCOLOR, CPM_SETCOLOUR, 0, db_get_dw(0, "CLCExt", "3dbright", RGB(224, 224, 224))); return 0; case WM_DRAWITEM: @@ -829,8 +829,8 @@ static INT_PTR CALLBACK SkinEdit_ExtBkDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa // save struct to DB if (psd->pfnSaveCompleteStruct) psd->pfnSaveCompleteStruct(); - db_set_dw(NULL, "CLCExt", "3dbright", SendDlgItemMessage(hwndDlg, IDC_3DLIGHTCOLOR, CPM_GETCOLOUR, 0, 0)); - db_set_dw(NULL, "CLCExt", "3ddark", SendDlgItemMessage(hwndDlg, IDC_3DDARKCOLOR, CPM_GETCOLOUR, 0, 0)); + db_set_dw(0, "CLCExt", "3dbright", SendDlgItemMessage(hwndDlg, IDC_3DLIGHTCOLOR, CPM_GETCOLOUR, 0, 0)); + db_set_dw(0, "CLCExt", "3ddark", SendDlgItemMessage(hwndDlg, IDC_3DDARKCOLOR, CPM_GETCOLOUR, 0, 0)); if (psd->pfnClcOptionsChanged) psd->pfnClcOptionsChanged(); diff --git a/plugins/CloudFile/src/Services/dropbox_service.cpp b/plugins/CloudFile/src/Services/dropbox_service.cpp index 9634eba955..a2cfa5a2e5 100644 --- a/plugins/CloudFile/src/Services/dropbox_service.cpp +++ b/plugins/CloudFile/src/Services/dropbox_service.cpp @@ -103,7 +103,7 @@ void CDropboxService::RequestAccessTokenThread(void *param) } node = root.at("access_token"); - db_set_s(NULL, GetAccountName(), "TokenSecret", node.as_string().c_str()); + db_set_s(0, GetAccountName(), "TokenSecret", node.as_string().c_str()); SetDlgItemTextA(hwndDlg, IDC_OAUTH_CODE, ""); @@ -133,7 +133,7 @@ void CDropboxService::HandleJsonError(JSONNode &node) auto CDropboxService::UploadFile(const char *data, size_t size, const std::string &path) { ptrA token(getStringA("TokenSecret")); - BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE); + BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE); DropboxAPI::UploadFileRequest request(token, path.c_str(), data, size, (OnConflict)strategy); NLHR_PTR response(request.Send(m_hConnection)); @@ -162,7 +162,7 @@ void CDropboxService::UploadFileChunk(const std::string &sessionId, const char * auto CDropboxService::CommitUploadSession(const std::string &sessionId, const char *data, size_t size, size_t offset, const std::string &path) { ptrA token(getStringA("TokenSecret")); - BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE); + BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE); DropboxAPI::CommitUploadSessionRequest request(token, sessionId.c_str(), offset, path.c_str(), data, size, (OnConflict)strategy); NLHR_PTR response(request.Send(m_hConnection)); diff --git a/plugins/CloudFile/src/Services/google_service.cpp b/plugins/CloudFile/src/Services/google_service.cpp index 9679c17fc0..313aa5efa7 100644 --- a/plugins/CloudFile/src/Services/google_service.cpp +++ b/plugins/CloudFile/src/Services/google_service.cpp @@ -128,14 +128,14 @@ void CGDriveService::RequestAccessTokenThread(void *param) } node = root.at("access_token"); - db_set_s(NULL, GetAccountName(), "TokenSecret", node.as_string().c_str()); + db_set_s(0, GetAccountName(), "TokenSecret", node.as_string().c_str()); node = root.at("expires_in"); time_t expiresIn = time(0) + node.as_int(); - db_set_dw(NULL, GetAccountName(), "ExpiresIn", expiresIn); + db_set_dw(0, GetAccountName(), "ExpiresIn", expiresIn); node = root.at("refresh_token"); - db_set_s(NULL, GetAccountName(), "RefreshToken", node.as_string().c_str()); + db_set_s(0, GetAccountName(), "RefreshToken", node.as_string().c_str()); SetDlgItemTextA(hwndDlg, IDC_OAUTH_CODE, ""); diff --git a/plugins/CloudFile/src/Services/microsoft_service.cpp b/plugins/CloudFile/src/Services/microsoft_service.cpp index c435bc19b4..992312e2a8 100644 --- a/plugins/CloudFile/src/Services/microsoft_service.cpp +++ b/plugins/CloudFile/src/Services/microsoft_service.cpp @@ -65,7 +65,7 @@ void COneDriveService::Login(HWND owner) JSONNode root = GetJsonResponse(response); JSONNode node = root.at("access_token"); - db_set_s(NULL, GetAccountName(), "TokenSecret", node.as_string().c_str()); + db_set_s(0, GetAccountName(), "TokenSecret", node.as_string().c_str()); node = root.at("expires_in"); time_t expiresIn = time(0) + node.as_int(); @@ -154,7 +154,7 @@ void COneDriveService::HandleJsonError(JSONNode &node) auto COneDriveService::UploadFile(const std::string &parentId, const std::string &fileName, const char *data, size_t size) { ptrA token(getStringA("TokenSecret")); - BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE); + BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE); OneDriveAPI::UploadFileRequest *request = !parentId.empty() ? new OneDriveAPI::UploadFileRequest(token, parentId.c_str(), fileName.c_str(), data, size, (OnConflict)strategy) : new OneDriveAPI::UploadFileRequest(token, fileName.c_str(), data, size, (OnConflict)strategy); @@ -168,7 +168,7 @@ auto COneDriveService::UploadFile(const std::string &parentId, const std::string auto COneDriveService::CreateUploadSession(const std::string &parentId, const std::string &fileName) { ptrA token(getStringA("TokenSecret")); - BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE); + BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE); OneDriveAPI::CreateUploadSessionRequest *request = !parentId.empty() ? new OneDriveAPI::CreateUploadSessionRequest(token, parentId.c_str(), fileName.c_str(), (OnConflict)strategy) : new OneDriveAPI::CreateUploadSessionRequest(token, fileName.c_str(), (OnConflict)strategy); diff --git a/plugins/CloudFile/src/Services/yandex_service.cpp b/plugins/CloudFile/src/Services/yandex_service.cpp index ca8ba197d6..a1472ee197 100644 --- a/plugins/CloudFile/src/Services/yandex_service.cpp +++ b/plugins/CloudFile/src/Services/yandex_service.cpp @@ -167,7 +167,7 @@ void CYandexService::HandleJsonError(JSONNode &node) auto CYandexService::CreateUploadSession(const std::string &path) { ptrA token(getStringA("TokenSecret")); - BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE); + BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE); YandexAPI::GetUploadUrlRequest request(token, path.c_str(), (OnConflict)strategy); NLHR_PTR response(request.Send(m_hConnection)); diff --git a/plugins/CloudFile/src/menus.cpp b/plugins/CloudFile/src/menus.cpp index 7a5ddb084d..3ca1b085b9 100644 --- a/plugins/CloudFile/src/menus.cpp +++ b/plugins/CloudFile/src/menus.cpp @@ -15,7 +15,7 @@ void InitializeMenus() SET_UID(mi, 0x93d4495b, 0x259b, 0x4fba, 0xbc, 0x14, 0xf9, 0x46, 0x2c, 0xda, 0xfc, 0x6d); mi.name.a = LPGEN("Upload to..."); - ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService")); + ptrA defaultService(g_plugin.getStringA("DefaultService")); if (defaultService) { CCloudService *service = FindService(defaultService); if (service) { diff --git a/plugins/CloudFile/src/options.cpp b/plugins/CloudFile/src/options.cpp index c17ef8d9d2..0ac7c120a0 100644 --- a/plugins/CloudFile/src/options.cpp +++ b/plugins/CloudFile/src/options.cpp @@ -21,7 +21,7 @@ bool COptionsMainDlg::OnInitDialog() { CDlgBase::OnInitDialog(); - ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService")); + ptrA defaultService(g_plugin.getStringA("DefaultService")); int iItem = m_defaultService.AddString(TranslateT("None")); m_defaultService.SetCurSel(iItem); @@ -31,7 +31,7 @@ bool COptionsMainDlg::OnInitDialog() m_defaultService.SetCurSel(iItem); } - BYTE strategy = db_get_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE); + BYTE strategy = g_plugin.getByte("ConflictStrategy", OnConflict::REPLACE); switch (strategy) { case OnConflict::RENAME: @@ -58,16 +58,16 @@ bool COptionsMainDlg::OnApply() int iItem = m_defaultService.GetCurSel(); CCloudService *service = (CCloudService*)m_defaultService.GetItemData(iItem); if (service) - db_set_s(NULL, MODULENAME, "DefaultService", service->GetAccountName()); + g_plugin.setString("DefaultService", service->GetAccountName()); else - db_unset(NULL, MODULENAME, "DefaultService"); + g_plugin.delSetting("DefaultService"); if (m_renameOnConflict.GetState()) - db_set_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::RENAME); + g_plugin.setByte("ConflictStrategy", OnConflict::RENAME); else if (m_repalceOnConflict.GetState()) - db_set_b(NULL, MODULENAME, "ConflictStrategy", OnConflict::REPLACE); + g_plugin.setByte("ConflictStrategy", OnConflict::REPLACE); else - db_unset(NULL, MODULENAME, "ConflictStrategy"); + g_plugin.delSetting("ConflictStrategy"); return true; } diff --git a/plugins/CloudFile/src/services.cpp b/plugins/CloudFile/src/services.cpp index 9f1867cb6e..e0a01fbfba 100644 --- a/plugins/CloudFile/src/services.cpp +++ b/plugins/CloudFile/src/services.cpp @@ -24,7 +24,7 @@ static INT_PTR GetService(WPARAM wParam, LPARAM lParam) ptrA accountName(mir_strdup((char*)wParam)); if (!accountName || !mir_strlen(accountName)) - accountName = db_get_sa(NULL, MODULENAME, "DefaultService"); + accountName = g_plugin.getStringA("DefaultService"); if (accountName == nullptr) return 2; @@ -63,7 +63,7 @@ INT_PTR Upload(WPARAM wParam, LPARAM lParam) ptrA accountName(mir_strdup(uploadData->accountName)); if (!mir_strlen(accountName)) - accountName = db_get_sa(NULL, MODULENAME, "DefaultService"); + accountName = g_plugin.getStringA("DefaultService"); if (accountName == nullptr) return 2; diff --git a/plugins/CloudFile/src/srmm.cpp b/plugins/CloudFile/src/srmm.cpp index ae12de3bf1..b4d44c9fdd 100644 --- a/plugins/CloudFile/src/srmm.cpp +++ b/plugins/CloudFile/src/srmm.cpp @@ -42,7 +42,7 @@ int OnSrmmButtonPressed(WPARAM, LPARAM lParam) return 0; if (cbc->flags != BBCF_ARROWCLICKED) { - ptrA defaultService(db_get_sa(NULL, MODULENAME, "DefaultService")); + ptrA defaultService(g_plugin.getStringA("DefaultService")); if (defaultService) { CCloudService *service = FindService(defaultService); if (service) diff --git a/plugins/CloudFile/src/utils.cpp b/plugins/CloudFile/src/utils.cpp index 22611fe539..5d75225db8 100644 --- a/plugins/CloudFile/src/utils.cpp +++ b/plugins/CloudFile/src/utils.cpp @@ -5,7 +5,7 @@ void ShowNotification(const wchar_t *caption, const wchar_t *message, int flags, if (Miranda_IsTerminated()) return; - if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1)) { + if (ServiceExists(MS_POPUP_ADDPOPUPT) && db_get_b(0, "Popup", "ModuleIsEnabled", 1)) { POPUPDATAT ppd = { 0 }; ppd.lchContact = hContact; wcsncpy(ppd.lpwzContactName, caption, MAX_CONTACTNAME); @@ -102,12 +102,12 @@ void PasteToClipboard(const wchar_t *data) void Report(MCONTACT hContact, const wchar_t *data) { - if (db_get_b(NULL, MODULENAME, "UrlAutoSend", 1)) + if (g_plugin.getByte("UrlAutoSend", 1)) SendToContact(hContact, data); - if (db_get_b(NULL, MODULENAME, "UrlPasteToMessageInputArea", 0)) + if (g_plugin.getByte("UrlPasteToMessageInputArea", 0)) PasteToInputArea(hContact, data); - if (db_get_b(NULL, MODULENAME, "UrlCopyToClipboard", 0)) + if (g_plugin.getByte("UrlCopyToClipboard", 0)) PasteToClipboard(data); } diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index fad86f67d0..0ddb5c5f6b 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp @@ -432,26 +432,26 @@ void HandleSoundsCommand(PCommand command, TArgument *argv, int argc, PReply rep switch (argc) { case 2: - state = db_get_b(NULL, "Skin", "UseSound", 1); + state = db_get_b(0, "Skin", "UseSound", 1); Set2StateReply(reply, state, 0, LPGENW("Sounds are currently enabled."), L"", LPGENW("Sounds are currently disabled."), L""); break; case 3: switch (Get2StateValue(argv[2])) { case STATE_ON: - db_set_b(NULL, "Skin", "UseSound", 1); + db_set_b(0, "Skin", "UseSound", 1); state = TRUE; break; case STATE_OFF: - db_set_b(NULL, "Skin", "UseSound", 0); + db_set_b(0, "Skin", "UseSound", 0); state = FALSE; break; case STATE_TOGGLE: - state = db_get_b(NULL, "Skin", "UseSound", 1); + state = db_get_b(0, "Skin", "UseSound", 1); state = 1 - state; - db_set_b(NULL, "Skin", "UseSound", state); + db_set_b(0, "Skin", "UseSound", state); break; default: @@ -811,28 +811,28 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r switch (type) { case VALUE_STRING: - db_set_s(NULL, module, key, (char *)value); + db_set_s(0, module, key, (char *)value); wrote = Translate("string"); break; case VALUE_BYTE: - db_set_b(NULL, module, key, (*(char *)value)); + db_set_b(0, module, key, (*(char *)value)); wrote = Translate("byte"); break; case VALUE_WORD: - db_set_w(NULL, module, key, (*(WORD *)value)); + db_set_w(0, module, key, (*(WORD *)value)); wrote = Translate("word"); break; case VALUE_DWORD: - db_set_dw(NULL, module, key, (*(DWORD *)value)); + db_set_dw(0, module, key, (*(DWORD *)value)); wrote = Translate("dword"); break; case VALUE_WIDE: - db_set_ws(NULL, module, key, (WCHAR *)value); + db_set_ws(0, module, key, (WCHAR *)value); wrote = Translate("wide string"); break; @@ -944,7 +944,7 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe switch (argc) { case 4: { - int value = db_get_b(NULL, module, "NLUseProxy", 0); + int value = db_get_b(0, module, "NLUseProxy", 0); reply->code = MIMRES_SUCCESS; mir_snwprintf(buffer, L"%S proxy status is %s", protocol, (value) ? L"enabled" : L"disabled"); @@ -956,14 +956,14 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe int state = Get2StateValue(argv[4]); switch (state) { case STATE_OFF: - db_set_b(NULL, module, "NLUseProxy", 0); + db_set_b(0, module, "NLUseProxy", 0); reply->code = MIMRES_SUCCESS; mir_snwprintf(buffer, TranslateT("'%S' proxy was disabled."), protocol); break; case STATE_ON: - db_set_b(NULL, module, "NLUseProxy", 1); + db_set_b(0, module, "NLUseProxy", 1); reply->code = MIMRES_SUCCESS; mir_snwprintf(buffer, TranslateT("'%S' proxy was enabled."), protocol); @@ -971,9 +971,9 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe case STATE_TOGGLE: { - int value = db_get_b(NULL, module, "NLUseProxy", 0); + int value = db_get_b(0, module, "NLUseProxy", 0); value = 1 - value; - db_set_b(NULL, module, "NLUseProxy", value); + db_set_b(0, module, "NLUseProxy", value); reply->code = MIMRES_SUCCESS; mir_snwprintf(buffer, (value) ? TranslateT("'%S' proxy was enabled.") : TranslateT("'%S' proxy was disabled."), protocol); @@ -998,8 +998,8 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe { char host[256], type[256]; GetStringFromDatabase(NULL, module, "NLProxyServer", "", host, _countof(host)); - int port = db_get_w(NULL, module, "NLProxyPort", 0); - PrettyProxyType(db_get_b(NULL, module, "NLProxyType", 0), type, _countof(type)); + int port = db_get_w(0, module, "NLProxyPort", 0); + PrettyProxyType(db_get_b(0, module, "NLProxyType", 0), type, _countof(type)); reply->code = MIMRES_SUCCESS; mir_snwprintf(buffer, TranslateT("%S proxy server: %S %S:%d."), protocol, type, host, port); @@ -1014,9 +1014,9 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe long port = wcstol(argv[6], &stop, 10); if ((*stop == 0) && (type > 0)) { - db_set_s(NULL, module, "NLProxyServer", host); - db_set_w(NULL, module, "NLProxyPort", port); - db_set_b(NULL, module, "NLProxyType", type); + db_set_s(0, module, "NLProxyServer", host); + db_set_w(0, module, "NLProxyPort", port); + db_set_b(0, module, "NLProxyType", type); reply->code = MIMRES_SUCCESS; mir_snwprintf(buffer, TranslateT("%S proxy set to %s %S:%d."), protocol, argv[4], host, port); diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp index 7fe08815df..c4b742db8b 100644 --- a/plugins/CmdLine/src/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp @@ -135,12 +135,12 @@ int GetStringFromDatabase(MCONTACT hContact, char *szModule, char *szSettingName int GetStringFromDatabase(char *szSettingName, char *szError, char *szResult, size_t size) { - return GetStringFromDatabase(NULL, MODULENAME, szSettingName, szError, szResult, size); + return GetStringFromDatabase(0, MODULENAME, szSettingName, szError, szResult, size); } int GetStringFromDatabase(char *szSettingName, WCHAR *szError, WCHAR *szResult, size_t count) { - return GetStringFromDatabase(NULL, MODULENAME, szSettingName, szError, szResult, count); + return GetStringFromDatabase(0, MODULENAME, szSettingName, szError, szResult, count); } #pragma warning (disable: 4312) diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp index 107ff78e04..031a7b8c11 100644 --- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp +++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp @@ -91,22 +91,22 @@ void saveSettingsConnections(struct CONNECTION *connHead) while (tmp != nullptr) { mir_snprintf(buff, "%dFilterIntIp", i); - db_set_ws(NULL, PLUGINNAME, buff, tmp->strIntIp); + db_set_ws(0, PLUGINNAME, buff, tmp->strIntIp); mir_snprintf(buff, "%dFilterExtIp", i); - db_set_ws(NULL, PLUGINNAME, buff, tmp->strExtIp); + db_set_ws(0, PLUGINNAME, buff, tmp->strExtIp); mir_snprintf(buff, "%dFilterPName", i); - db_set_ws(NULL, PLUGINNAME, buff, tmp->PName); + db_set_ws(0, PLUGINNAME, buff, tmp->PName); mir_snprintf(buff, "%dFilterIntPort", i); - db_set_dw(NULL, PLUGINNAME, buff, tmp->intIntPort); + db_set_dw(0, PLUGINNAME, buff, tmp->intIntPort); mir_snprintf(buff, "%dFilterExtPort", i); - db_set_dw(NULL, PLUGINNAME, buff, tmp->intExtPort); + db_set_dw(0, PLUGINNAME, buff, tmp->intExtPort); mir_snprintf(buff, "%dFilterAction", i); - db_set_dw(NULL, PLUGINNAME, buff, tmp->Pid); + db_set_dw(0, PLUGINNAME, buff, tmp->Pid); i++; tmp = tmp->next; } settingFiltersCount = i; - db_set_dw(NULL, PLUGINNAME, "FiltersCount", settingFiltersCount); + db_set_dw(0, PLUGINNAME, "FiltersCount", settingFiltersCount); } @@ -149,16 +149,16 @@ struct CONNECTION* LoadSettingsConnections() //called to load settings from database void LoadSettings() { - settingInterval = (INT)db_get_dw(NULL, PLUGINNAME, "Interval", 500); - settingInterval1 = (INT)db_get_dw(NULL, PLUGINNAME, "PopupInterval", 0); - settingResolveIp = db_get_b(NULL, PLUGINNAME, "ResolveIp", TRUE); - settingDefaultAction = db_get_b(NULL, PLUGINNAME, "FilterDefaultAction", TRUE); - - settingSetColours = db_get_b(NULL, PLUGINNAME, "PopupSetColours", 0); - settingBgColor = (COLORREF)db_get_dw(NULL, PLUGINNAME, "PopupBgColor", (DWORD)0xFFFFFF); - settingFgColor = (COLORREF)db_get_dw(NULL, PLUGINNAME, "PopupFgColor", (DWORD)0x000000); - settingFiltersCount = (INT)db_get_dw(NULL, PLUGINNAME, "FiltersCount", 0); - settingStatusMask = (WORD)db_get_w(NULL, PLUGINNAME, "StatusMask", 16); + settingInterval = (INT)db_get_dw(0, PLUGINNAME, "Interval", 500); + settingInterval1 = (INT)db_get_dw(0, PLUGINNAME, "PopupInterval", 0); + settingResolveIp = db_get_b(0, PLUGINNAME, "ResolveIp", TRUE); + settingDefaultAction = db_get_b(0, PLUGINNAME, "FilterDefaultAction", TRUE); + + settingSetColours = db_get_b(0, PLUGINNAME, "PopupSetColours", 0); + settingBgColor = (COLORREF)db_get_dw(0, PLUGINNAME, "PopupBgColor", (DWORD)0xFFFFFF); + settingFgColor = (COLORREF)db_get_dw(0, PLUGINNAME, "PopupFgColor", (DWORD)0x000000); + settingFiltersCount = (INT)db_get_dw(0, PLUGINNAME, "FiltersCount", 0); + settingStatusMask = (WORD)db_get_w(0, PLUGINNAME, "StatusMask", 16); for (int i = 0; i < STATUS_COUNT; i++) { char buff[128]; mir_snprintf(buff, "Status%d", i); @@ -506,13 +506,13 @@ INT_PTR CALLBACK DlgProcConnectionNotifyOpts(HWND hwndDlg, UINT msg, WPARAM wPar return TRUE; case PSN_APPLY: - db_set_dw(NULL, PLUGINNAME, "Interval", settingInterval); - db_set_dw(NULL, PLUGINNAME, "PopupInterval", settingInterval1); - db_set_b(NULL, PLUGINNAME, "PopupSetColours", settingSetColours); - db_set_dw(NULL, PLUGINNAME, "PopupBgColor", (DWORD)settingBgColor); - db_set_dw(NULL, PLUGINNAME, "PopupFgColor", (DWORD)settingFgColor); - db_set_b(NULL, PLUGINNAME, "ResolveIp", settingResolveIp); - db_set_b(NULL, PLUGINNAME, "FilterDefaultAction", settingDefaultAction); + db_set_dw(0, PLUGINNAME, "Interval", settingInterval); + db_set_dw(0, PLUGINNAME, "PopupInterval", settingInterval1); + db_set_b(0, PLUGINNAME, "PopupSetColours", settingSetColours); + db_set_dw(0, PLUGINNAME, "PopupBgColor", (DWORD)settingBgColor); + db_set_dw(0, PLUGINNAME, "PopupFgColor", (DWORD)settingFgColor); + db_set_b(0, PLUGINNAME, "ResolveIp", settingResolveIp); + db_set_b(0, PLUGINNAME, "FilterDefaultAction", settingDefaultAction); for (int i = 0; i < STATUS_COUNT; i++) { char buff[128]; diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index d68d3f0522..f136dd419f 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -154,7 +154,7 @@ static void ShowConsole(int show) ScrollDown(pActive); } ShowWindow(hwndConsole, show ? SW_SHOW : SW_HIDE); - db_set_b(NULL, "Console", "Show", (BYTE)(show ? 1 : 0)); + db_set_b(0, "Console", "Show", (BYTE)(show ? 1 : 0)); if (hwnd) SetForegroundWindow(hwnd); @@ -955,14 +955,14 @@ static int OnFastDump(WPARAM wParam, LPARAM lParam) static void LoadSettings() { - gIcons = db_get_b(NULL, "Console", "ShowIcons", 1); - gSeparator = db_get_b(NULL, "Console", "Separator", 1); - gSingleMode = db_get_b(NULL, "Console", "SingleMode", 0); + gIcons = db_get_b(0, "Console", "ShowIcons", 1); + gSeparator = db_get_b(0, "Console", "Separator", 1); + gSingleMode = db_get_b(0, "Console", "SingleMode", 0); - gWrapLen = db_get_b(NULL, "Console", "Wrap", DEFAULT_WRAPLEN); + gWrapLen = db_get_b(0, "Console", "Wrap", DEFAULT_WRAPLEN); if (gWrapLen < MIN_WRAPLEN) gWrapLen = DEFAULT_WRAPLEN; - gLimit = db_get_dw(NULL, "Console", "Limit", MIN_LIMIT); + gLimit = db_get_dw(0, "Console", "Limit", MIN_LIMIT); if (gLimit > MAX_LIMIT) gLimit = MAX_LIMIT; if (gLimit < MIN_LIMIT) gLimit = MIN_LIMIT; } @@ -978,7 +978,7 @@ static void SaveSettings(HWND hwndDlg) gWrapLen = len; SetDlgItemInt(hwndDlg, IDC_WRAP, gWrapLen, FALSE); - db_set_b(NULL, "Console", "Wrap", (BYTE)len); + db_set_b(0, "Console", "Wrap", (BYTE)len); len = GetDlgItemInt(hwndDlg, IDC_LIMIT, nullptr, FALSE); if (len < MIN_LIMIT) @@ -988,13 +988,13 @@ static void SaveSettings(HWND hwndDlg) gLimit = len; SetDlgItemInt(hwndDlg, IDC_LIMIT, gLimit, FALSE); - db_set_dw(NULL, "Console", "Limit", len); + db_set_dw(0, "Console", "Limit", len); - db_set_b(NULL, "Console", "SingleMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SINGLE)); - db_set_b(NULL, "Console", "Separator", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SEPARATOR)); - db_set_b(NULL, "Console", "ShowIcons", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWICONS)); + db_set_b(0, "Console", "SingleMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SINGLE)); + db_set_b(0, "Console", "Separator", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SEPARATOR)); + db_set_b(0, "Console", "ShowIcons", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWICONS)); - db_set_b(NULL, "Console", "ShowAtStart", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_START)); + db_set_b(0, "Console", "ShowAtStart", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_START)); } @@ -1003,7 +1003,7 @@ static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_START, db_get_b(NULL, "Console", "ShowAtStart", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_START, db_get_b(0, "Console", "ShowAtStart", 0) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SINGLE, gSingleMode ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWICONS, gIcons ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SEPARATOR, gSeparator ? BST_CHECKED : BST_UNCHECKED); @@ -1150,7 +1150,7 @@ static int OnSystemModulesLoaded(WPARAM, LPARAM) OnFontChange(0, 0); OnColourChange(0, 0); - if (db_get_b(NULL, "Console", "ShowAtStart", 0) || db_get_b(NULL, "Console", "Show", 1)) + if (db_get_b(0, "Console", "ShowAtStart", 0) || db_get_b(0, "Console", "Show", 1)) ShowConsole(1); else ShowConsole(0); diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index a7955cb70b..71e44df0b2 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -200,7 +200,7 @@ static void SetAllContactChecks(HWND hwndList, MCONTACT hReceiver) // doubtful n if (szProto == nullptr) return; - if (db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_USEGROUPS_DEFAULT)) + if (db_get_b(0, "CList", "HideEmptyGroups", SETTING_USEGROUPS_DEFAULT)) SendMessage(hwndList, CLM_SETHIDEEMPTYGROUPS, TRUE, 0); else SendMessage(hwndList, CLM_SETHIDEEMPTYGROUPS, FALSE, 0); @@ -333,7 +333,7 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara if (!wndData->SendContacts(hwndDlg)) break; - SetTimer(hwndDlg, TIMERID_MSGSEND, db_get_dw(NULL, "SRMsg", "MessageTimeout", TIMEOUT_MSGSEND), nullptr); + SetTimer(hwndDlg, TIMERID_MSGSEND, db_get_dw(0, "SRMsg", "MessageTimeout", TIMEOUT_MSGSEND), nullptr); } break; diff --git a/plugins/CountryFlags/src/main.cpp b/plugins/CountryFlags/src/main.cpp index 3af8d023be..1585cd251b 100644 --- a/plugins/CountryFlags/src/main.cpp +++ b/plugins/CountryFlags/src/main.cpp @@ -51,10 +51,10 @@ int CMPlugin::Load() if (CallService(MS_UTILS_GETCOUNTRYLIST, (WPARAM)&nCountriesCount, (LPARAM)&countries)) nCountriesCount = 0; - bShowStatusIcon = db_get_b(NULL, MODULENAME, "ShowStatusIconFlag", SETTING_SHOWSTATUSICONFLAG_DEFAULT) != 0; - bShowExtraIcon = db_get_b(NULL, MODULENAME, "ShowExtraImgFlag", SETTING_SHOWEXTRAIMGFLAG_DEFAULT) != 0; - bUseUnknown = db_get_b(NULL, MODULENAME, "UseUnknownFlag", SETTING_USEUNKNOWNFLAG_DEFAULT) != 0; - bUseIpToCountry = db_get_b(NULL, MODULENAME, "UseIpToCountry", SETTING_USEIPTOCOUNTRY_DEFAULT) != 0; + bShowStatusIcon = g_plugin.getByte("ShowStatusIconFlag", SETTING_SHOWSTATUSICONFLAG_DEFAULT) != 0; + bShowExtraIcon = g_plugin.getByte("ShowExtraImgFlag", SETTING_SHOWEXTRAIMGFLAG_DEFAULT) != 0; + bUseUnknown = g_plugin.getByte("UseUnknownFlag", SETTING_USEUNKNOWNFLAG_DEFAULT) != 0; + bUseIpToCountry = g_plugin.getByte("UseIpToCountry", SETTING_USEIPTOCOUNTRY_DEFAULT) != 0; InitIcons(); InitIpToCountry(); diff --git a/plugins/CountryFlags/src/options.cpp b/plugins/CountryFlags/src/options.cpp index cde19a8664..29a2f9c4de 100644 --- a/plugins/CountryFlags/src/options.cpp +++ b/plugins/CountryFlags/src/options.cpp @@ -59,15 +59,15 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg, UINT msg, WPARAM, LPARA bool bChanged = false, bTemp; if ((bTemp = IsDlgButtonChecked(hwndDlg, IDC_CHECK_USEUNKNOWNFLAG) != 0) != bUseUnknown) - db_set_b(NULL, MODULENAME, "UseUnknownFlag", bUseUnknown = bTemp), bChanged = true; + g_plugin.setByte("UseUnknownFlag", bUseUnknown = bTemp), bChanged = true; if ((bTemp = IsDlgButtonChecked(hwndDlg, IDC_CHECK_USEIPTOCOUNTRY) != 0) != bUseIpToCountry) - db_set_b(NULL, MODULENAME, "UseIpToCountry", bUseIpToCountry = bTemp), bChanged = true; + g_plugin.setByte("UseIpToCountry", bUseIpToCountry = bTemp), bChanged = true; /* Status Icon */ if ((bTemp = IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOWSTATUSICONFLAG) != 0) != bShowStatusIcon) - db_set_b(NULL, MODULENAME, "ShowStatusIconFlag", bShowStatusIcon = bTemp), bChanged = true; + g_plugin.setByte("ShowStatusIconFlag", bShowStatusIcon = bTemp), bChanged = true; /* Extra Image */ if ((bTemp = IsDlgButtonChecked(hwndDlg, IDC_CHECK_SHOWEXTRAIMGFLAG) != 0) != bShowExtraIcon) - db_set_b(NULL, MODULENAME, "ShowExtraImgFlag", bShowExtraIcon = bTemp), bChanged = true; + g_plugin.setByte("ShowExtraImgFlag", bShowExtraIcon = bTemp), bChanged = true; if (bChanged) { UpdateExtraImages(); diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index 89d6229fa6..7f603b9a9e 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -154,7 +154,7 @@ INT_PTR OpenUrl(WPARAM wParam, LPARAM) INT_PTR CopyLinkToClipboard(WPARAM, LPARAM) { - ptrW tmp(db_get_wsa(NULL, MODULENAME, "Username")); + ptrW tmp(g_plugin.getWStringA("Username")); if (tmp != NULL) { wchar_t buffer[MAX_PATH]; mir_snwprintf(buffer, L"https://vi.miranda-ng.org/detail/%s", tmp); @@ -336,7 +336,7 @@ static int ModulesLoaded(WPARAM, LPARAM) if (servicemode) ViewVersionInfo(0, 0); - else if (db_get_b(NULL, MODULENAME, "UploadChanged", 0) && !ProcessVIHash(false)) + else if (g_plugin.getByte("UploadChanged", 0) && !ProcessVIHash(false)) UploadVersionInfo(0, 0xa1); return 0; @@ -355,9 +355,9 @@ int CMPlugin::Load() if (hMsftedit == nullptr) return 1; - clsdates = db_get_b(NULL, MODULENAME, "ClassicDates", 1) != 0; - dtsubfldr = db_get_b(NULL, MODULENAME, "SubFolders", 1) != 0; - catchcrashes = db_get_b(NULL, MODULENAME, "CatchCrashes", 1) != 0; + clsdates = g_plugin.getByte("ClassicDates", 1) != 0; + dtsubfldr = g_plugin.getByte("SubFolders", 1) != 0; + catchcrashes = g_plugin.getByte("CatchCrashes", 1) != 0; profname = Utils_ReplaceVarsW(L"%miranda_profilename%.dat"); profpath = Utils_ReplaceVarsW(L"%miranda_userdata%"); diff --git a/plugins/CrashDumper/src/dumper.cpp b/plugins/CrashDumper/src/dumper.cpp index 52d42d745e..ddf4fd2f56 100644 --- a/plugins/CrashDumper/src/dumper.cpp +++ b/plugins/CrashDumper/src/dumper.cpp @@ -604,6 +604,6 @@ void CreateCrashReport(HANDLE hDumpFile, PEXCEPTION_POINTERS exc_ptr, const wcha if (len > 8192) free(dst); - if (db_get_b(0, MODULENAME, "ShowCrashMessageBox", 1) && msg && IDYES == MessageBox(nullptr, msg, L"Miranda Crash Dumper", MB_YESNO | MB_ICONERROR | MB_TASKMODAL | MB_DEFBUTTON2 | MB_TOPMOST)) + if (g_plugin.getByte("ShowCrashMessageBox", 1) && msg && IDYES == MessageBox(nullptr, msg, L"Miranda Crash Dumper", MB_YESNO | MB_ICONERROR | MB_TASKMODAL | MB_DEFBUTTON2 | MB_TOPMOST)) StoreStringToClip(buffer); } diff --git a/plugins/CrashDumper/src/ui.cpp b/plugins/CrashDumper/src/ui.cpp index c9b642af73..c085d0efc1 100644 --- a/plugins/CrashDumper/src/ui.cpp +++ b/plugins/CrashDumper/src/ui.cpp @@ -187,15 +187,15 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP TranslateDialogDefault(hwndDlg); { DBVARIANT dbv; - if (db_get_s(NULL, MODULENAME, "Username", &dbv) == 0) { + if (g_plugin.getString("Username", &dbv) == 0) { SetDlgItemTextA(hwndDlg, IDC_USERNAME, dbv.pszVal); db_free(&dbv); } - if (db_get_s(NULL, MODULENAME, "Password", &dbv) == 0) { + if (g_plugin.getString("Password", &dbv) == 0) { SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal); db_free(&dbv); } - CheckDlgButton(hwndDlg, IDC_UPLOADCHN, db_get_b(NULL, MODULENAME, "UploadChanged", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_UPLOADCHN, g_plugin.getByte("UploadChanged", 0) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CLASSICDATES, clsdates ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DATESUBFOLDER, dtsubfldr ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CATCHCRASHES, catchcrashes ? BST_CHECKED : BST_UNCHECKED); @@ -230,28 +230,28 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (((LPNMHDR)lParam)->code == (unsigned)PSN_APPLY) { char szSetting[100]; GetDlgItemTextA(hwndDlg, IDC_USERNAME, szSetting, _countof(szSetting)); - db_set_s(NULL, MODULENAME, "Username", szSetting); + g_plugin.setString("Username", szSetting); GetDlgItemTextA(hwndDlg, IDC_PASSWORD, szSetting, _countof(szSetting)); - db_set_s(NULL, MODULENAME, "Password", szSetting); + g_plugin.setString("Password", szSetting); - db_set_b(NULL, MODULENAME, "UploadChanged", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPLOADCHN)); + g_plugin.setByte("UploadChanged", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPLOADCHN)); clsdates = IsDlgButtonChecked(hwndDlg, IDC_CLASSICDATES) == BST_CHECKED; if (clsdates) - db_set_b(NULL, MODULENAME, "ClassicDates", 1); + g_plugin.setByte("ClassicDates", 1); else - db_set_b(NULL, MODULENAME, "ClassicDates", 0); + g_plugin.setByte("ClassicDates", 0); dtsubfldr = IsDlgButtonChecked(hwndDlg, IDC_DATESUBFOLDER) == BST_CHECKED; if (dtsubfldr) - db_set_b(NULL, MODULENAME, "SubFolders", 1); + g_plugin.setByte("SubFolders", 1); else - db_set_b(NULL, MODULENAME, "SubFolders", 0); + g_plugin.setByte("SubFolders", 0); catchcrashes = IsDlgButtonChecked(hwndDlg, IDC_CATCHCRASHES) == BST_CHECKED; if (catchcrashes) - db_set_b(NULL, MODULENAME, "CatchCrashes", 1); + g_plugin.setByte("CatchCrashes", 1); else - db_set_b(NULL, MODULENAME, "CatchCrashes", 0); + g_plugin.setByte("CatchCrashes", 0); } break; } diff --git a/plugins/CrashDumper/src/upload.cpp b/plugins/CrashDumper/src/upload.cpp index adfe5b0aa0..746567bd28 100644 --- a/plugins/CrashDumper/src/upload.cpp +++ b/plugins/CrashDumper/src/upload.cpp @@ -39,14 +39,14 @@ void GetLoginStr(char* user, size_t szuser, char* pass) { DBVARIANT dbv; - if (db_get_s(NULL, MODULENAME, "Username", &dbv) == 0) { + if (g_plugin.getString("Username", &dbv) == 0) { strncpy_s(user, szuser, dbv.pszVal, _TRUNCATE); db_free(&dbv); } else user[0] = 0; - if (db_get_s(NULL, MODULENAME, "Password", &dbv) == 0) { + if (g_plugin.getString("Password", &dbv) == 0) { BYTE hash[16]; mir_md5_state_t context; @@ -129,7 +129,7 @@ bool InternetDownloadFile(const char *szUrl, VerTrnsfr* szReq) // if the recieved code is 200 OK switch (nlhrReply->resultCode) { case 200: - if (db_get_b(NULL, MODULENAME, "UploadChanged", 0)) + if (g_plugin.getByte("UploadChanged", 0)) ProcessVIHash(true); ShowMessage(1, TranslateT("Version Info upload successful.")); @@ -242,11 +242,11 @@ bool ProcessVIHash(bool store) arrayToHex(hash, sizeof(hash), hashstr); if (store) { - db_set_s(NULL, MODULENAME, "VIHash", hashstr); + g_plugin.setString("VIHash", hashstr); return true; } - ptrA VIHash(db_get_sa(NULL, MODULENAME, "VIHash")); + ptrA VIHash(g_plugin.getStringA("VIHash")); if (VIHash == NULL) return false; diff --git a/plugins/CrashDumper/src/utils.cpp b/plugins/CrashDumper/src/utils.cpp index 9d0bb2cbd4..c2908ff458 100644 --- a/plugins/CrashDumper/src/utils.cpp +++ b/plugins/CrashDumper/src/utils.cpp @@ -421,6 +421,6 @@ bool IsPluginEnabled(wchar_t* filename) char* fname; crsi_t2a(fname, filename); char* ext = strstr(_strlwr(fname), ".dll"); - bool res = ext && ext[4] == '\0' && db_get_b(NULL, "PluginDisable", fname, 0) == 0; + bool res = ext && ext[4] == '\0' && db_get_b(0, "PluginDisable", fname, 0) == 0; return res; } diff --git a/plugins/CurrencyRates/src/CommonOptionDlg.cpp b/plugins/CurrencyRates/src/CommonOptionDlg.cpp index 2878f2a91f..db0fa32b65 100644 --- a/plugins/CurrencyRates/src/CommonOptionDlg.cpp +++ b/plugins/CurrencyRates/src/CommonOptionDlg.cpp @@ -60,11 +60,11 @@ void CommonOptionDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp, CCommonDlgPr for (int i = 0; i < _countof(pszRefreshRateTypes); ++i) ::SendMessage(hwndCombo, CB_ADDSTRING, 0, reinterpret_cast(pszRefreshRateTypes[i])); - int nRefreshRateType = db_get_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateType, RRT_MINUTES); + int nRefreshRateType = db_get_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateType, RRT_MINUTES); if (nRefreshRateType < RRT_SECONDS || nRefreshRateType > RRT_HOURS) nRefreshRateType = RRT_MINUTES; - UINT nRate = db_get_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, 1); + UINT nRate = db_get_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, 1); switch (nRefreshRateType) { default: case RRT_SECONDS: @@ -201,17 +201,17 @@ void CommonOptionDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp, CCommonDlgPr assert(visitor.m_pszDbStatusMsgFormat); rData.m_bFireSetingsChangedEvent = true; - db_set_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateType, nType); - db_set_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, nRefreshRate); + db_set_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateType, nType); + db_set_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, nRefreshRate); tstring s = get_window_text(::GetDlgItem(hWnd, IDC_EDIT_CONTACT_LIST_FORMAT)); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbDisplayNameFormat, s.c_str()); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbDisplayNameFormat, s.c_str()); s = get_window_text(::GetDlgItem(hWnd, IDC_EDIT_STATUS_MESSAGE_FORMAT)); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbStatusMsgFormat, s.c_str()); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbStatusMsgFormat, s.c_str()); s = get_window_text(::GetDlgItem(hWnd, IDC_EDIT_TENDENCY_FORMAT)); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbTendencyFormat, s.c_str()); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbTendencyFormat, s.c_str()); CAdvProviderSettings* pAdvSet = get_adv_settings(rData.m_pCurrencyRatesProvider, false); if (pAdvSet) diff --git a/plugins/CurrencyRates/src/CurrencyConverter.cpp b/plugins/CurrencyRates/src/CurrencyConverter.cpp index d71655b014..b4ea9b18c1 100644 --- a/plugins/CurrencyRates/src/CurrencyConverter.cpp +++ b/plugins/CurrencyRates/src/CurrencyConverter.cpp @@ -201,8 +201,8 @@ INT_PTR CALLBACK CurrencyConverterDlgProc(HWND hDlg, UINT msg, WPARAM wp, LPARAM auto from = rSection.GetCurrencyRate(nFrom); auto to = rSection.GetCurrencyRate(nTo); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, DB_STR_CC_CURRENCYRATE_FROM_ID, from.GetID().c_str()); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, DB_STR_CC_CURRENCYRATE_TO_ID, to.GetID().c_str()); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, DB_STR_CC_CURRENCYRATE_FROM_ID, from.GetID().c_str()); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, DB_STR_CC_CURRENCYRATE_TO_ID, to.GetID().c_str()); const auto pProvider = get_currency_converter_provider(); assert(pProvider); diff --git a/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp b/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp index d05b977394..634e645b1d 100644 --- a/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp +++ b/plugins/CurrencyRates/src/CurrencyRatesProviderBase.cpp @@ -690,11 +690,11 @@ DWORD get_refresh_timeout_miliseconds(const CCurrencyRatesProviderVisitorDbSetti assert(visitor.m_pszDbRefreshRateType); assert(visitor.m_pszDbRefreshRateValue); - int nRefreshRateType = db_get_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateType, RRT_MINUTES); + int nRefreshRateType = db_get_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateType, RRT_MINUTES); if (nRefreshRateType < RRT_SECONDS || nRefreshRateType > RRT_HOURS) nRefreshRateType = RRT_MINUTES; - DWORD nTimeout = db_get_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, 1); + DWORD nTimeout = db_get_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbRefreshRateValue, 1); switch (nRefreshRateType) { default: case RRT_SECONDS: diff --git a/plugins/CurrencyRates/src/CurrencyRatesProviders.cpp b/plugins/CurrencyRates/src/CurrencyRatesProviders.cpp index a2906c619b..ea2861e378 100644 --- a/plugins/CurrencyRates/src/CurrencyRatesProviders.cpp +++ b/plugins/CurrencyRates/src/CurrencyRatesProviders.cpp @@ -47,7 +47,7 @@ void CCurrencyRatesProviders::InitProviders() CreateProviders(); const WORD nCurrentVersion = 17; - WORD nVersion = db_get_w(NULL, CURRENCYRATES_MODULE_NAME, LAST_RUN_VERSION, 1); + WORD nVersion = db_get_w(0, CURRENCYRATES_MODULE_NAME, LAST_RUN_VERSION, 1); for (auto &hContact : Contacts(CURRENCYRATES_MODULE_NAME)) { TCurrencyRatesProviderPtr pProvider = GetContactProviderPtr(hContact); @@ -58,7 +58,7 @@ void CCurrencyRatesProviders::InitProviders() } } - db_set_w(NULL, CURRENCYRATES_MODULE_NAME, LAST_RUN_VERSION, nCurrentVersion); + db_set_w(0, CURRENCYRATES_MODULE_NAME, LAST_RUN_VERSION, nCurrentVersion); } CCurrencyRatesProviders::TCurrencyRatesProviderPtr CCurrencyRatesProviders::GetContactProviderPtr(MCONTACT hContact)const diff --git a/plugins/CurrencyRates/src/Forex.cpp b/plugins/CurrencyRates/src/Forex.cpp index 2715beaca0..5047bfa31d 100644 --- a/plugins/CurrencyRates/src/Forex.cpp +++ b/plugins/CurrencyRates/src/Forex.cpp @@ -45,7 +45,7 @@ INT_PTR CurrencyRatesMenu_RefreshAll(WPARAM, LPARAM) INT_PTR CurrencyRatesMenu_EnableDisable(WPARAM, LPARAM) { g_bAutoUpdate = (g_bAutoUpdate) ? false : true; - db_set_b(NULL, CURRENCYRATES_MODULE_NAME, DB_STR_AUTO_UPDATE, g_bAutoUpdate); + db_set_b(0, CURRENCYRATES_MODULE_NAME, DB_STR_AUTO_UPDATE, g_bAutoUpdate); const CModuleInfo::TCurrencyRatesProvidersPtr& pProviders = CModuleInfo::GetCurrencyRateProvidersPtr(); const CCurrencyRatesProviders::TCurrencyRatesProviders& rapProviders = pProviders->GetProviders(); @@ -194,7 +194,7 @@ int CurrencyRatesEventFunc_OnModulesLoaded(WPARAM, LPARAM) HookEvent(ME_TTB_MODULELOADED, CurrencyRates_OnToolbarLoaded); - g_bAutoUpdate = 1 == db_get_b(NULL, CURRENCYRATES_MODULE_NAME, DB_STR_AUTO_UPDATE, 1); + g_bAutoUpdate = 1 == db_get_b(0, CURRENCYRATES_MODULE_NAME, DB_STR_AUTO_UPDATE, 1); InitMenu(); diff --git a/plugins/CurrencyRates/src/Log.cpp b/plugins/CurrencyRates/src/Log.cpp index ebc5e76a43..c769f1a98d 100644 --- a/plugins/CurrencyRates/src/Log.cpp +++ b/plugins/CurrencyRates/src/Log.cpp @@ -14,7 +14,7 @@ namespace #ifdef _DEBUG return true; #else - return (1 == db_get_b(NULL, CURRENCYRATES_MODULE_NAME, DB_STR_ENABLE_LOG, false)); + return (1 == db_get_b(0, CURRENCYRATES_MODULE_NAME, DB_STR_ENABLE_LOG, false)); #endif } diff --git a/plugins/CurrencyRates/src/SettingsDlg.cpp b/plugins/CurrencyRates/src/SettingsDlg.cpp index e24b0e381c..99cb998adc 100644 --- a/plugins/CurrencyRates/src/SettingsDlg.cpp +++ b/plugins/CurrencyRates/src/SettingsDlg.cpp @@ -656,9 +656,9 @@ CAdvProviderSettings::CAdvProviderSettings(const ICurrencyRatesProvider* pCurren assert(visitor.m_pszDbLogFormat); assert(visitor.m_pszDbLogCondition); - m_wLogMode = db_get_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogMode, static_cast(lmDisabled)); + m_wLogMode = db_get_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogMode, static_cast(lmDisabled)); m_sFormatHistory = CurrencyRates_DBGetStringT(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbHistoryFormat, visitor.m_pszDefHistoryFormat); - m_bIsOnlyChangedHistory = 1 == db_get_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbHistoryCondition, 0); + m_bIsOnlyChangedHistory = 1 == db_get_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbHistoryCondition, 0); m_sLogFileName = CurrencyRates_DBGetStringT(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogFile); if (true == m_sLogFileName.empty()) { @@ -669,10 +669,10 @@ CAdvProviderSettings::CAdvProviderSettings(const ICurrencyRatesProvider* pCurren } m_sFormatLogFile = CurrencyRates_DBGetStringT(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogFormat, visitor.m_pszDefLogFileFormat); - m_bIsOnlyChangedLogFile = (1 == db_get_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogCondition, 0)); + m_bIsOnlyChangedLogFile = (1 == db_get_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogCondition, 0)); m_sPopupFormat = CurrencyRates_DBGetStringT(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupFormat, visitor.m_pszDefPopupFormat); - m_bShowPopupIfValueChanged = (1 == db_get_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupCondition, 0)); + m_bShowPopupIfValueChanged = (1 == db_get_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupCondition, 0)); } CAdvProviderSettings::~CAdvProviderSettings() @@ -703,22 +703,22 @@ void CAdvProviderSettings::SaveToDb()const assert(visitor.m_pszDbPopupDelayTimeout); assert(visitor.m_pszDbPopupHistoryFlag); - db_set_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogMode, m_wLogMode); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbHistoryFormat, m_sFormatHistory.c_str()); - db_set_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbHistoryCondition, m_bIsOnlyChangedHistory); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogFile, m_sLogFileName.c_str()); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogFormat, m_sFormatLogFile.c_str()); - db_set_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogCondition, m_bIsOnlyChangedLogFile); - db_set_ws(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupFormat, m_sPopupFormat.c_str()); - db_set_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupCondition, m_bShowPopupIfValueChanged); + db_set_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogMode, m_wLogMode); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbHistoryFormat, m_sFormatHistory.c_str()); + db_set_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbHistoryCondition, m_bIsOnlyChangedHistory); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogFile, m_sLogFileName.c_str()); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogFormat, m_sFormatLogFile.c_str()); + db_set_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbLogCondition, m_bIsOnlyChangedLogFile); + db_set_ws(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupFormat, m_sPopupFormat.c_str()); + db_set_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupCondition, m_bShowPopupIfValueChanged); if (nullptr != m_pPopupSettings) { - db_set_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupColourMode, static_cast(m_pPopupSettings->GetColourMode())); - db_set_dw(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupBkColour, m_pPopupSettings->GetColourBk()); - db_set_dw(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupTextColour, m_pPopupSettings->GetColourText()); - db_set_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayMode, static_cast(m_pPopupSettings->GetDelayMode())); - db_set_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayTimeout, m_pPopupSettings->GetDelayTimeout()); - db_set_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupHistoryFlag, m_pPopupSettings->GetHistoryFlag()); + db_set_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupColourMode, static_cast(m_pPopupSettings->GetColourMode())); + db_set_dw(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupBkColour, m_pPopupSettings->GetColourBk()); + db_set_dw(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupTextColour, m_pPopupSettings->GetColourText()); + db_set_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayMode, static_cast(m_pPopupSettings->GetDelayMode())); + db_set_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayTimeout, m_pPopupSettings->GetDelayTimeout()); + db_set_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupHistoryFlag, m_pPopupSettings->GetHistoryFlag()); } } @@ -829,19 +829,19 @@ CPopupSettings::CPopupSettings(const ICurrencyRatesProvider* pCurrencyRatesProvi assert(visitor.m_pszDbPopupDelayTimeout); assert(visitor.m_pszDbPopupHistoryFlag); - BYTE m = db_get_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupColourMode, static_cast(m_modeColour)); + BYTE m = db_get_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupColourMode, static_cast(m_modeColour)); if (m >= colourDefault && m <= colourUserDefined) m_modeColour = static_cast(m); - m_rgbBkg = db_get_dw(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupBkColour, m_rgbBkg); - m_rgbText = db_get_dw(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupTextColour, m_rgbText); + m_rgbBkg = db_get_dw(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupBkColour, m_rgbBkg); + m_rgbText = db_get_dw(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupTextColour, m_rgbText); - m = db_get_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayMode, static_cast(m_modeDelay)); + m = db_get_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayMode, static_cast(m_modeDelay)); if (m >= delayFromPopup && m <= delayPermanent) { m_modeDelay = static_cast(m); } - m_wDelay = db_get_w(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayTimeout, m_wDelay); - m_bUseHistory = (1 == db_get_b(NULL, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupHistoryFlag, m_bUseHistory)); + m_wDelay = db_get_w(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupDelayTimeout, m_wDelay); + m_bUseHistory = (1 == db_get_b(0, CURRENCYRATES_MODULE_NAME, visitor.m_pszDbPopupHistoryFlag, m_bUseHistory)); } /*static */ diff --git a/plugins/DbEditorPP/src/deletemodule.cpp b/plugins/DbEditorPP/src/deletemodule.cpp index dcc3e6463b..343aa625da 100644 --- a/plugins/DbEditorPP/src/deletemodule.cpp +++ b/plugins/DbEditorPP/src/deletemodule.cpp @@ -8,7 +8,7 @@ int deleteModule(MCONTACT hContact, const char *module, int confirm) if (!module || IsModuleEmpty(hContact, module)) return 0; - if (confirm && db_get_b(NULL, MODULENAME, "WarnOnDelete", 1)) { + if (confirm && g_plugin.getByte("WarnOnDelete", 1)) { wchar_t text[MSG_SIZE]; mir_snwprintf(text, TranslateT("Are you sure you want to delete module \"%s\"?"), _A2T(module)); if (dlg(text, MB_YESNO | MB_ICONEXCLAMATION) == IDNO) diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index 193ea74cc3..939a1b554d 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -127,14 +127,14 @@ static int ModulesLoaded(WPARAM, LPARAM) hkd.DefHotKey = HOTKEYCODE(HOTKEYF_SHIFT | HOTKEYF_EXT, 'D'); g_plugin.addHotkey(&hkd); - g_bUsePopups = db_get_b(NULL, MODULENAME, "UsePopUps", 0) != 0; + g_bUsePopups = g_plugin.getByte("UsePopUps", 0) != 0; // Load the name order for (int i = 0; i < NAMEORDERCOUNT; i++) nameOrder[i] = i; DBVARIANT dbv = { 0 }; - if (!db_get_s(NULL, "Contact", "NameOrder", &dbv, DBVT_BLOB)) { + if (!db_get_s(0, "Contact", "NameOrder", &dbv, DBVT_BLOB)) { memcpy(nameOrder, dbv.pbVal, dbv.cpbVal); db_free(&dbv); } @@ -517,7 +517,7 @@ void loadListSettings(HWND hwnd, ColumnsSettings *cs) int i = 0; while (cs[i].name) { sLC.pszText = TranslateW(cs[i].name); - sLC.cx = db_get_w(NULL, MODULENAME, cs[i].dbname, cs[i].defsize); + sLC.cx = g_plugin.getWord(cs[i].dbname, cs[i].defsize); ListView_InsertColumn(hwnd, cs[i].index, &sLC); i++; } @@ -532,7 +532,7 @@ void saveListSettings(HWND hwnd, ColumnsSettings *cs) while (cs[i].name) { if (ListView_GetColumn(hwnd, cs[i].index, &sLC)) { mir_snprintf(tmp, cs[i].dbname, i); - db_set_w(NULL, MODULENAME, tmp, (WORD)sLC.cx); + g_plugin.setWord(tmp, (WORD)sLC.cx); } i++; } diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp index 1698814b4d..fbef13920e 100644 --- a/plugins/DbEditorPP/src/main_window.cpp +++ b/plugins/DbEditorPP/src/main_window.cpp @@ -128,7 +128,7 @@ LRESULT CALLBACK ModuleTreeSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR } } else if ((mtis->type == CONTACT) && hContact) { - if (db_get_b(NULL, "CList", "ConfirmDelete", 1)) { + if (db_get_b(0, "CList", "ConfirmDelete", 1)) { wchar_t str[MSG_SIZE]; mir_snwprintf(str, TranslateT("Are you sure you want to delete contact \"%s\"?"), text); if (dlg(str, MB_YESNO | MB_ICONEXCLAMATION) == IDNO) @@ -213,7 +213,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) SetWindowText(hwnd, TranslateT("Database Editor++")); // setup the splitter - SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, (LONG_PTR)db_get_w(NULL, MODULENAME, "Splitter", 200)); + SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, (LONG_PTR)g_plugin.getWord("Splitter", 200)); SendMessage(hwnd, GC_SPLITTERMOVED, 0, 0); mir_subclassWindow(GetDlgItem(hwnd, IDC_SPLITTER), SplitterSubclassProc); @@ -233,29 +233,29 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) TranslateMenu(GetSubMenu(hMenu, i)); Utils_RestoreWindowPosition(hwnd, NULL, MODULENAME, "Main_"); - if (db_get_b(NULL, MODULENAME, "Maximized", 0)) + if (g_plugin.getByte("Maximized", 0)) ShowWindow(hwnd, SW_SHOWMAXIMIZED); - g_Inline = !db_get_b(NULL, MODULENAME, "DontAllowInLineEdit", 1); + g_Inline = !g_plugin.getByte("DontAllowInLineEdit", 1); CheckMenuItem(GetSubMenu(hMenu, 5), MENU_INLINE_EDIT, MF_BYCOMMAND | (g_Inline ? MF_CHECKED : MF_UNCHECKED)); g_Mode = MODE_ALL; CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_ALL, MF_BYCOMMAND | MF_CHECKED); - g_Hex = db_get_b(NULL, MODULENAME, "HexMode", 0); + g_Hex = g_plugin.getByte("HexMode", 0); CheckMenuItem(GetSubMenu(hMenu, 5), MENU_BYTE_HEX, MF_BYCOMMAND | ((g_Hex & HEX_BYTE) ? MF_CHECKED : MF_UNCHECKED)); CheckMenuItem(GetSubMenu(hMenu, 5), MENU_WORD_HEX, MF_BYCOMMAND | ((g_Hex & HEX_WORD) ? MF_CHECKED : MF_UNCHECKED)); CheckMenuItem(GetSubMenu(hMenu, 5), MENU_DWORD_HEX, MF_BYCOMMAND | ((g_Hex & HEX_DWORD) ? MF_CHECKED : MF_UNCHECKED)); - CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SAVE_POSITION, MF_BYCOMMAND | (db_get_b(NULL, MODULENAME, "RestoreOnOpen", 1) ? MF_CHECKED : MF_UNCHECKED)); + CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SAVE_POSITION, MF_BYCOMMAND | (g_plugin.getByte("RestoreOnOpen", 1) ? MF_CHECKED : MF_UNCHECKED)); - g_Order = db_get_b(NULL, MODULENAME, "SortMode", 1); + g_Order = g_plugin.getByte("SortMode", 1); CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SORT_ORDER, MF_BYCOMMAND | (g_Order ? MF_CHECKED : MF_UNCHECKED)); int restore; if (hRestore) restore = 3; - else if (db_get_b(NULL, MODULENAME, "RestoreOnOpen", 1)) + else if (g_plugin.getByte("RestoreOnOpen", 1)) restore = 2; else restore = 0; @@ -283,7 +283,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (splitterPos > rc2.right - rc2.left - 150) splitterPos = rc2.right - rc2.left - 150; SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, splitterPos); - db_set_w(NULL, MODULENAME, "Splitter", (WORD)splitterPos); + g_plugin.setWord("Splitter", (WORD)splitterPos); } PostMessage(hwnd, WM_SIZE, 0, 0); } @@ -304,7 +304,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case WM_DESTROY: // free our shit! - if (db_get_b(NULL, MODULENAME, "RestoreOnOpen", 1)) { + if (g_plugin.getByte("RestoreOnOpen", 1)) { HTREEITEM item; if (item = TreeView_GetSelection(hwnd2Tree)) { @@ -322,16 +322,16 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) type = mtis->type; } - db_set_dw(NULL, MODULENAME, "LastContact", hContact); + g_plugin.setDword("LastContact", hContact); if (type == CONTACT) - db_set_s(NULL, MODULENAME, "LastModule", ""); + g_plugin.setString("LastModule", ""); else - db_set_s(NULL, MODULENAME, "LastModule", _T2A(text)); + g_plugin.setString("LastModule", _T2A(text)); } else { - db_unset(NULL, MODULENAME, "LastContact"); - db_unset(NULL, MODULENAME, "LastModule"); + g_plugin.delSetting("LastContact"); + g_plugin.delSetting("LastModule"); } int pos = ListView_GetSelectionMark(hwnd2List); @@ -339,26 +339,26 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (pos != -1) { char data[FLD_SIZE]; ListView_GetItemTextA(hwnd2List, pos, 0, data, _countof(data)); - db_set_s(NULL, MODULENAME, "LastSetting", data); + g_plugin.setString("LastSetting", data); } else - db_unset(NULL, MODULENAME, "LastSetting"); + g_plugin.delSetting("LastSetting"); } } - db_set_b(NULL, MODULENAME, "HexMode", (byte)g_Hex); - db_set_b(NULL, MODULENAME, "SortMode", (byte)g_Order); - db_set_b(NULL, MODULENAME, "DontAllowInLineEdit", (byte)!g_Inline); + g_plugin.setByte("HexMode", (byte)g_Hex); + g_plugin.setByte("SortMode", (byte)g_Order); + g_plugin.setByte("DontAllowInLineEdit", (byte)!g_Inline); { WINDOWPLACEMENT wp; wp.length = sizeof(WINDOWPLACEMENT); GetWindowPlacement(hwnd, &wp); if (wp.flags == WPF_RESTORETOMAXIMIZED) { - db_set_b(NULL, MODULENAME, "Maximized", 1); + g_plugin.setByte("Maximized", 1); ShowWindow(hwnd, SW_SHOWNOACTIVATE); } - else db_set_b(NULL, MODULENAME, "Maximized", 0); + else g_plugin.setByte("Maximized", 0); Utils_SaveWindowPosition(hwnd, NULL, MODULENAME, "Main_"); ShowWindow(hwnd, SW_HIDE); @@ -491,9 +491,9 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case MENU_SAVE_POSITION: { - BOOL save = !db_get_b(NULL, MODULENAME, "RestoreOnOpen", 1); + BOOL save = !g_plugin.getByte("RestoreOnOpen", 1); CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SAVE_POSITION, MF_BYCOMMAND | (save ? MF_CHECKED : MF_UNCHECKED)); - db_set_b(NULL, MODULENAME, "RestoreOnOpen", (byte)save); + g_plugin.setByte("RestoreOnOpen", (byte)save); } break; case MENU_INLINE_EDIT: diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp index 3d3b15d5db..109dc77f0a 100644 --- a/plugins/DbEditorPP/src/moduletree.cpp +++ b/plugins/DbEditorPP/src/moduletree.cpp @@ -340,11 +340,11 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID param) break; case 2: // restore saved - if (GetValueA(NULL, MODULENAME, "LastModule", SelectedModule, _countof(SelectedModule))) { - hSelectedContact = db_get_dw(NULL, MODULENAME, "LastContact", INVALID_CONTACT_ID); + if (GetValueA(0, MODULENAME, "LastModule", SelectedModule, _countof(SelectedModule))) { + hSelectedContact = g_plugin.getDword("LastContact", INVALID_CONTACT_ID); if (hSelectedContact != INVALID_CONTACT_ID) Select = 1; - GetValueA(NULL, MODULENAME, "LastSetting", SelectedSetting, _countof(SelectedSetting)); + GetValueA(0, MODULENAME, "LastSetting", SelectedSetting, _countof(SelectedSetting)); } break; @@ -403,7 +403,7 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID param) insertItem(hContact, module->name, contact); } - if (db_get_b(NULL, MODULENAME, "ExpandSettingsOnOpen", 0)) + if (g_plugin.getByte("ExpandSettingsOnOpen", 0)) TreeView_Expand(hwnd2Tree, contact, TVE_EXPAND); if (Select && hSelectedContact == NULL) { @@ -711,7 +711,7 @@ void moduleListRightClick(HWND hwnd, WPARAM, LPARAM lParam) // hwnd here is to t break; case MENU_DELETE_CONTACT: - if (db_get_b(NULL, "CList", "ConfirmDelete", 1)) { + if (db_get_b(0, "CList", "ConfirmDelete", 1)) { wchar_t str[MSG_SIZE]; mir_snwprintf(str, TranslateT("Are you sure you want to delete contact \"%s\"?"), text); if (dlg(str, MB_YESNO | MB_ICONEXCLAMATION) == IDNO) diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp index bcc4ea98fb..870f1d2ea0 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -6,12 +6,12 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l switch (msg) { case WM_INITDIALOG: bInitDone = false; - CheckDlgButton(hwnd, IDC_EXPANDSETTINGS, db_get_b(NULL, MODULENAME, "ExpandSettingsOnOpen", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_RESTORESETTINGS, db_get_b(NULL, MODULENAME, "RestoreOnOpen", 1) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_WARNONDEL, db_get_b(NULL, MODULENAME, "WarnOnDelete", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd, IDC_EXPANDSETTINGS, g_plugin.getByte("ExpandSettingsOnOpen", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd, IDC_RESTORESETTINGS, g_plugin.getByte("RestoreOnOpen", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd, IDC_WARNONDEL, g_plugin.getByte("WarnOnDelete", 1) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwnd, IDC_POPUPS, g_bUsePopups ? BST_CHECKED : BST_UNCHECKED); - SetDlgItemInt(hwnd, IDC_POPUPTIMEOUT, db_get_w(NULL, MODULENAME, "PopupDelay", 4), 0); - SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_SETCOLOUR, 0, (LPARAM)db_get_dw(NULL, MODULENAME, "PopupColour", RGB(255, 0, 0))); + SetDlgItemInt(hwnd, IDC_POPUPTIMEOUT, g_plugin.getWord("PopupDelay", 4), 0); + SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_SETCOLOUR, 0, (LPARAM)g_plugin.getDword("PopupColour", RGB(255, 0, 0))); TranslateDialogDefault(hwnd); bInitDone = true; return TRUE; @@ -38,13 +38,13 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l case 0: switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: - db_set_b(NULL, MODULENAME, "ExpandSettingsOnOpen", (BYTE)IsDlgButtonChecked(hwnd, IDC_EXPANDSETTINGS)); - db_set_b(NULL, MODULENAME, "RestoreOnOpen", (BYTE)IsDlgButtonChecked(hwnd, IDC_RESTORESETTINGS)); - db_set_b(NULL, MODULENAME, "WarnOnDelete", (BYTE)IsDlgButtonChecked(hwnd, IDC_WARNONDEL)); + g_plugin.setByte("ExpandSettingsOnOpen", (BYTE)IsDlgButtonChecked(hwnd, IDC_EXPANDSETTINGS)); + g_plugin.setByte("RestoreOnOpen", (BYTE)IsDlgButtonChecked(hwnd, IDC_RESTORESETTINGS)); + g_plugin.setByte("WarnOnDelete", (BYTE)IsDlgButtonChecked(hwnd, IDC_WARNONDEL)); g_bUsePopups = IsDlgButtonChecked(hwnd, IDC_POPUPS) != 0; - db_set_b(NULL, MODULENAME, "UsePopUps", (BYTE)g_bUsePopups); - db_set_w(NULL, MODULENAME, "PopupDelay", (WORD)GetDlgItemInt(hwnd, IDC_POPUPTIMEOUT, nullptr, 0)); - db_set_dw(NULL, MODULENAME, "PopupColour", (DWORD)SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_GETCOLOUR, 0, 0)); + g_plugin.setByte("UsePopUps", (BYTE)g_bUsePopups); + g_plugin.setWord("PopupDelay", (WORD)GetDlgItemInt(hwnd, IDC_POPUPTIMEOUT, nullptr, 0)); + g_plugin.setDword("PopupColour", (DWORD)SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_GETCOLOUR, 0, 0)); return TRUE; } break; diff --git a/plugins/DbEditorPP/src/renamemodule.cpp b/plugins/DbEditorPP/src/renamemodule.cpp index 488f881460..cb0359d930 100644 --- a/plugins/DbEditorPP/src/renamemodule.cpp +++ b/plugins/DbEditorPP/src/renamemodule.cpp @@ -43,7 +43,7 @@ static INT_PTR CALLBACK AddModDlgProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARA GetDlgItemTextA(hwnd, IDC_MODNAME, modulename, _countof(modulename)); if (IsDlgButtonChecked(hwnd, CHK_ADD2ALL)) { // null contact - db_set_b(NULL, modulename, "(Default)", 0); + db_set_b(0, modulename, "(Default)", 0); for (auto &hContact : Contacts()) db_set_b(hContact, modulename, "(Default)", 0); } diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp index ccb766e9ae..c1804603f6 100644 --- a/plugins/DbEditorPP/src/settinglist.cpp +++ b/plugins/DbEditorPP/src/settinglist.cpp @@ -127,7 +127,7 @@ void DeleteSettingsFromList(MCONTACT hContact, const char *module, const char *s if (!count) return; - if (db_get_b(NULL, MODULENAME, "WarnOnDelete", 1)) { + if (g_plugin.getByte("WarnOnDelete", 1)) { wchar_t text[MSG_SIZE]; mir_snwprintf(text, TranslateT("Are you sure you want to delete setting(s): %d?"), count); if (dlg(text, MB_YESNO | MB_ICONEXCLAMATION) == IDNO) diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp index 787354cc95..d117298fc9 100644 --- a/plugins/DbEditorPP/src/watchedvars.cpp +++ b/plugins/DbEditorPP/src/watchedvars.cpp @@ -348,9 +348,9 @@ void openWatchedVarWindow() void popupWatchedVar(MCONTACT hContact, const char *module, const char *setting) { - COLORREF colorBack = db_get_dw(NULL, MODULENAME, "PopupColour", RGB(255, 0, 0)); - COLORREF colorText = db_get_dw(NULL, MODULENAME, "PopupTextColour", RGB(0, 0, 0)); - int timeout = db_get_b(NULL, MODULENAME, "PopupDelay", 3); + COLORREF colorBack = g_plugin.getDword("PopupColour", RGB(255, 0, 0)); + COLORREF colorText = g_plugin.getDword("PopupTextColour", RGB(0, 0, 0)); + int timeout = g_plugin.getByte("PopupDelay", 3); wchar_t name[NAME_SIZE], text[MAX_SECONDLINE], value[MAX_SECONDLINE]; GetContactName(hContact, nullptr, name, _countof(name)); diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp index ae17cb3e9f..8fd8a3e1c9 100644 --- a/plugins/Exchange/src/dlg_handlers.cpp +++ b/plugins/Exchange/src/dlg_handlers.cpp @@ -38,7 +38,7 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara DBVARIANT dbv = { 0 }; dbv.type = DBVT_ASCIIZ; - int bCheck = db_get_b(NULL, MODULENAME, "Check", 1); + int bCheck = g_plugin.getByte("Check", 1); wchar_t buffer[4096]; GetStringFromDatabase("Username", L"", buffer, _countof(buffer)); @@ -50,24 +50,24 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara GetStringFromDatabase("Server", L"", buffer, _countof(buffer)); SetDlgItemText(hWnd, IDC_SERVER_EDIT, buffer); - SetDlgItemInt(hWnd, IDC_PORT_EDIT, db_get_dw(NULL, MODULENAME, "Port", EXCHANGE_PORT), FALSE); + SetDlgItemInt(hWnd, IDC_PORT_EDIT, g_plugin.getDword("Port", EXCHANGE_PORT), FALSE); - SetDlgItemInt(hWnd, IDC_INTERVAL_EDIT, db_get_dw(NULL, MODULENAME, "Interval", DEFAULT_INTERVAL), FALSE); + SetDlgItemInt(hWnd, IDC_INTERVAL_EDIT, g_plugin.getDword("Interval", DEFAULT_INTERVAL), FALSE); - CheckDlgButton(hWnd, IDC_RECONNECT, (db_get_b(NULL, MODULENAME, "Reconnect", 0)) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_RECONNECT, (g_plugin.getByte("Reconnect", 0)) ? BST_CHECKED : BST_UNCHECKED); - SetDlgItemInt(hWnd, IDC_RECONNECT_INTERVAL, db_get_dw(NULL, MODULENAME, "ReconnectInterval", DEFAULT_RECONNECT_INTERVAL), FALSE); - CheckDlgButton(hWnd, IDC_USE_POPUPS, (BOOL)db_get_b(NULL, MODULENAME, "UsePopups", 0) ? BST_CHECKED : BST_UNCHECKED); + SetDlgItemInt(hWnd, IDC_RECONNECT_INTERVAL, g_plugin.getDword("ReconnectInterval", DEFAULT_RECONNECT_INTERVAL), FALSE); + CheckDlgButton(hWnd, IDC_USE_POPUPS, (BOOL)g_plugin.getByte("UsePopups", 0) ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hWnd, IDC_USE_POPUPS), ServiceExists(MS_POPUP_ADDPOPUPT)); //disable the popups checkbox if no popup module is present CheckDlgButton(hWnd, IDC_CHECK_EMAILS, (bCheck) ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hWnd, IDC_INTERVAL_EDIT), bCheck); - int portCheck = db_get_b(NULL, MODULENAME, "UsePortCheck", 1); + int portCheck = g_plugin.getByte("UsePortCheck", 1); CheckDlgButton(hWnd, IDC_USE_PORTCHECK, (portCheck) ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hWnd, IDC_PORT_EDIT), portCheck); - int retries = db_get_b(NULL, MODULENAME, "MaxRetries", MAX_EXCHANGE_CONNECT_RETRIES); + int retries = g_plugin.getByte("MaxRetries", MAX_EXCHANGE_CONNECT_RETRIES); SetDlgItemInt(hWnd, IDC_MAX_RETRIES, retries, FALSE); EnableWindow(GetDlgItem(hWnd, IDC_RECONNECT_INTERVAL), IsDlgButtonChecked(hWnd, IDC_RECONNECT)); @@ -108,30 +108,30 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara case 0: switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: - db_set_b(NULL, MODULENAME, "Check", IsDlgButtonChecked(hWnd, IDC_CHECK_EMAILS)); + g_plugin.setByte("Check", IsDlgButtonChecked(hWnd, IDC_CHECK_EMAILS)); wchar_t buffer[4096]; GetDlgItemText(hWnd, IDC_USER_EDIT, buffer, _countof(buffer)); - db_set_ws(NULL, MODULENAME, "Username", buffer); + g_plugin.setWString("Username", buffer); GetDlgItemText(hWnd, IDC_PASSWORD_EDIT, buffer, _countof(buffer)); - db_set_ws(NULL, MODULENAME, "Password", buffer); + g_plugin.setWString("Password", buffer); GetDlgItemText(hWnd, IDC_SERVER_EDIT, buffer, _countof(buffer)); - db_set_ws(NULL, MODULENAME, "Server", buffer); + g_plugin.setWString("Server", buffer); GetDlgItemText(hWnd, IDC_PORT_EDIT, buffer, _countof(buffer)); - db_set_dw(NULL, MODULENAME, "Port", GetDlgItemInt(hWnd, IDC_PORT_EDIT, nullptr, FALSE)); + g_plugin.setDword("Port", GetDlgItemInt(hWnd, IDC_PORT_EDIT, nullptr, FALSE)); - db_set_dw(NULL, MODULENAME, "Interval", GetDlgItemInt(hWnd, IDC_INTERVAL_EDIT, nullptr, FALSE)); - db_set_dw(NULL, MODULENAME, "ReconnectInterval", GetDlgItemInt(hWnd, IDC_RECONNECT_INTERVAL, nullptr, FALSE)); + g_plugin.setDword("Interval", GetDlgItemInt(hWnd, IDC_INTERVAL_EDIT, nullptr, FALSE)); + g_plugin.setDword("ReconnectInterval", GetDlgItemInt(hWnd, IDC_RECONNECT_INTERVAL, nullptr, FALSE)); - db_set_b(NULL, MODULENAME, "Reconnect", IsDlgButtonChecked(hWnd, IDC_RECONNECT)); + g_plugin.setByte("Reconnect", IsDlgButtonChecked(hWnd, IDC_RECONNECT)); - db_set_b(NULL, MODULENAME, "UsePopups", IsDlgButtonChecked(hWnd, IDC_USE_POPUPS)); - db_set_b(NULL, MODULENAME, "UsePortCheck", IsDlgButtonChecked(hWnd, IDC_USE_PORTCHECK)); + g_plugin.setByte("UsePopups", IsDlgButtonChecked(hWnd, IDC_USE_POPUPS)); + g_plugin.setByte("UsePortCheck", IsDlgButtonChecked(hWnd, IDC_USE_PORTCHECK)); - db_set_b(NULL, MODULENAME, "MaxRetries", GetDlgItemInt(hWnd, IDC_MAX_RETRIES, nullptr, FALSE)); + g_plugin.setByte("MaxRetries", GetDlgItemInt(hWnd, IDC_MAX_RETRIES, nullptr, FALSE)); exchangeServer.Reconnect(); //login info may be changed UpdateTimers(); //interval might get changed diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp index b15f7a8932..dbf2e30884 100644 --- a/plugins/Exchange/src/emails.cpp +++ b/plugins/Exchange/src/emails.cpp @@ -36,7 +36,7 @@ CExchangeServer::~CExchangeServer() int CExchangeServer::Connect(int bForceConnect) { - int maxRetries = db_get_b(NULL, MODULENAME, "MaxRetries", MAX_EXCHANGE_CONNECT_RETRIES); + int maxRetries = g_plugin.getByte("MaxRetries", MAX_EXCHANGE_CONNECT_RETRIES); if (bForceConnect) { bTryConnect = 1; cConnections = 0; @@ -67,7 +67,7 @@ int CExchangeServer::Connect(int bForceConnect) GetStringFromDatabase("Password", L"", password, _countof(password)); GetStringFromDatabase("Server", L"", server, _countof(server)); - int port = db_get_dw(NULL, MODULENAME, "Port", EXCHANGE_PORT); + int port = g_plugin.getDword("Port", EXCHANGE_PORT); if (mir_wstrlen(server) > 0) //only connect if there's a server to connect to return DoConnect(user, password, server, port); @@ -139,13 +139,13 @@ void InitSocketAddr(sockaddr_in *addrServer, char *szServer) else memcpy(&(addrServer->sin_addr), hp->h_addr, hp->h_length); - int port = db_get_dw(NULL, MODULENAME, "Port", EXCHANGE_PORT); + int port = g_plugin.getDword("Port", EXCHANGE_PORT); addrServer->sin_port = htons(port); } int CExchangeServer::IsServerAvailable() { - if (!db_get_b(NULL, MODULENAME, "UsePortCheck", 1)) + if (!g_plugin.getByte("UsePortCheck", 1)) return 1; SOCKET sServer = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); @@ -294,7 +294,7 @@ int CExchangeServer::Check(int bNoEmailsNotify) int ShowMessage(wchar_t *message, int cUnreadEmails) { - int usePopups = ServiceExists(MS_POPUP_ADDPOPUPT) ? db_get_b(NULL, MODULENAME, "UsePopups", 0) : 0; + int usePopups = ServiceExists(MS_POPUP_ADDPOPUPT) ? g_plugin.getByte("UsePopups", 0) : 0; if (usePopups) return ShowPopupMessage(TranslateT("Exchange email"), message, cUnreadEmails); diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index a7a9c2f4f4..42b3cedd1c 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -93,14 +93,14 @@ int UpdateTimers() { KillTimers(); int interval; - interval = db_get_dw(NULL, MODULENAME, "Interval", DEFAULT_INTERVAL); + interval = g_plugin.getDword("Interval", DEFAULT_INTERVAL); interval *= 1000; //go from miliseconds to seconds hCheckTimer = SetTimer(nullptr, 0, interval, (TIMERPROC) OnCheckTimer); - int bReconnect = db_get_b(NULL, MODULENAME, "Reconnect", 0); + int bReconnect = g_plugin.getByte("Reconnect", 0); if (bReconnect) //user wants to forcefully reconnect every x minutes { - interval = db_get_dw(NULL, MODULENAME, "ReconnectInterval", DEFAULT_RECONNECT_INTERVAL); + interval = g_plugin.getDword("ReconnectInterval", DEFAULT_RECONNECT_INTERVAL); interval *= 1000 * 60; //go from miliseconds to seconds to minutes hReconnectTimer = SetTimer(nullptr, 0, interval, (TIMERPROC) OnReconnectTimer); } @@ -132,7 +132,7 @@ VOID CALLBACK OnCheckTimer(HWND, UINT, UINT_PTR, DWORD) else{ exchangeServer.Connect(); }*/ - int bCheck = db_get_b(NULL, MODULENAME, "Check", 1); + int bCheck = g_plugin.getByte("Check", 1); if (bCheck) //only check if we were told to { diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp index 75b4ef4b93..d133aab166 100644 --- a/plugins/Exchange/src/utils.cpp +++ b/plugins/Exchange/src/utils.cpp @@ -113,7 +113,7 @@ int GetStringFromDatabase(char *szSettingName, wchar_t *szError, wchar_t *szResu DBVARIANT dbv = { 0 }; int res = 1; dbv.type = DBVT_ASCIIZ; - if (db_get_ws(NULL, MODULENAME, szSettingName, &dbv) == 0) { + if (g_plugin.getWString(szSettingName, &dbv) == 0) { res = 0; size_t tmp = mir_wstrlen(dbv.pwszVal); size_t len = (tmp < size - 1) ? tmp : size - 1; diff --git a/plugins/FTPFileYM/src/dbentry.cpp b/plugins/FTPFileYM/src/dbentry.cpp index f9c39ae5b4..beb4d59c88 100644 --- a/plugins/FTPFileYM/src/dbentry.cpp +++ b/plugins/FTPFileYM/src/dbentry.cpp @@ -48,7 +48,7 @@ DBEntry *DBEntry::getNext(DBEntry *entry) for (; entryID < count; entryID++) { int ftpNum = DB::getByteF(0, MODULE_FILES, "Ftp%d", entryID, -1); if (ftpNum != -1) { - ptrA Value(db_get_sa(NULL, MODULENAME, frmt.Format("Filename%d", entryID))); + ptrA Value(g_plugin.getStringA(frmt.Format("Filename%d", entryID))); if (Value) { strncpy_s(szValue, Value, _TRUNCATE); entry->m_fileID = entryID; @@ -90,7 +90,7 @@ DBEntry* DBEntry::get(int fileID) int ftpNum = DB::getByteF(0, MODULE_FILES, "Ftp%d", fileID, -1); if (ftpNum != -1) { - ptrA Value(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "Filename%d", fileID))); + ptrA Value(g_plugin.getStringA(CMStringA(FORMAT, "Filename%d", fileID))); if (Value) { strncpy_s(szValue, Value, _TRUNCATE); entry->m_fileID = fileID; diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 01dd4374a7..18230a7b24 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -101,7 +101,7 @@ void InitMenuItems() CMStringA frmt; for (int i = 0; i < ServerList::FTP_COUNT; i++) { - ptrA Name(db_get_sa(NULL, MODULENAME, frmt.Format("Name%d", i))); + ptrA Name(g_plugin.getStringA(frmt.Format("Name%d", i))); if (Name) mir_snwprintf(stzName, TranslateT("FTP Server %d"), i + 1); diff --git a/plugins/FTPFileYM/src/options.cpp b/plugins/FTPFileYM/src/options.cpp index cb32cc66c4..b71aaaa0a1 100644 --- a/plugins/FTPFileYM/src/options.cpp +++ b/plugins/FTPFileYM/src/options.cpp @@ -33,32 +33,32 @@ void Options::deinit() void Options::loadOptions() { - selected = db_get_b(0, MODULENAME, "Selected", 0); - defaultFTP = db_get_b(0, MODULENAME, "Default", 0); - bAutosend = db_get_b(0, MODULENAME, "Autosend", 0) ? true : false; - bCloseDlg = db_get_b(0, MODULENAME, "CloseDlg", 0) ? true : false; - bCopyLink = db_get_b(0, MODULENAME, "CopyLink", 1) ? true : false; - bUseSubmenu = db_get_b(0, MODULENAME, "UseSubmenu", 1) ? true : false; - bHideInactive = db_get_b(0, MODULENAME, "HideInactive", 1) ? true : false; - bAutoDelete = db_get_b(0, MODULENAME, "DeleteTimer", 0) ? true : false; - iDeleteTime = db_get_dw(0, MODULENAME, "AutoDeleteTime", 60); - timeRange = (ETimeRange)db_get_b(0, MODULENAME, "TimeRange", TR_MINUTES); - iCompressionLevel = db_get_b(0, MODULENAME, "CompressionLevel", 6); - bSetZipName = db_get_b(0, MODULENAME, "SetZipName", 0) ? true : false; + selected = g_plugin.getByte("Selected", 0); + defaultFTP = g_plugin.getByte("Default", 0); + bAutosend = g_plugin.getByte("Autosend", 0) ? true : false; + bCloseDlg = g_plugin.getByte("CloseDlg", 0) ? true : false; + bCopyLink = g_plugin.getByte("CopyLink", 1) ? true : false; + bUseSubmenu = g_plugin.getByte("UseSubmenu", 1) ? true : false; + bHideInactive = g_plugin.getByte("HideInactive", 1) ? true : false; + bAutoDelete = g_plugin.getByte("DeleteTimer", 0) ? true : false; + iDeleteTime = g_plugin.getDword("AutoDeleteTime", 60); + timeRange = (ETimeRange)g_plugin.getByte("TimeRange", TR_MINUTES); + iCompressionLevel = g_plugin.getByte("CompressionLevel", 6); + bSetZipName = g_plugin.getByte("SetZipName", 0) ? true : false; } void Options::saveOptions() const { - db_set_b(0, MODULENAME, "Autosend", bAutosend ? 1 : 0); - db_set_b(0, MODULENAME, "CopyLink", bCopyLink ? 1 : 0); - db_set_b(0, MODULENAME, "UseSubmenu", bUseSubmenu ? 1 : 0); - db_set_b(0, MODULENAME, "HideInactive", bHideInactive ? 1 : 0); - db_set_b(0, MODULENAME, "CloseDlg", bCloseDlg ? 1 : 0); - db_set_b(0, MODULENAME, "DeleteTimer", bAutoDelete ? 1 : 0); - db_set_dw(0, MODULENAME, "AutoDeleteTime", iDeleteTime); - db_set_b(0, MODULENAME, "TimeRange", (int)timeRange); - db_set_b(0, MODULENAME, "CompressionLevel", iCompressionLevel); - db_set_b(0, MODULENAME, "SetZipName", bSetZipName ? 1 : 0); + g_plugin.setByte("Autosend", bAutosend ? 1 : 0); + g_plugin.setByte("CopyLink", bCopyLink ? 1 : 0); + g_plugin.setByte("UseSubmenu", bUseSubmenu ? 1 : 0); + g_plugin.setByte("HideInactive", bHideInactive ? 1 : 0); + g_plugin.setByte("CloseDlg", bCloseDlg ? 1 : 0); + g_plugin.setByte("DeleteTimer", bAutoDelete ? 1 : 0); + g_plugin.setDword("AutoDeleteTime", iDeleteTime); + g_plugin.setByte("TimeRange", (int)timeRange); + g_plugin.setByte("CompressionLevel", iCompressionLevel); + g_plugin.setByte("SetZipName", bSetZipName ? 1 : 0); } void Options::enableItems(HWND hwndDlg, bool state) diff --git a/plugins/FTPFileYM/src/serverlist.cpp b/plugins/FTPFileYM/src/serverlist.cpp index b29c263aef..33cce223ec 100644 --- a/plugins/FTPFileYM/src/serverlist.cpp +++ b/plugins/FTPFileYM/src/serverlist.cpp @@ -57,31 +57,31 @@ void ServerList::saveToDb() const DB::setWordF(0, MODULENAME, "Port%d", opt.selected, ftp->m_iPort); DB::setByteF(0, MODULENAME, "Passive%d", opt.selected, ftp->m_bPassive); DB::setByteF(0, MODULENAME, "Enabled%d", opt.selected, ftp->m_bEnabled); - db_set_b(0, MODULENAME, "Selected", opt.selected); - db_set_b(0, MODULENAME, "Default", opt.defaultFTP); + g_plugin.setByte("Selected", opt.selected); + g_plugin.setByte("Default", opt.defaultFTP); } ServerList::FTP::FTP(int index) { - ptrA Name(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "Name%d", index))); + ptrA Name(g_plugin.getStringA(CMStringA(FORMAT, "Name%d", index))); if (Name) mir_snwprintf(m_stzName, TranslateT("FTP Server %d"), index + 1); - ptrA Pass(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "Password%d", index))); + ptrA Pass(g_plugin.getStringA(CMStringA(FORMAT, "Password%d", index))); if (Pass) strncpy_s(m_szPass, Pass, _TRUNCATE); - ptrA Server(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "Server%d", index))); + ptrA Server(g_plugin.getStringA(CMStringA(FORMAT, "Server%d", index))); if (Server) strncpy_s(m_szServer, Server, _TRUNCATE); - ptrA User(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "User%d", index))); + ptrA User(g_plugin.getStringA(CMStringA(FORMAT, "User%d", index))); if (User) strncpy_s(m_szUser, User, _TRUNCATE); - ptrA Url(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "Url%d", index))); + ptrA Url(g_plugin.getStringA(CMStringA(FORMAT, "Url%d", index))); if (Url) strncpy_s(m_szUrl, Url, _TRUNCATE); - ptrA Dir(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "Dir%d", index))); + ptrA Dir(g_plugin.getStringA(CMStringA(FORMAT, "Dir%d", index))); if (Dir) strncpy_s(m_szDir, Dir, _TRUNCATE); - ptrA Chmod(db_get_sa(NULL, MODULENAME, CMStringA(FORMAT, "Chmod%d", index))); + ptrA Chmod(g_plugin.getStringA(CMStringA(FORMAT, "Chmod%d", index))); if (Chmod) strncpy_s(m_szChmod, Chmod, _TRUNCATE); m_ftpProto = (FTP::EProtoType)DB::getWordF(0, MODULENAME, "FtpProto%d", index, FTP::FT_STANDARD); diff --git a/plugins/FTPFileYM/src/utils.cpp b/plugins/FTPFileYM/src/utils.cpp index e866115cd6..6b17c59f52 100644 --- a/plugins/FTPFileYM/src/utils.cpp +++ b/plugins/FTPFileYM/src/utils.cpp @@ -111,7 +111,7 @@ void Utils::curlSetOpt(CURL *hCurl, ServerList::FTP *ftp, char *url, struct curl if (ftp->m_bPassive) curl_easy_setopt(hCurl, CURLOPT_FTPPORT, 0); else { - ptrA localip(db_get_sa(NULL, MODULENAME, "LocalIP")); + ptrA localip(g_plugin.getStringA("LocalIP")); if (localip) curl_easy_setopt(hCurl, CURLOPT_FTPPORT, localip); else diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp index 15da617d05..2885c42007 100644 --- a/plugins/FavContacts/src/menu.cpp +++ b/plugins/FavContacts/src/menu.cpp @@ -498,7 +498,7 @@ int ShowMenu(bool centered) szMenu.cy = max(szMenu.cy, szColumn.cy); szColumn.cx = szColumn.cy = 0; - int maxWidth = GetSystemMetrics(SM_CXSCREEN) * db_get_b(NULL, "FavContacts", "MenuWidth", 66) / 100; + int maxWidth = GetSystemMetrics(SM_CXSCREEN) * db_get_b(0, "FavContacts", "MenuWidth", 66) / 100; if (szMenu.cx > maxWidth) { g_widthMultiplier = (float)maxWidth / szMenu.cx; szMenu.cx *= g_widthMultiplier; diff --git a/plugins/FavContacts/src/options.cpp b/plugins/FavContacts/src/options.cpp index 0a5fe13acb..1d341ddabe 100644 --- a/plugins/FavContacts/src/options.cpp +++ b/plugins/FavContacts/src/options.cpp @@ -22,36 +22,36 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void LoadOptions() { - g_Options.bSecondLine = db_get_b(NULL, "FavContacts", "SecondLine", 1); - g_Options.bAvatars = db_get_b(NULL, "FavContacts", "Avatars", 1); - g_Options.bAvatarBorder = db_get_b(NULL, "FavContacts", "AvatarBorder", 0); - g_Options.wAvatarRadius = db_get_w(NULL, "FavContacts", "AvatarRadius", 3); - g_Options.bNoTransparentBorder = db_get_b(NULL, "FavContacts", "NoTransparentBorder", - !db_get_b(NULL, "FavContacts", "AvatarBorderTransparent", 1)); - g_Options.bSysColors = db_get_b(NULL, "FavContacts", "SysColors", 0); - g_Options.bCenterHotkey = db_get_b(NULL, "FavContacts", "CenterHotkey", 1); - g_Options.bUseGroups = db_get_b(NULL, "FavContacts", "UseGroups", 0); - g_Options.bUseColumns = db_get_b(NULL, "FavContacts", "UseColumns", 1); - g_Options.bRightAvatars = db_get_b(NULL, "FavContacts", "RightAvatars", 0); - g_Options.bDimIdle = db_get_b(NULL, "FavContacts", "DimIdle", 1); - - g_Options.wMaxRecent = db_get_b(NULL, "FavContacts", "MaxRecent", 10); + g_Options.bSecondLine = db_get_b(0, "FavContacts", "SecondLine", 1); + g_Options.bAvatars = db_get_b(0, "FavContacts", "Avatars", 1); + g_Options.bAvatarBorder = db_get_b(0, "FavContacts", "AvatarBorder", 0); + g_Options.wAvatarRadius = db_get_w(0, "FavContacts", "AvatarRadius", 3); + g_Options.bNoTransparentBorder = db_get_b(0, "FavContacts", "NoTransparentBorder", + !db_get_b(0, "FavContacts", "AvatarBorderTransparent", 1)); + g_Options.bSysColors = db_get_b(0, "FavContacts", "SysColors", 0); + g_Options.bCenterHotkey = db_get_b(0, "FavContacts", "CenterHotkey", 1); + g_Options.bUseGroups = db_get_b(0, "FavContacts", "UseGroups", 0); + g_Options.bUseColumns = db_get_b(0, "FavContacts", "UseColumns", 1); + g_Options.bRightAvatars = db_get_b(0, "FavContacts", "RightAvatars", 0); + g_Options.bDimIdle = db_get_b(0, "FavContacts", "DimIdle", 1); + + g_Options.wMaxRecent = db_get_b(0, "FavContacts", "MaxRecent", 10); } static void sttSaveOptions() { - db_set_b(NULL, "FavContacts", "SecondLine", g_Options.bSecondLine); - db_set_b(NULL, "FavContacts", "Avatars", g_Options.bAvatars); - db_set_b(NULL, "FavContacts", "AvatarBorder", g_Options.bAvatarBorder); - db_set_w(NULL, "FavContacts", "AvatarRadius", g_Options.wAvatarRadius); - db_set_b(NULL, "FavContacts", "NoTransparentBorder", g_Options.bNoTransparentBorder); - db_set_b(NULL, "FavContacts", "SysColors", g_Options.bSysColors); - db_set_b(NULL, "FavContacts", "CenterHotkey", g_Options.bCenterHotkey); - db_set_b(NULL, "FavContacts", "UseGroups", g_Options.bUseGroups); - db_set_b(NULL, "FavContacts", "UseColumns", g_Options.bUseColumns); - db_set_b(NULL, "FavContacts", "RightAvatars", g_Options.bRightAvatars); - db_set_b(NULL, "FavContacts", "DimIdle", g_Options.bDimIdle); - db_set_w(NULL, "FavContacts", "MaxRecent", g_Options.wMaxRecent); + db_set_b(0, "FavContacts", "SecondLine", g_Options.bSecondLine); + db_set_b(0, "FavContacts", "Avatars", g_Options.bAvatars); + db_set_b(0, "FavContacts", "AvatarBorder", g_Options.bAvatarBorder); + db_set_w(0, "FavContacts", "AvatarRadius", g_Options.wAvatarRadius); + db_set_b(0, "FavContacts", "NoTransparentBorder", g_Options.bNoTransparentBorder); + db_set_b(0, "FavContacts", "SysColors", g_Options.bSysColors); + db_set_b(0, "FavContacts", "CenterHotkey", g_Options.bCenterHotkey); + db_set_b(0, "FavContacts", "UseGroups", g_Options.bUseGroups); + db_set_b(0, "FavContacts", "UseColumns", g_Options.bUseColumns); + db_set_b(0, "FavContacts", "RightAvatars", g_Options.bRightAvatars); + db_set_b(0, "FavContacts", "DimIdle", g_Options.bDimIdle); + db_set_w(0, "FavContacts", "MaxRecent", g_Options.wMaxRecent); } static void sttResetListOptions(HWND hwndList) diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 327bbb7d59..1718722937 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -136,17 +136,17 @@ int RetrieveFileSize(wchar_t *filename) FILEECHO::FILEECHO(MCONTACT Contact) { hContact = Contact; - dwSendInterval = db_get_dw(NULL, MODULENAME, "SendDelay", 6000); + dwSendInterval = g_plugin.getDword("SendDelay", 6000); - chunkMaxLen = db_get_dw(NULL, MODULENAME, "ChunkSize", 5000); + chunkMaxLen = g_plugin.getDword("ChunkSize", 5000); chunkCount = 0; filename = nullptr; - rgbRecv = db_get_dw(NULL, MODULENAME, "colorRecv", RGB(64, 255, 64)); - rgbSent = db_get_dw(NULL, MODULENAME, "colorSent", RGB(255, 255, 64)); - rgbUnSent = db_get_dw(NULL, MODULENAME, "colorUnsent", RGB(128, 128, 128)); - rgbToSend = db_get_dw(NULL, MODULENAME, "colorTosend", RGB(192, 192, 192)); - asBinary = db_get_dw(NULL, MODULENAME, "base64", 1) == 0; + rgbRecv = g_plugin.getDword("colorRecv", RGB(64, 255, 64)); + rgbSent = g_plugin.getDword("colorSent", RGB(255, 255, 64)); + rgbUnSent = g_plugin.getDword("colorUnsent", RGB(128, 128, 128)); + rgbToSend = g_plugin.getDword("colorTosend", RGB(192, 192, 192)); + asBinary = g_plugin.getDword("base64", 1) == 0; } uint controlEnabled[][2] = @@ -235,7 +235,7 @@ int FILEECHO::createTransfer() #ifdef DEBUG overhead = 0; #endif - BYTE bAuto = db_get_b(NULL, "SRFile", "AutoAccept", 0); + BYTE bAuto = db_get_b(0, "SRFile", "AutoAccept", 0); hFile = CreateFileA(filename, inSend ? GENERIC_READ : (GENERIC_READ | GENERIC_WRITE), inSend ? FILE_SHARE_READ : 0, nullptr, inSend ? OPEN_EXISTING : (bAuto ? CREATE_ALWAYS : CREATE_NEW), FILE_ATTRIBUTE_NORMAL, nullptr); if (hFile == INVALID_HANDLE_VALUE && !inSend && GetLastError() == ERROR_FILE_EXISTS) { @@ -404,8 +404,8 @@ void FILEECHO::incomeRequest(char *param) inSend = FALSE; Skin_PlaySound("RecvFile"); - int AutoMin = db_get_b(NULL, "SRFile", "AutoMin", 0); - if (db_get_b(NULL, "SRFile", "AutoAccept", 0) && !db_get_b(hContact, "CList", "NotOnList", 0)) { + int AutoMin = db_get_b(0, "SRFile", "AutoMin", 0); + if (db_get_b(0, "SRFile", "AutoAccept", 0) && !db_get_b(hContact, "CList", "NotOnList", 0)) { PostMessage(hDlg, WM_COMMAND, IDC_PLAY, 0); if (AutoMin) ShowWindow(hDlg, SW_SHOWMINIMIZED); @@ -486,7 +486,7 @@ void FILEECHO::onRecvTimer() SetDlgItemText(hDlg, IDC_STATUS, msg); MakePopupMsg(hDlg, hContact, msg); setState(STATE_FINISHED); - if (db_get_b(NULL, "SRFile", "AutoClose", 0)) { + if (db_get_b(0, "SRFile", "AutoClose", 0)) { PostMessage(hDlg, WM_CLOSE, 0, 0); g_clistApi.pfnRemoveEvent(hContact, 0); } diff --git a/plugins/FileAsMessage/src/optionsdlg.cpp b/plugins/FileAsMessage/src/optionsdlg.cpp index 2a1a2d0786..c1d6be2df8 100644 --- a/plugins/FileAsMessage/src/optionsdlg.cpp +++ b/plugins/FileAsMessage/src/optionsdlg.cpp @@ -44,11 +44,11 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l for (int indx = 0; indx < _countof(settingId); indx++) if (settingId[indx] > 0) - SendDlgItemMessage(hwndDlg, settingId[indx], CPM_SETCOLOUR, 0, db_get_dw(NULL, MODULENAME, settingName[indx], settingDefault[indx])); + SendDlgItemMessage(hwndDlg, settingId[indx], CPM_SETCOLOUR, 0, g_plugin.getDword(settingName[indx], settingDefault[indx])); else - SetDlgItemInt(hwndDlg, -settingId[indx], db_get_dw(NULL, MODULENAME, settingName[indx], settingDefault[indx]), FALSE); + SetDlgItemInt(hwndDlg, -settingId[indx], g_plugin.getDword(settingName[indx], settingDefault[indx]), FALSE); - CheckDlgButton(hwndDlg, IDC_ALPHANUM, db_get_dw(NULL, MODULENAME, "base64", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ALPHANUM, g_plugin.getDword("base64", 1) ? BST_CHECKED : BST_UNCHECKED); return TRUE; @@ -93,9 +93,9 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l value = GetDlgItemInt(hwndDlg, -settingId[indx], &succ, FALSE); if (!succ) value = settingDefault[indx]; } - db_set_dw(NULL, MODULENAME, settingName[indx], value); + g_plugin.setDword(settingName[indx], value); } - db_set_dw(NULL, MODULENAME, "base64", (IsDlgButtonChecked(hwndDlg, IDC_ALPHANUM) == BST_CHECKED) ? 1 : 0); + g_plugin.setDword("base64", (IsDlgButtonChecked(hwndDlg, IDC_ALPHANUM) == BST_CHECKED) ? 1 : 0); return TRUE; } diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index c0ef7d0c1b..99cad38788 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -1,110 +1,110 @@ case MIRANDA_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMiranda", 1)) + if (g_plugin.getByte("GroupMiranda", 1)) return LPGENW("Client icons") L"/" LPGENW("Miranda clients"); break; case MIRANDA_VERSION_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMirandaVersion", 1)) + if (g_plugin.getByte("GroupMirandaVersion", 1)) return LPGENW("Client icons") L"/" LPGENW("Miranda clients"); break; case MIRANDA_PACKS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMirandaPacks", 1)) + if (g_plugin.getByte("GroupMirandaPacks", 1)) return LPGENW("Client icons") L"/" LPGENW("Miranda clients") L"/" LPGENW("Pack overlays"); break; case MULTI_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMulti", 1)) + if (g_plugin.getByte("GroupMulti", 1)) return LPGENW("Client icons") L"/" LPGENW("Multi-proto clients"); break; case GG_CASE: - if (db_get_b(NULL, MODULENAME, "GroupGG", 1)) + if (g_plugin.getByte("GroupGG", 1)) return LPGENW("Client icons") L"/" LPGENW("Gadu-Gadu clients"); break; case ICQ_CASE: - if (db_get_b(NULL, MODULENAME, "GroupICQ", 1)) + if (g_plugin.getByte("GroupICQ", 1)) return LPGENW("Client icons") L"/" LPGENW("ICQ clients"); break; case IRC_CASE: - if (db_get_b(NULL, MODULENAME, "GroupIRC", 1)) + if (g_plugin.getByte("GroupIRC", 1)) return LPGENW("Client icons") L"/" LPGENW("IRC clients"); break; case JABBER_CASE: - if (db_get_b(NULL, MODULENAME, "GroupJabber", 1)) + if (g_plugin.getByte("GroupJabber", 1)) return LPGENW("Client icons") L"/" LPGENW("Jabber clients"); break; case MRA_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMRA", 1)) + if (g_plugin.getByte("GroupMRA", 1)) return LPGENW("Client icons") L"/" LPGENW("MRA clients"); break; case MSN_CASE: - if (db_get_b(NULL, MODULENAME, "GroupMSN", 1)) + if (g_plugin.getByte("GroupMSN", 1)) return LPGENW("Client icons") L"/" LPGENW("MSN clients"); break; case QQ_CASE: - if (db_get_b(NULL, MODULENAME, "GroupQQ", 1)) + if (g_plugin.getByte("GroupQQ", 1)) return LPGENW("Client icons") L"/" LPGENW("QQ clients"); break; case RSS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupRSS", 1)) + if (g_plugin.getByte("GroupRSS", 1)) return LPGENW("Client icons") L"/" LPGENW("RSS clients"); break; case WEATHER_CASE: - if (db_get_b(NULL, MODULENAME, "GroupWeather", 1)) + if (g_plugin.getByte("GroupWeather", 1)) return LPGENW("Client icons") L"/" LPGENW("Weather clients"); break; case FACEBOOK_CASE: - if (db_get_b(NULL, MODULENAME, "GroupFacebook", 1)) + if (g_plugin.getByte("GroupFacebook", 1)) return LPGENW("Client icons") L"/" LPGENW("Facebook clients"); break; case VK_CASE: - if (db_get_b(NULL, MODULENAME, "GroupVK", 1)) + if (g_plugin.getByte("GroupVK", 1)) return LPGENW("Client icons") L"/" LPGENW("VKontakte clients"); break; case OTHER_PROTOS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOtherProtos", 1)) + if (g_plugin.getByte("GroupOtherProtos", 1)) return LPGENW("Client icons") L"/" LPGENW("Other protocols"); break; case OTHERS_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOthers", 1)) + if (g_plugin.getByte("GroupOthers", 1)) return LPGENW("Client icons") L"/" LPGENW("Other icons"); break; case OVERLAYS_RESOURCE_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysResource", 1)) + if (g_plugin.getByte("GroupOverlaysResource", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Resource"); break; case OVERLAYS_PLATFORM_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysPlatform", 1)) + if (g_plugin.getByte("GroupOverlaysPlatform", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Platform"); break; case OVERLAYS_UNICODE_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysUnicode", 1)) + if (g_plugin.getByte("GroupOverlaysUnicode", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Platform"); break; case OVERLAYS_SECURITY_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysSecurity", 1)) + if (g_plugin.getByte("GroupOverlaysSecurity", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Security"); break; case OVERLAYS_PROTO_CASE: - if (db_get_b(NULL, MODULENAME, "GroupOverlaysProtos", 1)) + if (g_plugin.getByte("GroupOverlaysProtos", 1)) return LPGENW("Client icons") L"/" LPGENW("Overlays") L"/" LPGENW("Protocol"); break; diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index 4b41598829..9e40f0641a 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -113,7 +113,7 @@ void RegisterIcons() for (i = 0; i < DEFAULT_KN_FP_OVERLAYS_COUNT; i++) Prepare(&def_kn_fp_overlays_mask[i], true); - if (db_get_b(NULL, MODULENAME, "GroupMirandaVersion", 0)) { + if (g_plugin.getByte("GroupMirandaVersion", 0)) { for (i = 0; i < DEFAULT_KN_FP_OVERLAYS2_COUNT; i++) Prepare(&def_kn_fp_overlays2_mask[i], true); } @@ -124,7 +124,7 @@ void RegisterIcons() Prepare(&def_kn_fp_overlays2_mask[i], false); } - if (db_get_b(NULL, MODULENAME, "GroupOverlaysUnicode", 1)) { + if (g_plugin.getByte("GroupOverlaysUnicode", 1)) { for (i = 0; i < DEFAULT_KN_FP_OVERLAYS3_COUNT; i++) Prepare(&def_kn_fp_overlays3_mask[i], true); } @@ -855,7 +855,7 @@ static int OnContactSettingChanged(WPARAM hContact, LPARAM lParam) static int OnSrmmWindowEvent(WPARAM, LPARAM lParam) { - if (!db_get_b(NULL, MODULENAME, "StatusBarIcon", 1)) + if (!g_plugin.getByte("StatusBarIcon", 1)) return 0; MessageWindowEventData *event = (MessageWindowEventData *)lParam; @@ -895,7 +895,7 @@ int OnModulesLoaded(WPARAM, LPARAM) RegisterIcons(); - if (db_get_b(NULL, MODULENAME, "StatusBarIcon", 1)) { + if (g_plugin.getByte("StatusBarIcon", 1)) { StatusIconData sid = {}; sid.szModule = MODULENAME; sid.flags = MBF_HIDDEN; diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 1e14f09a36..223157e8e0 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -65,12 +65,12 @@ SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); static void LoadDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting, BYTE bDef) { - CheckDlgButton(hwndDlg, idCtrl, db_get_b(NULL, MODULENAME, szSetting, bDef) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, idCtrl, g_plugin.getByte(szSetting, bDef) ? BST_CHECKED : BST_UNCHECKED); } static void StoreDBCheckState(HWND hwndDlg, int idCtrl, LPCSTR szSetting) { - db_set_b(NULL, MODULENAME, szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl)); + g_plugin.setByte(szSetting, (BYTE)IsDlgButtonChecked(hwndDlg, idCtrl)); } static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index f2dbe2f004..bb91bc2d10 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -278,26 +278,26 @@ static int OnPrebuildContactMenu(WPARAM wParam, LPARAM) static void LoadDBSettings() { - fcOpt.thumbAlpha = (BYTE)((double)db_get_b(NULL, MODULE, "Opacity", 100) * 2.55); - fcOpt.bHideOffline = (BOOL)db_get_b(NULL, MODULE, "HideOffline", 0); - fcOpt.bHideAll = (BOOL)db_get_b(NULL, MODULE, "HideAll", 0); - fcOpt.bHideWhenFullscreen = (BOOL)db_get_b(NULL, MODULE, "HideWhenFullscreen", 0); - fcOpt.bMoveTogether = (BOOL)db_get_b(NULL, MODULE, "MoveTogether", 0); - fcOpt.bFixedWidth = (BOOL)db_get_b(NULL, MODULE, "FixedWidth", 0); - fcOpt.nThumbWidth = (DWORD)db_get_dw(NULL, MODULE, "Width", 0); - dwOfflineModes = db_get_dw(NULL, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES); - fcOpt.bShowTip = (BOOL)db_get_b(NULL, MODULE, "ShowTip", 1); - fcOpt.TimeIn = (WORD)db_get_w(NULL, MODULE, "TimeIn", 0); - fcOpt.bToTop = (BOOL)db_get_b(NULL, MODULE, "ToTop", 0); - fcOpt.ToTopTime = (WORD)db_get_w(NULL, MODULE, "ToTopTime", TOTOPTIME_DEF); - fcOpt.bHideWhenCListShow = (BOOL)db_get_b(NULL, MODULE, "HideWhenCListShow", 0); - fcOpt.bUseSingleClick = (BOOL)db_get_b(NULL, MODULE, "UseSingleClick", 0); - fcOpt.bShowIdle = (BOOL)db_get_b(NULL, MODULE, "ShowIdle", 0); - - if (db_get_b(NULL, "ModernData", "HideBehind", 0)) - bIsCListShow = (db_get_b(NULL, "ModernData", "BehindEdge", 0) == 0); + fcOpt.thumbAlpha = (BYTE)((double)g_plugin.getByte("Opacity", 100) * 2.55); + fcOpt.bHideOffline = (BOOL)g_plugin.getByte("HideOffline", 0); + fcOpt.bHideAll = (BOOL)g_plugin.getByte("HideAll", 0); + fcOpt.bHideWhenFullscreen = (BOOL)g_plugin.getByte("HideWhenFullscreen", 0); + fcOpt.bMoveTogether = (BOOL)g_plugin.getByte("MoveTogether", 0); + fcOpt.bFixedWidth = (BOOL)g_plugin.getByte("FixedWidth", 0); + fcOpt.nThumbWidth = (DWORD)g_plugin.getDword("Width", 0); + dwOfflineModes = db_get_dw(0, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES); + fcOpt.bShowTip = (BOOL)g_plugin.getByte("ShowTip", 1); + fcOpt.TimeIn = g_plugin.getWord("TimeIn", 0); + fcOpt.bToTop = (BOOL)g_plugin.getByte("ToTop", 0); + fcOpt.ToTopTime = g_plugin.getWord("ToTopTime", TOTOPTIME_DEF); + fcOpt.bHideWhenCListShow = (BOOL)g_plugin.getByte("HideWhenCListShow", 0); + fcOpt.bUseSingleClick = (BOOL)g_plugin.getByte("UseSingleClick", 0); + fcOpt.bShowIdle = (BOOL)g_plugin.getByte("ShowIdle", 0); + + if (db_get_b(0, "ModernData", "HideBehind", 0)) + bIsCListShow = (db_get_b(0, "ModernData", "BehindEdge", 0) == 0); else - bIsCListShow = (db_get_b(NULL, "CList", "State", 0) == 2); + bIsCListShow = (db_get_b(0, "CList", "State", 0) == 2); } void SendMsgDialog(HWND hwnd, wchar_t *pText) @@ -529,7 +529,7 @@ static void CreateThumbsFont() static void CreateBackgroundBrush() { - bkColor = db_get_dw(NULL, MODULE, "BkColor", FLT_DEFAULT_BKGNDCOLOR); + bkColor = g_plugin.getDword("BkColor", FLT_DEFAULT_BKGNDCOLOR); if (nullptr != hLTEdgesPen) { DeleteObject(hLTEdgesPen); @@ -552,19 +552,19 @@ static void CreateBackgroundBrush() hBkBrush = nullptr; } - if (db_get_b(NULL, MODULE, "DrawBorder", FLT_DEFAULT_DRAWBORDER)) { - COLORREF cr = (COLORREF)db_get_dw(NULL, MODULE, "LTEdgesColor", FLT_DEFAULT_LTEDGESCOLOR); + if (g_plugin.getByte("DrawBorder", FLT_DEFAULT_DRAWBORDER)) { + COLORREF cr = (COLORREF)g_plugin.getDword("LTEdgesColor", FLT_DEFAULT_LTEDGESCOLOR); hLTEdgesPen = CreatePen(PS_SOLID, 1, cr); - cr = (COLORREF)db_get_dw(NULL, MODULE, "RBEdgesColor", FLT_DEFAULT_RBEDGESCOLOR); + cr = (COLORREF)g_plugin.getDword("RBEdgesColor", FLT_DEFAULT_RBEDGESCOLOR); hRBEdgesPen = CreatePen(PS_SOLID, 1, cr); } - if (db_get_b(NULL, MODULE, "BkUseBitmap", FLT_DEFAULT_BKGNDUSEBITMAP)) { + if (g_plugin.getByte("BkUseBitmap", FLT_DEFAULT_BKGNDUSEBITMAP)) { ptrW tszBitmapName(db_get_wsa(NULL, MODULE, "BkBitmap")); if (tszBitmapName != NULL) hBmpBackground = Bitmap_Load(tszBitmapName); } - nBackgroundBmpUse = (WORD)db_get_w(NULL, MODULE, "BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT); + nBackgroundBmpUse = (WORD)g_plugin.getWord("BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT); // Create brush hBkBrush = CreateSolidBrush(bkColor); @@ -676,7 +676,7 @@ static IconItemT g_iconList[] = static INT_PTR OnMainMenu_HideAll(WPARAM, LPARAM) { fcOpt.bHideAll = !fcOpt.bHideAll; - db_set_b(NULL, MODULE, "HideAll", (BYTE)fcOpt.bHideAll); + g_plugin.setByte("HideAll", (BYTE)fcOpt.bHideAll); OnStatusChanged(); @@ -700,7 +700,7 @@ static INT_PTR OnContactMenu_Remove(WPARAM hContact, LPARAM) static INT_PTR OnHotKey_HideWhenCListShow(WPARAM, LPARAM) { fcOpt.bHideWhenCListShow = !fcOpt.bHideWhenCListShow; - db_set_b(NULL, MODULE, "HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow); + g_plugin.setByte("HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow); OnStatusChanged(); return 0; } @@ -831,9 +831,9 @@ static LRESULT __stdcall newMirandaWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, HideThumbsOnShowCList(); } else if (!(wp->flags & SWP_NOMOVE)) { - BYTE method = db_get_b(NULL, "ModernData", "HideBehind", 0); + BYTE method = db_get_b(0, "ModernData", "HideBehind", 0); if (method) { - WORD wBehindEdgeBorderSize = db_get_w(NULL, "ModernData", "HideBehindBorderSize", 0); + WORD wBehindEdgeBorderSize = db_get_w(0, "ModernData", "HideBehindBorderSize", 0); RECT rc = { wp->x, wp->y, wp->x + wp->cx, wp->y + wp->cy }; RECT rcScr = { wBehindEdgeBorderSize*(2 - method), 0, GetSystemMetrics(SM_CXSCREEN) - wBehindEdgeBorderSize * (method - 1), GetSystemMetrics(SM_CYSCREEN) }; RECT rcOverlap; diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index 6f80b462eb..d90b9ca700 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -105,43 +105,43 @@ static INT_PTR APIENTRY OptWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARA case PSN_APPLY: BOOL bSuccess = FALSE; - fcOpt.bHideOffline = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_OFFLINE); - db_set_b(NULL, MODULE, "HideOffline", (BYTE)fcOpt.bHideOffline); + fcOpt.bHideOffline = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_OFFLINE); + g_plugin.setByte("HideOffline", (BYTE)fcOpt.bHideOffline); - fcOpt.bHideAll = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_ALL); - db_set_b(NULL, MODULE, "HideAll", (BYTE)fcOpt.bHideAll); + fcOpt.bHideAll = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_ALL); + g_plugin.setByte("HideAll", (BYTE)fcOpt.bHideAll); - fcOpt.bHideWhenFullscreen = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_WHEN_FULSCREEN); - db_set_b(NULL, MODULE, "HideWhenFullscreen", (BYTE)fcOpt.bHideWhenFullscreen); + fcOpt.bHideWhenFullscreen = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_WHEN_FULSCREEN); + g_plugin.setByte("HideWhenFullscreen", (BYTE)fcOpt.bHideWhenFullscreen); - fcOpt.bMoveTogether = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_STICK); - db_set_b(NULL, MODULE, "MoveTogether", (BYTE)fcOpt.bMoveTogether); + fcOpt.bMoveTogether = IsDlgButtonChecked(hwndDlg, IDC_CHK_STICK); + g_plugin.setByte("MoveTogether", (BYTE)fcOpt.bMoveTogether); - fcOpt.bFixedWidth = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_WIDTH); - db_set_b(NULL, MODULE, "FixedWidth", (BYTE)fcOpt.bFixedWidth); + fcOpt.bFixedWidth = IsDlgButtonChecked(hwndDlg, IDC_CHK_WIDTH); + g_plugin.setByte("FixedWidth", (BYTE)fcOpt.bFixedWidth); fcOpt.nThumbWidth = GetDlgItemInt(hwndDlg, IDC_TXT_WIDTH, &bSuccess, FALSE); - db_set_dw(NULL, MODULE, "Width", fcOpt.nThumbWidth); + g_plugin.setDword("Width", fcOpt.nThumbWidth); if (bEnableTip) { - fcOpt.bShowTip = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_TIP); - db_set_b(NULL, MODULE, "ShowTip", (BYTE)fcOpt.bShowTip); + fcOpt.bShowTip = IsDlgButtonChecked(hwndDlg, IDC_CHK_TIP); + g_plugin.setByte("ShowTip", (BYTE)fcOpt.bShowTip); fcOpt.TimeIn = GetDlgItemInt(hwndDlg, IDC_TXT_TIMEIN, &bSuccess, FALSE); - db_set_w(NULL, MODULE, "TimeIn", fcOpt.TimeIn); + g_plugin.setWord("TimeIn", fcOpt.TimeIn); } - fcOpt.bToTop = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_TOTOP); - db_set_b(NULL, MODULE, "ToTop", (BYTE)fcOpt.bToTop); + fcOpt.bToTop = IsDlgButtonChecked(hwndDlg, IDC_CHK_TOTOP); + g_plugin.setByte("ToTop", (BYTE)fcOpt.bToTop); fcOpt.ToTopTime = GetDlgItemInt(hwndDlg, IDC_TXT_TOTOPTIME, &bSuccess, FALSE); - db_set_w(NULL, MODULE, "ToTopTime", fcOpt.ToTopTime); + g_plugin.setWord("ToTopTime", fcOpt.ToTopTime); - fcOpt.bHideWhenCListShow = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_WHEN_CLISTSHOW); - db_set_b(NULL, MODULE, "HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow); + fcOpt.bHideWhenCListShow = IsDlgButtonChecked(hwndDlg, IDC_CHK_HIDE_WHEN_CLISTSHOW); + g_plugin.setByte("HideWhenCListShow", (BYTE)fcOpt.bHideWhenCListShow); - fcOpt.bUseSingleClick = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_SINGLECLK); - db_set_b(NULL, MODULE, "UseSingleClick", (BYTE)fcOpt.bUseSingleClick); + fcOpt.bUseSingleClick = IsDlgButtonChecked(hwndDlg, IDC_CHK_SINGLECLK); + g_plugin.setByte("UseSingleClick", (BYTE)fcOpt.bUseSingleClick); - fcOpt.bShowIdle = (BOOL)IsDlgButtonChecked(hwndDlg, IDC_CHK_SHOWIDLE); - db_set_b(NULL, MODULE, "ShowIdle", (BYTE)fcOpt.bShowIdle); + fcOpt.bShowIdle = IsDlgButtonChecked(hwndDlg, IDC_CHK_SHOWIDLE); + g_plugin.setByte("ShowIdle", (BYTE)fcOpt.bShowIdle); ApplyOptionsChanges(); OnStatusChanged(); @@ -164,19 +164,19 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); // Border - CheckDlgButton(hwndDlg, IDC_DRAWBORDER, db_get_b(NULL, MODULE, "DrawBorder", FLT_DEFAULT_DRAWBORDER) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_DRAWBORDER, g_plugin.getByte("DrawBorder", FLT_DEFAULT_DRAWBORDER) ? BST_CHECKED : BST_UNCHECKED); SendMessage(hwndDlg, M_REFRESHBORDERPICKERS, 0, 0); SendDlgItemMessage(hwndDlg, IDC_LTEDGESCOLOR, CPM_SETDEFAULTCOLOUR, 0, FLT_DEFAULT_LTEDGESCOLOR); - SendDlgItemMessage(hwndDlg, IDC_LTEDGESCOLOR, CPM_SETCOLOUR, 0, db_get_dw(NULL, MODULE, "LTEdgesColor", FLT_DEFAULT_LTEDGESCOLOR)); + SendDlgItemMessage(hwndDlg, IDC_LTEDGESCOLOR, CPM_SETCOLOUR, 0, g_plugin.getDword("LTEdgesColor", FLT_DEFAULT_LTEDGESCOLOR)); SendDlgItemMessage(hwndDlg, IDC_RBEDGESCOLOR, CPM_SETDEFAULTCOLOUR, 0, FLT_DEFAULT_RBEDGESCOLOR); - SendDlgItemMessage(hwndDlg, IDC_RBEDGESCOLOR, CPM_SETCOLOUR, 0, db_get_dw(NULL, MODULE, "RBEdgesColor", FLT_DEFAULT_RBEDGESCOLOR)); + SendDlgItemMessage(hwndDlg, IDC_RBEDGESCOLOR, CPM_SETCOLOUR, 0, g_plugin.getDword("RBEdgesColor", FLT_DEFAULT_RBEDGESCOLOR)); // Background CheckDlgButton(hwndDlg, IDC_CHK_WIDTH, (fcOpt.bFixedWidth ? BST_CHECKED : BST_UNCHECKED)); SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_SETDEFAULTCOLOUR, 0, FLT_DEFAULT_BKGNDCOLOR); - SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_SETCOLOUR, 0, db_get_dw(NULL, MODULE, "BkColor", FLT_DEFAULT_BKGNDCOLOR)); - CheckDlgButton(hwndDlg, IDC_BITMAP, db_get_b(NULL, MODULE, "BkUseBitmap", FLT_DEFAULT_BKGNDUSEBITMAP) ? BST_CHECKED : BST_UNCHECKED); + SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_SETCOLOUR, 0, g_plugin.getDword("BkColor", FLT_DEFAULT_BKGNDCOLOR)); + CheckDlgButton(hwndDlg, IDC_BITMAP, g_plugin.getByte("BkUseBitmap", FLT_DEFAULT_BKGNDUSEBITMAP) ? BST_CHECKED : BST_UNCHECKED); SendMessage(hwndDlg, M_REFRESHBKGBOXES, 0, 0); { DBVARIANT dbv; @@ -185,7 +185,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP db_free(&dbv); } - WORD bmpUse = (WORD)db_get_w(NULL, MODULE, "BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT); + WORD bmpUse = (WORD)g_plugin.getWord("BkBitmapOpt", FLT_DEFAULT_BKGNDBITMAPOPT); CheckDlgButton(hwndDlg, IDC_STRETCHH, ((bmpUse & CLB_STRETCHH) ? BST_CHECKED : BST_UNCHECKED)); CheckDlgButton(hwndDlg, IDC_STRETCHV, ((bmpUse & CLB_STRETCHV) ? BST_CHECKED : BST_UNCHECKED)); CheckDlgButton(hwndDlg, IDC_TILEH, ((bmpUse & CLBF_TILEH) ? BST_CHECKED : BST_UNCHECKED)); @@ -195,7 +195,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP SHAutoComplete(GetDlgItem(hwndDlg, IDC_FILENAME), 1); // Windows 2K/XP - BYTE btOpacity = (BYTE)db_get_b(NULL, MODULE, "Opacity", 100); + BYTE btOpacity = (BYTE)g_plugin.getByte("Opacity", 100); SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_SETRANGE, TRUE, MAKELONG(0, 100)); SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_SETPOS, TRUE, btOpacity); @@ -280,30 +280,30 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP if (0 == ((LPNMHDR)lParam)->idFrom) { switch (((LPNMHDR)lParam)->code) { case PSN_RESET: - fcOpt.thumbAlpha = (BYTE)((double)db_get_b(NULL, MODULE, "Opacity", 100) * 2.55); + fcOpt.thumbAlpha = (BYTE)((double)g_plugin.getByte("Opacity", 100) * 2.55); SetThumbsOpacity(fcOpt.thumbAlpha); break; case PSN_APPLY: // Border - db_set_b(NULL, MODULE, "DrawBorder", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DRAWBORDER)); + g_plugin.setByte("DrawBorder", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DRAWBORDER)); COLORREF col = SendDlgItemMessage(hwndDlg, IDC_LTEDGESCOLOR, CPM_GETCOLOUR, 0, 0); - db_set_dw(NULL, MODULE, "LTEdgesColor", col); + g_plugin.setDword("LTEdgesColor", col); col = SendDlgItemMessage(hwndDlg, IDC_RBEDGESCOLOR, CPM_GETCOLOUR, 0, 0); - db_set_dw(NULL, MODULE, "RBEdgesColor", col); + g_plugin.setDword("RBEdgesColor", col); - db_set_b(NULL, MODULE, "Opacity", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_GETPOS, 0, 0)); + g_plugin.setByte("Opacity", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_GETPOS, 0, 0)); // Backgroud col = SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_GETCOLOUR, 0, 0); - db_set_dw(NULL, MODULE, "BkColor", col); + g_plugin.setDword("BkColor", col); - db_set_b(NULL, MODULE, "BkUseBitmap", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); + g_plugin.setByte("BkUseBitmap", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_BITMAP)); wchar_t str[MAX_PATH]; GetDlgItemText(hwndDlg, IDC_FILENAME, str, _countof(str)); - db_set_ws(NULL, MODULE, "BkBitmap", str); + g_plugin.setWString("BkBitmap", str); WORD flags = 0; if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHH)) @@ -316,7 +316,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP flags |= CLBF_TILEV; if (IsDlgButtonChecked(hwndDlg, IDC_PROPORTIONAL)) flags |= CLBF_PROPORTIONAL; - db_set_w(NULL, MODULE, "BkBitmapOpt", flags); + g_plugin.setWord("BkBitmapOpt", flags); ApplyOptionsChanges(); OnStatusChanged(); diff --git a/plugins/Folders/src/folderItem.cpp b/plugins/Folders/src/folderItem.cpp index 35d718798b..a309e7ddaa 100644 --- a/plugins/Folders/src/folderItem.cpp +++ b/plugins/Folders/src/folderItem.cpp @@ -128,5 +128,5 @@ void CFolderItem::WriteDataToDatabase() strcat_s(szSettingName, sizeof(szSettingName), m_szName); if (m_tszFormat) - db_set_ws(NULL, ModuleName, szSettingName, m_tszFormat); + db_set_ws(0, ModuleName, szSettingName, m_tszFormat); } diff --git a/plugins/GmailNotifier/src/main.cpp b/plugins/GmailNotifier/src/main.cpp index e894e5c6d5..8131aaf905 100644 --- a/plugins/GmailNotifier/src/main.cpp +++ b/plugins/GmailNotifier/src/main.cpp @@ -99,24 +99,24 @@ int CMPlugin::Load() CreateProtoServiceFunction(MODULENAME, PS_GETNAME, GetName); CreateServiceFunction("GmailMNotifier/Notifying", Notifying); - opt.circleTime = db_get_dw(NULL, MODULENAME, "circleTime", 30); - opt.notifierOnTray = db_get_dw(NULL, MODULENAME, "notifierOnTray", TRUE); - opt.notifierOnPop = db_get_dw(NULL, MODULENAME, "notifierOnPop", TRUE); - opt.popupDuration = db_get_dw(NULL, MODULENAME, "popupDuration", -1); - opt.popupBgColor = db_get_dw(NULL, MODULENAME, "popupBgColor", RGB(173, 206, 247)); - opt.popupTxtColor = db_get_dw(NULL, MODULENAME, "popupTxtColor", RGB(0, 0, 0)); - opt.OpenUsePrg = db_get_dw(NULL, MODULENAME, "OpenUsePrg", 0); - opt.ShowCustomIcon = db_get_dw(NULL, MODULENAME, "ShowCustomIcon", FALSE); - opt.UseOnline = db_get_dw(NULL, MODULENAME, "UseOnline", FALSE); - opt.AutoLogin = db_get_dw(NULL, MODULENAME, "AutoLogin", TRUE); - opt.LogThreads = db_get_dw(NULL, MODULENAME, "LogThreads", FALSE); + opt.circleTime = g_plugin.getDword("circleTime", 30); + opt.notifierOnTray = g_plugin.getDword("notifierOnTray", TRUE); + opt.notifierOnPop = g_plugin.getDword("notifierOnPop", TRUE); + opt.popupDuration = g_plugin.getDword("popupDuration", -1); + opt.popupBgColor = g_plugin.getDword("popupBgColor", RGB(173, 206, 247)); + opt.popupTxtColor = g_plugin.getDword("popupTxtColor", RGB(0, 0, 0)); + opt.OpenUsePrg = g_plugin.getDword("OpenUsePrg", 0); + opt.ShowCustomIcon = g_plugin.getDword("ShowCustomIcon", FALSE); + opt.UseOnline = g_plugin.getDword("UseOnline", FALSE); + opt.AutoLogin = g_plugin.getDword("AutoLogin", TRUE); + opt.LogThreads = g_plugin.getDword("LogThreads", FALSE); DBVARIANT dbv; - if (db_get_s(NULL, "SkinIcons", "core_status_" MODULENAME "4", &dbv)) { - db_set_s(NULL, "SkinIcons", "core_status_" MODULENAME "0", "plugins\\GmailNotifier.dll,2"); - db_set_s(NULL, "SkinIcons", "core_status_" MODULENAME "1", "plugins\\GmailNotifier.dll,2"); - db_set_s(NULL, "SkinIcons", "core_status_" MODULENAME "2", "plugins\\GmailNotifier.dll,0"); - db_set_s(NULL, "SkinIcons", "core_status_" MODULENAME "4", "plugins\\GmailNotifier.dll,1"); + if (db_get_s(0, "SkinIcons", "core_status_" MODULENAME "4", &dbv)) { + db_set_s(0, "SkinIcons", "core_status_" MODULENAME "0", "plugins\\GmailNotifier.dll,2"); + db_set_s(0, "SkinIcons", "core_status_" MODULENAME "1", "plugins\\GmailNotifier.dll,2"); + db_set_s(0, "SkinIcons", "core_status_" MODULENAME "2", "plugins\\GmailNotifier.dll,0"); + db_set_s(0, "SkinIcons", "core_status_" MODULENAME "4", "plugins\\GmailNotifier.dll,1"); } else db_free(&dbv); diff --git a/plugins/GmailNotifier/src/options.cpp b/plugins/GmailNotifier/src/options.cpp index 720bc9aa01..e9bc4bab5c 100644 --- a/plugins/GmailNotifier/src/options.cpp +++ b/plugins/GmailNotifier/src/options.cpp @@ -84,7 +84,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA } { DBVARIANT dbv; - if (!db_get_s(NULL, MODULENAME, "OpenUsePrgPath", &dbv)) { + if (!g_plugin.getString("OpenUsePrgPath", &dbv)) { mir_strcpy(str, dbv.pszVal); db_free(&dbv); } @@ -216,20 +216,20 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (opt.circleTime > 0) { KillTimer(nullptr, hTimer); hTimer = SetTimer(nullptr, 0, opt.circleTime * 60000, TimerProc); - db_set_dw(NULL, MODULENAME, "circleTime", opt.circleTime); + g_plugin.setDword("circleTime", opt.circleTime); } opt.notifierOnTray = IsDlgButtonChecked(hwndDlg, IDC_OPTTRAY); opt.notifierOnPop = IsDlgButtonChecked(hwndDlg, IDC_OPTPOP); - db_set_dw(NULL, MODULENAME, "notifierOnTray", opt.notifierOnTray); - db_set_dw(NULL, MODULENAME, "notifierOnPop", opt.notifierOnPop); + g_plugin.setDword("notifierOnTray", opt.notifierOnTray); + g_plugin.setDword("notifierOnPop", opt.notifierOnPop); opt.popupDuration = GetDlgItemInt(hwndDlg, IDC_DURATION, nullptr, TRUE); - db_set_dw(NULL, MODULENAME, "popupDuration", opt.popupDuration); + g_plugin.setDword("popupDuration", opt.popupDuration); opt.popupBgColor = SendDlgItemMessage(hwndDlg, IDC_BGCOLOR, CPM_GETCOLOUR, 0, opt.popupBgColor); opt.popupTxtColor = SendDlgItemMessage(hwndDlg, IDC_TEXTCOLOR, CPM_GETCOLOUR, 0, opt.popupBgColor); - db_set_dw(NULL, MODULENAME, "popupBgColor", opt.popupBgColor); - db_set_dw(NULL, MODULENAME, "popupTxtColor", opt.popupTxtColor); + g_plugin.setDword("popupBgColor", opt.popupBgColor); + g_plugin.setDword("popupTxtColor", opt.popupTxtColor); if (IsDlgButtonChecked(hwndDlg, IDC_SYSDEF) == BST_CHECKED) opt.OpenUsePrg = 0; @@ -240,8 +240,8 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA } GetDlgItemTextA(hwndDlg, IDC_PRG, str, _countof(str)); - db_set_dw(NULL, MODULENAME, "OpenUsePrg", opt.OpenUsePrg); - db_set_s(NULL, MODULENAME, "OpenUsePrgPath", str); + g_plugin.setDword("OpenUsePrg", opt.OpenUsePrg); + g_plugin.setString("OpenUsePrgPath", str); opt.ShowCustomIcon = IsDlgButtonChecked(hwndDlg, IDC_SHOWICON); opt.UseOnline = IsDlgButtonChecked(hwndDlg, IDC_ONLINE); @@ -252,10 +252,10 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA else if (IsDlgButtonChecked(hwndDlg, IDC_AUTOLOGIN) == BST_INDETERMINATE) opt.AutoLogin = 2; opt.LogThreads = IsDlgButtonChecked(hwndDlg, IDC_LOGTHREADS); - db_set_dw(NULL, MODULENAME, "ShowCustomIcon", opt.ShowCustomIcon); - db_set_dw(NULL, MODULENAME, "UseOnline", opt.UseOnline); - db_set_dw(NULL, MODULENAME, "AutoLogin", opt.AutoLogin); - db_set_dw(NULL, MODULENAME, "LogThreads", opt.LogThreads); + g_plugin.setDword("ShowCustomIcon", opt.ShowCustomIcon); + g_plugin.setDword("UseOnline", opt.UseOnline); + g_plugin.setDword("AutoLogin", opt.AutoLogin); + g_plugin.setDword("LogThreads", opt.LogThreads); ID_STATUS_NONEW = opt.UseOnline ? ID_STATUS_ONLINE : ID_STATUS_OFFLINE; for (auto &it : g_accs) diff --git a/plugins/GmailNotifier/src/utility.cpp b/plugins/GmailNotifier/src/utility.cpp index 63ab420896..2751aa2f1c 100644 --- a/plugins/GmailNotifier/src/utility.cpp +++ b/plugins/GmailNotifier/src/utility.cpp @@ -40,7 +40,7 @@ BOOL GetBrowser(char *str) else if (opt.OpenUsePrg == 0) strKey = strDefault; else { - if (!db_get_s(NULL, MODULENAME, "OpenUsePrgPath", &dbv)) { + if (!g_plugin.getString("OpenUsePrgPath", &dbv)) { mir_strcpy(str, dbv.pszVal); db_free(&dbv); } diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index de1a8553af..2d0bb6771b 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -194,7 +194,7 @@ unsigned long GetExternIP(const char *szURL, const char *szPattern) string sCreateLink(const char * pszSrvPath) { char szTemp[30]; - string sLink = DBGetString(NULL, MODULENAME, "ExternalSrvName", szDefaultExternalSrvName); + string sLink = DBGetString(0, MODULENAME, "ExternalSrvName", szDefaultExternalSrvName); mir_snprintf(szTemp, "%d.%d.%d.%d", SplitIpAddress(dwLocalIpAddress)); ReplaceAll(sLink, "%LocalIP%", szTemp); @@ -706,40 +706,40 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara LVCOLUMN cCol = { 0 }; cCol.mask = LVCF_TEXT | LVCF_WIDTH; - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx1", 126); + cCol.cx = g_plugin.getWord("StatWnd_cx1", 126); cCol.pszText = Translate("Share name"); ListView_InsertColumn(hShareList, 0, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx2", 48); + cCol.cx = g_plugin.getWord("StatWnd_cx2", 48); cCol.pszText = Translate("Max Downloads"); ListView_InsertColumn(hShareList, 1, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx3", 96); + cCol.cx = g_plugin.getWord("StatWnd_cx3", 96); cCol.pszText = Translate("Allowed IP"); ListView_InsertColumn(hShareList, 2, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx4", 104); + cCol.cx = g_plugin.getWord("StatWnd_cx4", 104); cCol.pszText = Translate("Allowed Mask"); ListView_InsertColumn(hShareList, 3, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx5", 252); + cCol.cx = g_plugin.getWord("StatWnd_cx5", 252); cCol.pszText = Translate("Real path"); ListView_InsertColumn(hShareList, 4, &cCol); cCol.mask = LVCF_TEXT | LVCF_WIDTH; - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx6", 142); + cCol.cx = g_plugin.getWord("StatWnd_cx6", 142); cCol.pszText = Translate("Share name"); ListView_InsertColumn(hUserList, 0, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx7", 111); + cCol.cx = g_plugin.getWord("StatWnd_cx7", 111); cCol.pszText = Translate("User"); ListView_InsertColumn(hUserList, 1, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx8", 100); + cCol.cx = g_plugin.getWord("StatWnd_cx8", 100); cCol.pszText = Translate("Agent"); ListView_InsertColumn(hUserList, 2, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx9", 100); + cCol.cx = g_plugin.getWord("StatWnd_cx9", 100); cCol.pszText = Translate("Completed"); ListView_InsertColumn(hUserList, 3, &cCol); - cCol.cx = db_get_w(NULL, MODULENAME, "StatWnd_cx10", 100); + cCol.cx = g_plugin.getWord("StatWnd_cx10", 100); cCol.pszText = Translate("Speed"); ListView_InsertColumn(hUserList, 4, &cCol); - bool b = db_get_b(NULL, MODULENAME, "StatWnd_ShowHidden", 0) != 0; + bool b = g_plugin.getByte("StatWnd_ShowHidden", 0) != 0; CheckDlgButton(hwndDlg, IDC_SHOWHIDDENSHARES, b ? BST_CHECKED : BST_UNCHECKED); bLastAutoRefress = false; @@ -932,19 +932,19 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara HWND hShareList = GetDlgItem(hwndDlg, IDC_CURRENT_SHARES); HWND hUserList = GetDlgItem(hwndDlg, IDC_CURRENT_USERS); - db_set_w(NULL, MODULENAME, "StatWnd_cx1", (WORD)ListView_GetColumnWidth(hShareList, 0)); - db_set_w(NULL, MODULENAME, "StatWnd_cx2", (WORD)ListView_GetColumnWidth(hShareList, 1)); - db_set_w(NULL, MODULENAME, "StatWnd_cx3", (WORD)ListView_GetColumnWidth(hShareList, 2)); - db_set_w(NULL, MODULENAME, "StatWnd_cx4", (WORD)ListView_GetColumnWidth(hShareList, 3)); - db_set_w(NULL, MODULENAME, "StatWnd_cx5", (WORD)ListView_GetColumnWidth(hShareList, 4)); - db_set_w(NULL, MODULENAME, "StatWnd_cx6", (WORD)ListView_GetColumnWidth(hUserList, 0)); - db_set_w(NULL, MODULENAME, "StatWnd_cx7", (WORD)ListView_GetColumnWidth(hUserList, 1)); - db_set_w(NULL, MODULENAME, "StatWnd_cx8", (WORD)ListView_GetColumnWidth(hUserList, 2)); - db_set_w(NULL, MODULENAME, "StatWnd_cx9", (WORD)ListView_GetColumnWidth(hUserList, 3)); - db_set_w(NULL, MODULENAME, "StatWnd_cx10", (WORD)ListView_GetColumnWidth(hUserList, 4)); + g_plugin.setWord("StatWnd_cx1", (WORD)ListView_GetColumnWidth(hShareList, 0)); + g_plugin.setWord("StatWnd_cx2", (WORD)ListView_GetColumnWidth(hShareList, 1)); + g_plugin.setWord("StatWnd_cx3", (WORD)ListView_GetColumnWidth(hShareList, 2)); + g_plugin.setWord("StatWnd_cx4", (WORD)ListView_GetColumnWidth(hShareList, 3)); + g_plugin.setWord("StatWnd_cx5", (WORD)ListView_GetColumnWidth(hShareList, 4)); + g_plugin.setWord("StatWnd_cx6", (WORD)ListView_GetColumnWidth(hUserList, 0)); + g_plugin.setWord("StatWnd_cx7", (WORD)ListView_GetColumnWidth(hUserList, 1)); + g_plugin.setWord("StatWnd_cx8", (WORD)ListView_GetColumnWidth(hUserList, 2)); + g_plugin.setWord("StatWnd_cx9", (WORD)ListView_GetColumnWidth(hUserList, 3)); + g_plugin.setWord("StatWnd_cx10", (WORD)ListView_GetColumnWidth(hUserList, 4)); bool b = IsDlgButtonChecked(hwndDlg, IDC_SHOWHIDDENSHARES) == BST_CHECKED; - db_set_b(NULL, MODULENAME, "StatWnd_ShowHidden", b); + g_plugin.setByte("StatWnd_ShowHidden", b); Utils_SaveWindowPosition(hwndDlg, 0, MODULENAME, "StatWnd_"); DestroyWindow(hwndDlg); @@ -1074,16 +1074,16 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP switch (msg) { case WM_INITDIALOG: { - string sDefExt = DBGetString(NULL, MODULENAME, "ExternalSrvName", szDefaultExternalSrvName); + string sDefExt = DBGetString(0, MODULENAME, "ExternalSrvName", szDefaultExternalSrvName); SetDlgItemText(hwndDlg, IDC_EXTERNAL_SRV_NAME, sDefExt.c_str()); - bool b = db_get_b(NULL, MODULENAME, "AddStatisticsMenuItem", 1) != 0; + bool b = g_plugin.getByte("AddStatisticsMenuItem", 1) != 0; CheckDlgButton(hwndDlg, IDC_ADD_STATISTICS_MENU_ITEM, b ? BST_CHECKED : BST_UNCHECKED); - b = db_get_b(NULL, MODULENAME, "AddAcceptConMenuItem", 1) != 0; + b = g_plugin.getByte("AddAcceptConMenuItem", 1) != 0; CheckDlgButton(hwndDlg, IDC_ACCEPT_COM_MENU_ITEM, b ? BST_CHECKED : BST_UNCHECKED); - b = db_get_b(NULL, MODULENAME, "WriteLogFile", 0) != 0; + b = g_plugin.getByte("WriteLogFile", 0) != 0; CheckDlgButton(hwndDlg, IDC_WRITE_LOG_FILE, b ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOW_POPUPS, bShowPopups ? BST_CHECKED : BST_UNCHECKED); @@ -1119,7 +1119,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP SetDlgItemInt(hwndDlg, IDC_DEFAULT_DOWNLOAD_LIMIT, nDefaultDownloadLimit, true); indexCreationMode = - (eIndexCreationMode)db_get_b(NULL, MODULENAME, "IndexCreationMode", 3); + (eIndexCreationMode)g_plugin.getByte("IndexCreationMode", 3); switch (indexCreationMode) { case INDEX_CREATION_HTML: @@ -1203,64 +1203,64 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP { char szTemp[500]; if (GetDlgItemText(hwndDlg, IDC_EXTERNAL_SRV_NAME, szTemp, _countof(szTemp))) - db_set_s(NULL, MODULENAME, "ExternalSrvName", szTemp); + g_plugin.setString("ExternalSrvName", szTemp); - bool b = db_get_b(NULL, MODULENAME, "AddStatisticsMenuItem", 1) != 0; + bool b = g_plugin.getByte("AddStatisticsMenuItem", 1) != 0; bool bNew = IsDlgButtonChecked(hwndDlg, IDC_ADD_STATISTICS_MENU_ITEM) == BST_CHECKED; if (b != bNew) { - db_set_b(NULL, MODULENAME, "AddStatisticsMenuItem", bNew); + g_plugin.setByte("AddStatisticsMenuItem", bNew); MessageBox(hwndDlg, Translate("You need to restart Miranda to change the main menu"), MSG_BOX_TITEL, MB_OK); } - b = db_get_b(NULL, MODULENAME, "AddAcceptConMenuItem", 1) != 0; + b = g_plugin.getByte("AddAcceptConMenuItem", 1) != 0; bNew = IsDlgButtonChecked(hwndDlg, IDC_ACCEPT_COM_MENU_ITEM) == BST_CHECKED; if (b != bNew) { - db_set_b(NULL, MODULENAME, "AddAcceptConMenuItem", bNew); + g_plugin.setByte("AddAcceptConMenuItem", bNew); MessageBox(hwndDlg, Translate("You need to restart Miranda to change the main menu"), MSG_BOX_TITEL, MB_OK); } bNew = IsDlgButtonChecked(hwndDlg, IDC_WRITE_LOG_FILE) == BST_CHECKED; - db_set_b(NULL, MODULENAME, "WriteLogFile", bNew); + g_plugin.setByte("WriteLogFile", bNew); bShowPopups = IsDlgButtonChecked(hwndDlg, IDC_SHOW_POPUPS) == BST_CHECKED; - db_set_b(NULL, MODULENAME, "ShowPopups", bShowPopups); + g_plugin.setByte("ShowPopups", bShowPopups); GetDlgItemText(hwndDlg, IDC_URL_ADDRESS, szTemp, _countof(szTemp)); sUrlAddress = szTemp; - db_set_s(NULL, MODULENAME, "UrlAddress", sUrlAddress.c_str()); + g_plugin.setString("UrlAddress", sUrlAddress.c_str()); GetDlgItemText(hwndDlg, IDC_PAGE_KEYWORD, szTemp, _countof(szTemp)); sPageKeyword = szTemp; - db_set_s(NULL, MODULENAME, "PageKeyword", sPageKeyword.c_str()); + g_plugin.setString("PageKeyword", sPageKeyword.c_str()); dwExternalIpAddress = 0; BOOL bTranslated = false; int nTemp = GetDlgItemInt(hwndDlg, IDC_MAX_SPEED, &bTranslated, true); if (bTranslated) { nMaxUploadSpeed = nTemp << 10; - db_set_dw(NULL, MODULENAME, "MaxUploadSpeed", nMaxUploadSpeed); + g_plugin.setDword("MaxUploadSpeed", nMaxUploadSpeed); } nTemp = GetDlgItemInt(hwndDlg, IDC_MAX_CONN_TOTAL, &bTranslated, true); if (bTranslated) { nMaxConnectionsTotal = nTemp; - db_set_dw(NULL, MODULENAME, "MaxConnectionsTotal", nMaxConnectionsTotal); + g_plugin.setDword("MaxConnectionsTotal", nMaxConnectionsTotal); } nTemp = GetDlgItemInt(hwndDlg, IDC_MAX_CONN_PER_USER, &bTranslated, true); if (bTranslated) { nMaxConnectionsPerUser = nTemp; - db_set_dw(NULL, MODULENAME, "MaxConnectionsPerUser", nMaxConnectionsPerUser); + g_plugin.setDword("MaxConnectionsPerUser", nMaxConnectionsPerUser); } nTemp = GetDlgItemInt(hwndDlg, IDC_DEFAULT_DOWNLOAD_LIMIT, &bTranslated, true); if (bTranslated) { nDefaultDownloadLimit = nTemp; - db_set_dw(NULL, MODULENAME, "DefaultDownloadLimit", nDefaultDownloadLimit); + g_plugin.setDword("DefaultDownloadLimit", nDefaultDownloadLimit); } bLimitOnlyWhenOnline = IsDlgButtonChecked(hwndDlg, IDC_LIMIT_ONLY_WHEN_ONLINE) == BST_CHECKED; - db_set_b(NULL, MODULENAME, "LimitOnlyWhenOnline", bLimitOnlyWhenOnline); + g_plugin.setByte("LimitOnlyWhenOnline", bLimitOnlyWhenOnline); if (IsDlgButtonChecked(hwndDlg, IDC_INDEX_HTML) == BST_CHECKED || IsDlgButtonChecked(hwndDlg, IDC_INDEX_DETECT) == BST_CHECKED) { @@ -1283,7 +1283,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP indexCreationMode = INDEX_CREATION_DISABLE; } - db_set_b(NULL, MODULENAME, "IndexCreationMode", (BYTE)indexCreationMode); + g_plugin.setByte("IndexCreationMode", (BYTE)indexCreationMode); return TRUE; } @@ -1337,7 +1337,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) void CALLBACK MainThreadCallback(void *param) { POPUPDATAT *pclData = (POPUPDATAT*)param; - if (db_get_b(NULL, MODULENAME, "WriteLogFile", 0) != 0) + if (g_plugin.getByte("WriteLogFile", 0) != 0) LogEvent(pclData->lpzContactName, pclData->lpzText); PUAddPopupT(pclData); @@ -1430,8 +1430,8 @@ void InitGuiElements() stInitCom.dwICC = ICC_INTERNET_CLASSES; InitCommonControlsEx(&stInitCom); - sUrlAddress = DBGetString(NULL, MODULENAME, "UrlAddress", szDefaultUrlAddress); - sPageKeyword = DBGetString(NULL, MODULENAME, "PageKeyword", szDefaultPageKeyword); + sUrlAddress = DBGetString(0, MODULENAME, "UrlAddress", szDefaultUrlAddress); + sPageKeyword = DBGetString(0, MODULENAME, "PageKeyword", szDefaultPageKeyword); hShareNewFileService = CreateServiceFunction(MS_SHARE_NEW_FILE, nShareNewFile); hShowStatisticsViewService = CreateServiceFunction(MS_SHOW_STATISTICS_VIEW, nShowStatisticsView); @@ -1445,7 +1445,7 @@ void InitGuiElements() mi.pszService = MS_SHARE_NEW_FILE; hShareNewFileMenuItem = Menu_AddContactMenuItem(&mi); - if (db_get_b(NULL, MODULENAME, "AddStatisticsMenuItem", 1) != 0) { + if (g_plugin.getByte("AddStatisticsMenuItem", 1) != 0) { SET_UID(mi, 0x68db84c9, 0xe6b4, 0x4b4f, 0x93, 0x4b, 0xfd, 0x34, 0x2d, 0x83, 0x11, 0xe7); mi.position = 1000085005; mi.name.w = LPGENW("Show HTTP server statistics"); @@ -1453,5 +1453,5 @@ void InitGuiElements() hShowStatisticsViewMenuItem = Menu_AddMainMenuItem(&mi); } - bShowPopups = db_get_b(NULL, MODULENAME, "ShowPopups", bShowPopups) != 0; + bShowPopups = g_plugin.getByte("ShowPopups", bShowPopups) != 0; } diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index bc3e9e4d57..c430b0574f 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -644,7 +644,7 @@ INT_PTR nToggelAcceptConnections(WPARAM wparam, LPARAM /*lparam*/) else return 0; // no changes; if (!bShutdownInProgress) - db_set_b(NULL, MODULENAME, "AcceptConnections", hDirectBoundPort != nullptr); + g_plugin.setByte("AcceptConnections", hDirectBoundPort != nullptr); return 0; } @@ -701,7 +701,7 @@ int MainInit(WPARAM /*wparam*/, LPARAM /*lparam*/) nlu.szDescriptiveName.a = Translate("HTTP Server"); hNetlibUser = Netlib_RegisterUser(&nlu); - if (db_get_b(NULL, MODULENAME, "AcceptConnections", 1)) + if (g_plugin.getByte("AcceptConnections", 1)) nToggelAcceptConnections(0, 0); InitGuiElements(); @@ -765,7 +765,7 @@ int nSystemShutdown(WPARAM /*wparam*/, LPARAM /*lparam*/) } pclFirstNode = nullptr; - db_set_b(NULL, MODULENAME, "IndexCreationMode", (BYTE)indexCreationMode); + g_plugin.setByte("IndexCreationMode", (BYTE)indexCreationMode); FreeIndexHTMLTemplate(); return 0; } @@ -809,13 +809,13 @@ int CMPlugin::Load() if (!bInitMimeHandling()) MessageBox(nullptr, "Failed to read configuration file : " szMimeTypeConfigFile, MSG_BOX_TITEL, MB_OK); - nMaxUploadSpeed = db_get_dw(NULL, MODULENAME, "MaxUploadSpeed", nMaxUploadSpeed); - nMaxConnectionsTotal = db_get_dw(NULL, MODULENAME, "MaxConnectionsTotal", nMaxConnectionsTotal); - nMaxConnectionsPerUser = db_get_dw(NULL, MODULENAME, "MaxConnectionsPerUser", nMaxConnectionsPerUser); - bLimitOnlyWhenOnline = db_get_b(NULL, MODULENAME, "LimitOnlyWhenOnline", bLimitOnlyWhenOnline) != 0; - indexCreationMode = (eIndexCreationMode)db_get_b(NULL, MODULENAME, "IndexCreationMode", 2); + nMaxUploadSpeed = g_plugin.getDword("MaxUploadSpeed", nMaxUploadSpeed); + nMaxConnectionsTotal = g_plugin.getDword("MaxConnectionsTotal", nMaxConnectionsTotal); + nMaxConnectionsPerUser = g_plugin.getDword("MaxConnectionsPerUser", nMaxConnectionsPerUser); + bLimitOnlyWhenOnline = g_plugin.getByte("LimitOnlyWhenOnline", bLimitOnlyWhenOnline) != 0; + indexCreationMode = (eIndexCreationMode)g_plugin.getByte("IndexCreationMode", 2); - if (db_get_b(NULL, MODULENAME, "AddAcceptConMenuItem", 1)) { + if (g_plugin.getByte("AddAcceptConMenuItem", 1)) { CMenuItem mi(&g_plugin); SET_UID(mi, 0xf0a68784, 0xc30e, 0x4245, 0xb6, 0x2b, 0xb8, 0x71, 0x7e, 0xe6, 0xe1, 0x73); mi.flags = CMIF_UNICODE; @@ -829,7 +829,7 @@ int CMPlugin::Load() if (indexCreationMode == INDEX_CREATION_HTML || indexCreationMode == INDEX_CREATION_DETECT) if (!LoadIndexHTMLTemplate()) { indexCreationMode = INDEX_CREATION_DISABLE; - db_set_b(NULL, MODULENAME, "IndexCreationMode", (BYTE)indexCreationMode); + g_plugin.setByte("IndexCreationMode", (BYTE)indexCreationMode); } HookEvent(ME_OPT_INITIALISE, OptionsInitialize); diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp index c11b45f9dd..df254cd766 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp @@ -45,7 +45,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) TranslateDialogDefault(hDlg); TranslateMenu(listMenu); - hContact = ((db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0) == 0) ? NULL : DlgParam->hContact); + hContact = ((db_get_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0) == 0) ? NULL : DlgParam->hContact); if (db_get_b(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 0) == 0) { // First use of this plugin! Set default size! db_set_dw(hContact, LINKLIST_MODULE, "LinklistWidth", 400); @@ -101,7 +101,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) LPTSTR link; ENLINK *pENLink = (ENLINK*)lParam; - BYTE mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + BYTE mouseEvent = db_get_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); switch (pENLink->msg) { case WM_MOUSEMOVE: @@ -120,7 +120,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) if (wcsstr(link, L"mailto:") != nullptr) ShellExecute(HWND_TOP, nullptr, link, nullptr, nullptr, SW_SHOWNORMAL); else { - bool openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF) != 0xFF; + bool openNewWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF) != 0xFF; Utils_OpenUrlW(link, openNewWindow); } mir_free(link); @@ -132,7 +132,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) hSubMenu = GetSubMenu(hPopup, 0); // Disable Menuoption if "mouse over" events are active - mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + mouseEvent = db_get_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); if (mouseEvent == 0x01) EnableMenuItem(hSubMenu, IDM_SHOWMESSAGE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); TranslateMenu(hSubMenu); @@ -341,9 +341,9 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) case WM_DESTROY: if (DlgParam != nullptr) { - hContact = ((db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0) == 0) ? NULL : DlgParam->hContact); + hContact = ((db_get_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0) == 0) ? NULL : DlgParam->hContact); Utils_SaveWindowPosition(hDlg, hContact, LINKLIST_MODULE, "Linklist"); - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_SPLITPOS, DlgParam->splitterPosNew); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_SPLITPOS, DlgParam->splitterPosNew); RemoveList(DlgParam->listStart); mir_free(DlgParam); } @@ -426,7 +426,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l switch (message) { case WM_INITDIALOG: TranslateDialogDefault(hDlg); - useDefault = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); + useDefault = db_get_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); if (useDefault == 0x01) { int mCol = GetMirandaColour(&colourSet); if (mCol == 0) { @@ -707,9 +707,9 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l if (((LPNMHDR)lParam)->code == PSN_APPLY) { // Write Settings to Database if (IsDlgButtonChecked(hDlg, IDC_CHECK1) == BST_CHECKED) - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); + db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); else { - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); colourSet.incoming = SendDlgItemMessage(hDlg, IDC_INCOMING, CPM_GETCOLOUR, 0, 0); colourSet.outgoing = SendDlgItemMessage(hDlg, IDC_OUTGOING, CPM_GETCOLOUR, 0, 0); colourSet.background = SendDlgItemMessage(hDlg, IDC_BACKGROUND, CPM_GETCOLOUR, 0, 0); diff --git a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp index 65189573a0..56cafca663 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp @@ -811,77 +811,77 @@ void GetListInfo(BYTE params, LISTELEMENT *listStart, LPCTSTR searchString, size void GetListOptions(LISTOPTIONS *options) { - options->openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); + options->openNewWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); if (options->openNewWindow == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0x00); options->openNewWindow = 0x00; } - options->updateWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); + options->updateWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); if (options->updateWindow == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); options->updateWindow = 0x00; } - options->mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + options->mouseEvent = db_get_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); if (options->mouseEvent == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0x00); options->mouseEvent = 0x00; } - options->saveSpecial = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0xFF); + options->saveSpecial = db_get_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0xFF); if (options->saveSpecial == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00); options->saveSpecial = 0x00; } - options->showDate = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0xFF); + options->showDate = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0xFF); if (options->showDate == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0x01); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0x01); options->showDate = 0x01; } - options->showLine = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0xFF); + options->showLine = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0xFF); if (options->showLine == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0x01); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0x01); options->showLine = 0x01; } - options->showTime = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0xFF); + options->showTime = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0xFF); if (options->showTime == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01); options->showTime = 0x01; } - options->showDirection = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0xFF); + options->showDirection = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0xFF); if (options->showDirection == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01); options->showDirection = 0x01; } - options->showType = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0xFF); + options->showType = db_get_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0xFF); if (options->showType == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01); options->showType = 0x01; } @@ -890,15 +890,15 @@ void GetListOptions(LISTOPTIONS *options) void SetListOptions(LISTOPTIONS *options) { - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, options->openNewWindow); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, options->updateWindow); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, options->mouseEvent); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, options->saveSpecial); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, options->showDate); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, options->showLine); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, options->showTime); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, options->showDirection); - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, options->showType); + db_set_b(0, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, options->openNewWindow); + db_set_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, options->updateWindow); + db_set_b(0, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, options->mouseEvent); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, options->saveSpecial); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DATE, options->showDate); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_LINE, options->showLine); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TIME, options->showTime); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, options->showDirection); + db_set_b(0, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, options->showType); } /* @@ -946,11 +946,11 @@ void GetColour(MYCOLOURSET *colourSet) DWORD colour; BYTE useDefault; - useDefault = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); + useDefault = db_get_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); if (useDefault == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); + db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); useDefault = 0x01; } @@ -959,51 +959,51 @@ void GetColour(MYCOLOURSET *colourSet) // Use Miranda-IM Default colours // CHANGED AT MIRANDA 0.4!!!! // Use SRMM... if it is not there try SRMsg (older Miranda Versions) - colour = db_get_dw(NULL, "SRMM", "SRMFont1Col", 0xFF000000); + colour = db_get_dw(0, "SRMM", "SRMFont1Col", 0xFF000000); if (colour != 0xFF000000) colourSet->incoming = colour; else { - colour = db_get_dw(NULL, "SRMsg", "Font3Col", 0xFF000000); + colour = db_get_dw(0, "SRMsg", "Font3Col", 0xFF000000); if (colour != 0xFF000000) colourSet->incoming = colour; else { - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } // SRMM - colour = db_get_dw(NULL, "SRMM", "SRMFont0Col", 0xFF000000); + colour = db_get_dw(0, "SRMM", "SRMFont0Col", 0xFF000000); if (colour != 0xFF000000) colourSet->outgoing = colour; else { // SRMsg - colour = db_get_dw(NULL, "SRMsg", "Font0Col", 0xFF000000); + colour = db_get_dw(0, "SRMsg", "Font0Col", 0xFF000000); if (colour != 0xFF000000) colourSet->outgoing = colour; else { - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } // SRMM - colour = db_get_dw(NULL, "SRMM", "BkgColour", 0xFF000000); + colour = db_get_dw(0, "SRMM", "BkgColour", 0xFF000000); if (colour != 0xFF000000) colourSet->background = colour; else { // SRMsg - colour = db_get_dw(NULL, "SRMsg", "BkgColour", 0xFF000000); + colour = db_get_dw(0, "SRMsg", "BkgColour", 0xFF000000); if (colour != 0xFF000000) colourSet->background = colour; else { - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } @@ -1013,25 +1013,25 @@ void GetColour(MYCOLOURSET *colourSet) if (useDefault == 0x00) { // Use Plugin user defined or default colours - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->incoming = colour; else colourSet->incoming = IN_COL_DEF; - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->outgoing = colour; else colourSet->outgoing = OUT_COL_DEF; - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->background = colour; else colourSet->background = BG_COL_DEF; - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->text = colour; else @@ -1048,39 +1048,39 @@ void GetDBColour(MYCOLOURSET *colourSet) DWORD colour; // Use Plugin user defined or default colours - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->incoming = colour; else { - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, IN_COL_DEF); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_IN_COL, IN_COL_DEF); colourSet->incoming = IN_COL_DEF; } - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->outgoing = colour; else { - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, OUT_COL_DEF); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_OUT_COL, OUT_COL_DEF); colourSet->outgoing = OUT_COL_DEF; } - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->background = colour; else { - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, BG_COL_DEF); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_BG_COL, BG_COL_DEF); colourSet->background = BG_COL_DEF; } - colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); + colour = db_get_dw(0, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); if (colour != 0xFF000000) colourSet->text = colour; else { - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, TXT_COL_DEF); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_TXT_COL, TXT_COL_DEF); colourSet->text = TXT_COL_DEF; } } @@ -1094,12 +1094,12 @@ int GetMirandaColour(MYCOLOURSET *colourSet) // Use Miranda-IM Default colours // Try SRMM (Miranda 0.4) .... or SRMsg... for older versions - colour = db_get_dw(NULL, "SRMM", "SRMFont1Col", 0xFF000000); + colour = db_get_dw(0, "SRMM", "SRMFont1Col", 0xFF000000); if (colour != 0xFF000000) colourSet->incoming = colour; else { - colour = db_get_dw(NULL, "SRMsg", "Font3Col", 0xFF000000); + colour = db_get_dw(0, "SRMsg", "Font3Col", 0xFF000000); if (colour != 0xFF000000) colourSet->incoming = colour; else @@ -1107,24 +1107,24 @@ int GetMirandaColour(MYCOLOURSET *colourSet) } - colour = db_get_dw(NULL, "SRMM", "SRMFont0Col", 0xFF000000); + colour = db_get_dw(0, "SRMM", "SRMFont0Col", 0xFF000000); if (colour != 0xFF000000) colourSet->outgoing = colour; else { - colour = db_get_dw(NULL, "SRMsg", "Font0Col", 0xFF000000); + colour = db_get_dw(0, "SRMsg", "Font0Col", 0xFF000000); if (colour != 0xFF000000) colourSet->outgoing = colour; else return 1; } - colour = db_get_dw(NULL, "SRMM", "BkgColour", 0xFF000000); + colour = db_get_dw(0, "SRMM", "BkgColour", 0xFF000000); if (colour != 0xFF000000) colourSet->background = colour; else { - colour = db_get_dw(NULL, "SRMsg", "BkgColour", 0xFF000000); + colour = db_get_dw(0, "SRMsg", "BkgColour", 0xFF000000); if (colour != 0xFF000000) colourSet->background = colour; else @@ -1141,21 +1141,21 @@ Write user defined colours to the database */ void SetDBColour(MYCOLOURSET *colourSet) { - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, colourSet->incoming); - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, colourSet->outgoing); - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, colourSet->background); - db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, colourSet->text); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_IN_COL, colourSet->incoming); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_OUT_COL, colourSet->outgoing); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_BG_COL, colourSet->background); + db_set_dw(0, LINKLIST_MODULE, LINKLIST_TXT_COL, colourSet->text); } BYTE GetUpdateSetting(void) { BYTE updateWindow; - updateWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); + updateWindow = db_get_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); if (updateWindow == 0xFF) { // No DB entry for this Plugin - db_set_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); + db_set_b(0, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); return 0; } if (updateWindow == 0x00) diff --git a/plugins/HistorySweeperLight/src/historysweeperlight.cpp b/plugins/HistorySweeperLight/src/historysweeperlight.cpp index 176a87087e..230f8e4595 100644 --- a/plugins/HistorySweeperLight/src/historysweeperlight.cpp +++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp @@ -129,9 +129,9 @@ void SweepHistoryFromContact(MCONTACT hContact, CriteriaStruct Criteria, BOOL ke { int lPolicy; if (hContact == NULL) // for system history - lPolicy = db_get_b(NULL, ModuleName, "SweepSHistory", 0); + lPolicy = db_get_b(0, ModuleName, "SweepSHistory", 0); else // for contact history (or "SweepHistory" - default action) - lPolicy = db_get_b(hContact, ModuleName, "SweepHistory", db_get_b(NULL, ModuleName, "SweepHistory", 0)); + lPolicy = db_get_b(hContact, ModuleName, "SweepHistory", db_get_b(0, ModuleName, "SweepHistory", 0)); if (lPolicy == 0) return; // nothing to do @@ -139,7 +139,7 @@ void SweepHistoryFromContact(MCONTACT hContact, CriteriaStruct Criteria, BOOL ke if (eventsCnt == 0) return; - BOOL doDelete, unsafe = db_get_b(NULL, ModuleName, "UnsafeMode", 0); + BOOL doDelete, unsafe = db_get_b(0, ModuleName, "UnsafeMode", 0); BEventData *books, *item, ev = { 0 }; size_t bookcnt, btshift; @@ -196,8 +196,8 @@ void SweepHistoryFromContact(MCONTACT hContact, CriteriaStruct Criteria, BOOL ke void ShutdownAction(void) { CriteriaStruct Criteria; - Criteria.keep = KeepCriteria(db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)); - Criteria.time = BuildCriteria(db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)); + Criteria.keep = KeepCriteria(db_get_b(0, ModuleName, "StartupShutdownKeep", 0)); + Criteria.time = BuildCriteria(db_get_b(0, ModuleName, "StartupShutdownOlder", 0)); SweepHistoryFromContact(NULL, Criteria, FALSE); // sweep system history, keepunread==0 @@ -215,11 +215,11 @@ int OnWindowEvent(WPARAM, LPARAM lParam) break; case MSG_WINDOW_EVT_CLOSE: - if (db_get_b(NULL, ModuleName, "SweepOnClose", 0)) { + if (db_get_b(0, ModuleName, "SweepOnClose", 0)) { CriteriaStruct Criteria; - Criteria.keep = KeepCriteria(db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)); - Criteria.time = BuildCriteria(db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)); + Criteria.keep = KeepCriteria(db_get_b(0, ModuleName, "StartupShutdownKeep", 0)); + Criteria.time = BuildCriteria(db_get_b(0, ModuleName, "StartupShutdownOlder", 0)); SweepHistoryFromContact(msgEvData->hContact, Criteria, TRUE); } diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp index 3cc113a692..2f48385696 100644 --- a/plugins/HistorySweeperLight/src/main.cpp +++ b/plugins/HistorySweeperLight/src/main.cpp @@ -51,7 +51,7 @@ static int OnIconPressed(WPARAM hContact, LPARAM lParam) { StatusIconClickData *sicd = (StatusIconClickData *)lParam; - if (!(sicd->flags & MBCF_RIGHTBUTTON) && !mir_strcmp(sicd->szModule, ModuleName) && db_get_b(NULL, ModuleName, "ChangeInMW", 0)) { + if (!(sicd->flags & MBCF_RIGHTBUTTON) && !mir_strcmp(sicd->szModule, ModuleName) && db_get_b(0, ModuleName, "ChangeInMW", 0)) { int nh = sicd->dwId; StatusIconData sid = {}; @@ -72,7 +72,7 @@ static int OnIconPressed(WPARAM hContact, LPARAM lParam) static int OnModulesLoaded(WPARAM, LPARAM) { - int sweep = db_get_b(NULL, ModuleName, "SweepHistory", 0); + int sweep = db_get_b(0, ModuleName, "SweepHistory", 0); StatusIconData sid = {}; sid.szModule = ModuleName; @@ -81,9 +81,9 @@ static int OnModulesLoaded(WPARAM, LPARAM) if (sweep == 0) sid.szTooltip = LPGEN("Keep all events"); else if (sweep == 1) - sid.szTooltip = time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]; + sid.szTooltip = time_stamp_strings[db_get_b(0, ModuleName, "StartupShutdownOlder", 0)]; else if (sweep == 2) - sid.szTooltip = keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]; + sid.szTooltip = keep_strings[db_get_b(0, ModuleName, "StartupShutdownKeep", 0)]; else if (sweep == 3) sid.szTooltip = LPGEN("Delete all events"); @@ -92,13 +92,13 @@ static int OnModulesLoaded(WPARAM, LPARAM) sid.dwId = 1; sid.hIcon = LoadIconEx("act1"); - sid.szTooltip = time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]; + sid.szTooltip = time_stamp_strings[db_get_b(0, ModuleName, "StartupShutdownOlder", 0)]; sid.flags = MBF_HIDDEN; Srmm_AddIcon(&sid, &g_plugin); sid.dwId = 2; sid.hIcon = LoadIconEx("act2"); - sid.szTooltip = keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]; + sid.szTooltip = keep_strings[db_get_b(0, ModuleName, "StartupShutdownKeep", 0)]; sid.flags = MBF_HIDDEN; Srmm_AddIcon(&sid, &g_plugin); diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp index b3f902dfd0..1c54372f43 100644 --- a/plugins/HistorySweeperLight/src/options.cpp +++ b/plugins/HistorySweeperLight/src/options.cpp @@ -87,9 +87,9 @@ HANDLE hAllContacts, hSystemHistory; static void ShowAllContactIcons(HWND hwndList) { SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hAllContacts, - MAKELPARAM(0, db_get_b(NULL, ModuleName, "SweepHistory", 0))); + MAKELPARAM(0, db_get_b(0, ModuleName, "SweepHistory", 0))); SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hSystemHistory, - MAKELPARAM(0, db_get_b(NULL, ModuleName, "SweepSHistory", 0))); + MAKELPARAM(0, db_get_b(0, ModuleName, "SweepSHistory", 0))); for (auto &hContact : Contacts()) { HANDLE hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, hContact, 0); @@ -127,27 +127,27 @@ void LoadSettings(HWND hwndDlg) SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_ADDSTRING, 0, (LPARAM)ptszTimeStr); } - SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_SETCURSEL, db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0), 0); - SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_SETCURSEL, db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0), 0); + SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_SETCURSEL, db_get_b(0, ModuleName, "StartupShutdownOlder", 0), 0); + SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_SETCURSEL, db_get_b(0, ModuleName, "StartupShutdownKeep", 0), 0); - CheckDlgButton(hwndDlg, IDC_UNSAFEMODE, db_get_b(NULL, ModuleName, "UnsafeMode", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SWEEPONCLOSE, db_get_b(NULL, ModuleName, "SweepOnClose", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_HISTMW, db_get_b(NULL, ModuleName, "ChangeInMW", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_UNSAFEMODE, db_get_b(0, ModuleName, "UnsafeMode", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SWEEPONCLOSE, db_get_b(0, ModuleName, "SweepOnClose", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_HISTMW, db_get_b(0, ModuleName, "ChangeInMW", 0) ? BST_CHECKED : BST_UNCHECKED); } void SaveSettings(HWND hwndDlg) { HWND hwndList = GetDlgItem(hwndDlg, IDC_LIST); - db_set_b(NULL, ModuleName, "StartupShutdownOlder", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_GETCURSEL, 0, 0)); - db_set_b(NULL, ModuleName, "StartupShutdownKeep", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_GETCURSEL, 0, 0)); - db_set_b(NULL, ModuleName, "UnsafeMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UNSAFEMODE)); - db_set_b(NULL, ModuleName, "SweepOnClose", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SWEEPONCLOSE)); - db_set_b(NULL, ModuleName, "ChangeInMW", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HISTMW)); + db_set_b(0, ModuleName, "StartupShutdownOlder", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_GETCURSEL, 0, 0)); + db_set_b(0, ModuleName, "StartupShutdownKeep", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_GETCURSEL, 0, 0)); + db_set_b(0, ModuleName, "UnsafeMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UNSAFEMODE)); + db_set_b(0, ModuleName, "SweepOnClose", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SWEEPONCLOSE)); + db_set_b(0, ModuleName, "ChangeInMW", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HISTMW)); - db_set_b(NULL, ModuleName, "SweepHistory", + db_set_b(0, ModuleName, "SweepHistory", (BYTE)SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hAllContacts, 0)); - db_set_b(NULL, ModuleName, "SweepSHistory", + db_set_b(0, ModuleName, "SweepSHistory", (BYTE)SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hSystemHistory, 0)); for (auto &hContact : Contacts()) { @@ -164,26 +164,26 @@ void SaveSettings(HWND hwndDlg) SetSrmmIcon(UINT_PTR(it)); // set tooltips - int st = db_get_b(NULL, ModuleName, "SweepHistory", 0); + int st = db_get_b(0, ModuleName, "SweepHistory", 0); StatusIconData sid = {}; sid.szModule = ModuleName; sid.dwId = 0; sid.hIcon = LoadIconEx("actG"); if (st == 0) sid.szTooltip = LPGEN("Keep all events"); - else if (st == 1) sid.szTooltip = LPGEN(time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]); - else if (st == 2) sid.szTooltip = LPGEN(keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]); + else if (st == 1) sid.szTooltip = LPGEN(time_stamp_strings[db_get_b(0, ModuleName, "StartupShutdownOlder", 0)]); + else if (st == 2) sid.szTooltip = LPGEN(keep_strings[db_get_b(0, ModuleName, "StartupShutdownKeep", 0)]); else if (st == 3) sid.szTooltip = LPGEN("Delete all events"); Srmm_ModifyIcon(NULL, &sid); sid.dwId = 1; sid.hIcon = LoadIconEx("act1"); - sid.szTooltip = time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]; + sid.szTooltip = time_stamp_strings[db_get_b(0, ModuleName, "StartupShutdownOlder", 0)]; Srmm_ModifyIcon(NULL, &sid); sid.dwId = 2; sid.hIcon = LoadIconEx("act2"); - sid.szTooltip = keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]; + sid.szTooltip = keep_strings[db_get_b(0, ModuleName, "StartupShutdownKeep", 0)]; Srmm_ModifyIcon(NULL, &sid); } diff --git a/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp b/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp index 934b01863f..40e71c5d0c 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp @@ -87,11 +87,11 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) { case PSN_APPLY: // система просит сохранить настройки плагина code_Close = code_Close_tmp; - db_set_dw(0, MODULENAME, "Close", code_Close_tmp); + g_plugin.setDword("Close", code_Close_tmp); code_HideShow = code_HideShow_tmp; - db_set_dw(0, MODULENAME, "HideShow", code_HideShow_tmp); + g_plugin.setDword("HideShow", code_HideShow_tmp); code_ReadMsg = code_ReadMsg_tmp; - db_set_dw(0, MODULENAME, "ReadMsg", code_ReadMsg_tmp); + g_plugin.setDword("ReadMsg", code_ReadMsg_tmp); break; //case PSN_APPLY } break; //case 0 diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp index a9438690e2..0bba4387f7 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp @@ -88,9 +88,9 @@ CMPlugin::CMPlugin() : int CMPlugin::Load() { // загружаем (из БД) настройки плагина - code_Close = db_get_dw(0, MODULENAME, "Close", 0); - code_HideShow = db_get_dw(0, MODULENAME, "HideShow", 0); - code_ReadMsg = db_get_dw(0, MODULENAME, "ReadMsg", 0); + code_Close = g_plugin.getDword("Close", 0); + code_HideShow = g_plugin.getDword("HideShow", 0); + code_ReadMsg = g_plugin.getDword("ReadMsg", 0); // регистрация диалога опций HookEvent(ME_OPT_INITIALISE, initializeOptions); diff --git a/plugins/IEHistory/src/dlgHandlers.cpp b/plugins/IEHistory/src/dlgHandlers.cpp index 6e5b146434..5f75aaac66 100644 --- a/plugins/IEHistory/src/dlgHandlers.cpp +++ b/plugins/IEHistory/src/dlgHandlers.cpp @@ -241,8 +241,8 @@ int LoadEvents(HWND hWnd) { HistoryWindowData *data = (HistoryWindowData *)GetWindowLongPtr(hWnd, DWLP_USER); int count = db_event_count(data->contact); - int bLastFirst = db_get_b(NULL, MODULENAME, "ShowLastPageFirst", 0); - int bRTL = db_get_b(NULL, MODULENAME, "EnableRTL", 0); + int bLastFirst = g_plugin.getByte("ShowLastPageFirst", 0); + int bRTL = g_plugin.getByte("EnableRTL", 0); bRTL = db_get_b(data->contact, "Tab_SRMsg", "RTL", bRTL); data->bEnableRTL = bRTL; data->count = count; @@ -362,7 +362,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara TranslateDialogDefault(hWnd); SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)hIcon); { - int bRTL = db_get_b(NULL, MODULENAME, "EnableRTL", 0); + int bRTL = g_plugin.getByte("EnableRTL", 0); if (bRTL) SetWindowLongPtr(hWnd, GWL_EXSTYLE, WS_EX_RTLREADING); @@ -392,7 +392,7 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara LoadEvents(hWnd); { bool bAll = (data->itemsPerPage <= 0) || (data->itemsPerPage >= data->count); - int bLastFirst = db_get_b(NULL, MODULENAME, "ShowLastPageFirst", 0); + int bLastFirst = g_plugin.getByte("ShowLastPageFirst", 0); if (!bLastFirst) { EnableWindow(GetDlgItem(hWnd, IDC_PREV), FALSE); EnableWindow(GetDlgItem(hWnd, IDC_NEXT), !bAll); @@ -611,15 +611,15 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA case WM_INITDIALOG: TranslateDialogDefault(hWnd); { - int count = db_get_dw(NULL, MODULENAME, "EventsToLoad", 0); + int count = g_plugin.getDword("EventsToLoad", 0); EnableWindow(GetDlgItem(hWnd, IDC_EVENTS_COUNT), count > 0); EnableWindow(GetDlgItem(hWnd, IDC_SHOW_LAST_FIRST), count > 0); CheckDlgButton(hWnd, IDC_LOAD_ALL, count <= 0 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hWnd, IDC_LOAD_NUMBER, count > 0 ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_ENABLE_RTL, db_get_b(NULL, MODULENAME, "EnableRTL", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_SHOW_LAST_FIRST, db_get_b(NULL, MODULENAME, "ShowLastPageFirst", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hWnd, IDC_LOAD_BACKGROUND, db_get_b(NULL, MODULENAME, "UseWorkerThread", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_ENABLE_RTL, g_plugin.getByte("EnableRTL", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_SHOW_LAST_FIRST, g_plugin.getByte("ShowLastPageFirst", 0) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hWnd, IDC_LOAD_BACKGROUND, g_plugin.getByte("UseWorkerThread", 0) ? BST_CHECKED : BST_UNCHECKED); wchar_t buffer[40]; _itow_s(count, buffer, 10); @@ -664,10 +664,10 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hWnd, UINT msg, WPARAM wParam, LPARA count = _wtol(buffer); count = (count < 0) ? 0 : count; } - db_set_b(NULL, MODULENAME, "ShowLastPageFirst", IsDlgButtonChecked(hWnd, IDC_SHOW_LAST_FIRST)); - db_set_b(NULL, MODULENAME, "EnableRTL", IsDlgButtonChecked(hWnd, IDC_ENABLE_RTL)); - db_set_b(NULL, MODULENAME, "UseWorkerThread", IsDlgButtonChecked(hWnd, IDC_LOAD_BACKGROUND)); - db_set_dw(NULL, MODULENAME, "EventsToLoad", count); + g_plugin.setByte("ShowLastPageFirst", IsDlgButtonChecked(hWnd, IDC_SHOW_LAST_FIRST)); + g_plugin.setByte("EnableRTL", IsDlgButtonChecked(hWnd, IDC_ENABLE_RTL)); + g_plugin.setByte("UseWorkerThread", IsDlgButtonChecked(hWnd, IDC_LOAD_BACKGROUND)); + g_plugin.setDword("EventsToLoad", count); } } break; diff --git a/plugins/IEHistory/src/services.cpp b/plugins/IEHistory/src/services.cpp index 464072b8e3..ec5210e8df 100644 --- a/plugins/IEHistory/src/services.cpp +++ b/plugins/IEHistory/src/services.cpp @@ -34,8 +34,8 @@ INT_PTR ShowContactHistoryService(WPARAM wParam, LPARAM) HWND parent = nullptr; historyDlg = WindowList_Find(hOpenWindowsList, (MCONTACT)wParam); if (historyDlg == nullptr){ - int count = db_get_dw(NULL, MODULENAME, "EventsToLoad", 0); - int loadInBackground = db_get_b(NULL, MODULENAME, "UseWorkerThread", 0); + int count = g_plugin.getDword("EventsToLoad", 0); + int loadInBackground = g_plugin.getByte("UseWorkerThread", 0); HistoryWindowData *data; data = (HistoryWindowData *)malloc(sizeof(HistoryWindowData)); data->contact = (MCONTACT)wParam; diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp index 8c14599e6c..0c95589461 100644 --- a/plugins/IEView/src/ChatHTMLBuilder.cpp +++ b/plugins/IEView/src/ChatHTMLBuilder.cpp @@ -51,29 +51,29 @@ void ChatHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) DBVARIANT dbv; if (colour) { mir_snprintf(str, "Font%dCol", i); - *colour = db_get_dw(NULL, CHATFONTMOD, str, 0x000000); + *colour = db_get_dw(0, CHATFONTMOD, str, 0x000000); } if (lf) { mir_snprintf(str, "Font%dSize", i); - lf->lfHeight = (char)db_get_b(NULL, CHATFONTMOD, str, 10); + lf->lfHeight = (char)db_get_b(0, CHATFONTMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; mir_snprintf(str, "Font%dSty", i); - style = db_get_b(NULL, CHATFONTMOD, str, 0); + style = db_get_b(0, CHATFONTMOD, str, 0); lf->lfWeight = style & FONTF_BOLD ? FW_BOLD : FW_NORMAL; lf->lfItalic = style & FONTF_ITALIC ? 1 : 0; lf->lfUnderline = style & FONTF_UNDERLINE ? 1 : 0; lf->lfStrikeOut = 0; mir_snprintf(str, "Font%dSet", i); - lf->lfCharSet = db_get_b(NULL, CHATFONTMOD, str, DEFAULT_CHARSET); + lf->lfCharSet = db_get_b(0, CHATFONTMOD, str, DEFAULT_CHARSET); lf->lfOutPrecision = OUT_DEFAULT_PRECIS; lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; mir_snprintf(str, "Font%d", i); - if (db_get_s(NULL, CHATFONTMOD, str, &dbv)) + if (db_get_s(0, CHATFONTMOD, str, &dbv)) strncpy_s(lf->lfFaceName, "Verdana", _TRUNCATE); else { strncpy_s(lf->lfFaceName, dbv.pszVal, _TRUNCATE); @@ -115,7 +115,7 @@ void ChatHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) ReleaseDC(nullptr, hdc); str.Append(""); str.Append("