From 007b4c7301f0d26a72f89f74e9929f42e24eb3e6 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 5 Apr 2013 22:27:16 +0000 Subject: - rest of menus cleared; - old database macroses wiped out from all plugins (left in m_database.h for compatibility) git-svn-id: http://svn.miranda-ng.org/main/trunk@4324 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/AVS/src/main.cpp | 30 +- plugins/AVS/src/options.cpp | 16 +- plugins/AddContactPlus/src/addcontact.cpp | 14 +- plugins/Alarms/src/alarmlist.cpp | 32 +- plugins/Alarms/src/options.cpp | 8 +- plugins/AssocMgr/src/assoclist.cpp | 36 +- plugins/AssocMgr/src/reg.cpp | 4 +- plugins/AssocMgr/src/test.cpp | 2 +- plugins/AuthState/src/main.cpp | 4 +- plugins/AuthState/src/options.cpp | 8 +- plugins/AutoShutdown/src/frame.cpp | 8 +- plugins/AutoShutdown/src/options.cpp | 24 +- plugins/AutoShutdown/src/settingsdlg.cpp | 26 +- plugins/AutoShutdown/src/shutdownsvc.cpp | 6 +- plugins/AutoShutdown/src/watcher.cpp | 26 +- plugins/AvatarHistory/src/AvatarDlg.cpp | 11 +- plugins/AvatarHistory/src/AvatarHistory.cpp | 10 +- plugins/AvatarHistory/src/AvatarHistory.h | 2 +- plugins/BASS_interface/src/Main.cpp | 6 +- plugins/BasicHistory/src/BasicHistory.cpp | 14 +- plugins/BasicHistory/src/HistoryWindow.cpp | 28 +- plugins/BasicHistory/src/Options.cpp | 360 ++++++++-------- plugins/Boltun/src/actionQueue.cpp | 8 +- plugins/Boltun/src/boltun.cpp | 24 +- plugins/Boltun/src/config.cpp | 14 +- plugins/BossKeyPlus/src/BossKey.cpp | 46 +- plugins/BossKeyPlus/src/BossKeyIdle.cpp | 2 +- plugins/BossKeyPlus/src/Options.cpp | 26 +- plugins/BuddyExpectator/src/BuddyExpectator.cpp | 17 +- plugins/BuddyExpectator/src/options.cpp | 2 +- plugins/BuddyPounce/src/dialog.cpp | 10 +- plugins/BuddyPounce/src/main.cpp | 4 +- plugins/CSList/src/cslist.cpp | 4 +- plugins/ChangeKeyboardLayout/src/hook_events.cpp | 78 ++-- plugins/ChangeKeyboardLayout/src/options.cpp | 4 +- .../ClientChangeNotify/src/ClientChangeNotify.cpp | 32 +- plugins/ClientChangeNotify/src/OptDlg.cpp | 2 +- plugins/Clist_blind/src/clcopts.cpp | 46 +- plugins/Clist_blind/src/clistopts.cpp | 80 ++-- plugins/Clist_blind/src/cluiopts.cpp | 110 ++--- plugins/Clist_blind/src/commonheaders.h | 2 +- plugins/Clist_blind/src/init.cpp | 6 +- plugins/Clist_modern/src/hdr/modern_static_clui.h | 4 +- plugins/Clist_modern/src/modern_cachefuncs.cpp | 24 +- plugins/Clist_modern/src/modern_clc.cpp | 2 +- plugins/Clist_modern/src/modern_clcitems.cpp | 2 +- plugins/Clist_modern/src/modern_clcopts.cpp | 14 +- plugins/Clist_modern/src/modern_clcutils.cpp | 8 +- plugins/Clist_modern/src/modern_clistevents.cpp | 2 +- plugins/Clist_modern/src/modern_clistopts.cpp | 8 +- plugins/Clist_modern/src/modern_clistsettings.cpp | 2 +- plugins/Clist_modern/src/modern_clisttray.cpp | 6 +- plugins/Clist_modern/src/modern_clui.cpp | 37 +- plugins/Clist_modern/src/modern_cluiframes.cpp | 8 +- plugins/Clist_modern/src/modern_newrowopts.cpp | 2 +- plugins/Clist_modern/src/modern_statusbar.cpp | 2 +- plugins/Clist_modern/src/modern_viewmodebar.cpp | 14 +- plugins/Clist_mw/src/BkgrCfg.cpp | 16 +- plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp | 36 +- plugins/Clist_mw/src/CLUIFrames/statusbar.cpp | 10 +- plugins/Clist_mw/src/clc.cpp | 4 +- plugins/Clist_mw/src/clcitems.cpp | 10 +- plugins/Clist_mw/src/clcopts.cpp | 52 +-- plugins/Clist_mw/src/clistmod.cpp | 10 +- plugins/Clist_mw/src/clistopts.cpp | 10 +- plugins/Clist_mw/src/clistsettings.cpp | 4 +- plugins/Clist_mw/src/clui.cpp | 20 +- plugins/Clist_mw/src/cluiopts.cpp | 18 +- plugins/Clist_mw/src/cluiservices.cpp | 8 +- plugins/Clist_mw/src/commonheaders.h | 2 +- plugins/Clist_mw/src/contact.cpp | 2 +- plugins/Clist_nicer/skineditor/src/main.cpp | 4 +- plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp | 2 +- plugins/Clist_nicer/src/Include/commonheaders.h | 2 +- plugins/Clist_nicer/src/clcitems.cpp | 6 +- plugins/Clist_nicer/src/clcopts.cpp | 4 +- plugins/Clist_nicer/src/clistmenus.cpp | 6 +- plugins/Clist_nicer/src/clistmod.cpp | 2 +- plugins/Clist_nicer/src/clistopts.cpp | 4 +- plugins/Clist_nicer/src/clisttray.cpp | 2 +- plugins/Clist_nicer/src/clui.cpp | 10 +- plugins/Clist_nicer/src/cluiopts.cpp | 2 +- plugins/Clist_nicer/src/cluiservices.cpp | 2 +- plugins/Clist_nicer/src/config.cpp | 40 +- plugins/Clist_nicer/src/contact.cpp | 4 +- plugins/Clist_nicer/src/extBackg.cpp | 16 +- plugins/Clist_nicer/src/viewmodes.cpp | 20 +- plugins/CmdLine/src/mimcmd_handlers.cpp | 44 +- plugins/CmdLine/src/utils.cpp | 4 +- plugins/CommonLibs/CString.cpp | 6 +- plugins/CommonLibs/CString.h | 8 +- plugins/CommonLibs/Options.cpp | 42 +- plugins/CommonLibs/Options.h | 2 +- plugins/Console/src/Console.cpp | 28 +- plugins/ContactsPlus/src/main.cpp | 12 +- plugins/ContactsPlus/src/receive.cpp | 2 +- plugins/ContactsPlus/src/send.cpp | 4 +- plugins/ContactsPlus/src/utils.cpp | 14 +- plugins/CountryFlags/src/extraimg.cpp | 14 +- plugins/CrashDumper/src/crshdmp.cpp | 6 +- plugins/CrashDumper/src/ui.cpp | 24 +- plugins/CrashDumper/src/upload.cpp | 16 +- plugins/CrashDumper/src/utils.cpp | 2 +- plugins/Db3x/src/dbintf3x.cpp | 4 +- plugins/DbEditorPP/src/addeditsettingsdlg.cpp | 36 +- plugins/DbEditorPP/src/copymodule.cpp | 12 +- plugins/DbEditorPP/src/deletemodule.cpp | 9 +- plugins/DbEditorPP/src/exportimport.cpp | 26 +- plugins/DbEditorPP/src/findwindow.cpp | 26 +- plugins/DbEditorPP/src/headers.h | 2 +- plugins/DbEditorPP/src/knownmodules.cpp | 6 +- plugins/DbEditorPP/src/main.cpp | 30 +- plugins/DbEditorPP/src/main_window.cpp | 56 +-- plugins/DbEditorPP/src/modules.cpp | 20 +- plugins/DbEditorPP/src/moduletree.cpp | 16 +- plugins/DbEditorPP/src/options.cpp | 44 +- plugins/DbEditorPP/src/settinglist.cpp | 94 ++-- plugins/DbEditorPP/src/watchedvars.cpp | 12 +- plugins/Db_autobackups/src/backup.cpp | 4 +- plugins/Db_autobackups/src/options.cpp | 32 +- plugins/FTPFileYM/src/ftpfile.cpp | 36 +- plugins/FTPFileYM/src/mir_db.cpp | 8 +- plugins/FavContacts/src/favlist.h | 10 +- plugins/FavContacts/src/http_api.cpp | 2 +- plugins/FavContacts/src/main.cpp | 100 ++--- plugins/FileAsMessage/src/dialog.cpp | 24 +- plugins/FileAsMessage/src/optionsdlg.cpp | 10 +- plugins/FingerprintNG/src/fingerprint.cpp | 2 +- plugins/FlashAvatars/src/cflash.cpp | 2 +- plugins/FloatingContacts/src/main.cpp | 39 +- plugins/FloatingContacts/src/options.cpp | 6 +- plugins/FloatingContacts/src/thumbs.cpp | 2 +- plugins/Folders/src/utils.cpp | 2 +- plugins/HTTPServer/src/GuiElements.cpp | 26 +- plugins/HistoryLinkListPlus/src/linklist_dlg.cpp | 38 +- plugins/HistoryLinkListPlus/src/linklist_fct.cpp | 124 +++--- .../src/historysweeperlight.cpp | 18 +- plugins/HistorySweeperLight/src/main.cpp | 16 +- plugins/HistorySweeperLight/src/options.cpp | 44 +- plugins/IEView/src/ChatHTMLBuilder.cpp | 16 +- plugins/IEView/src/HistoryHTMLBuilder.cpp | 20 +- plugins/IEView/src/MUCCHTMLBuilder.cpp | 14 +- plugins/IEView/src/Options.cpp | 98 ++--- plugins/IEView/src/ScriverHTMLBuilder.cpp | 44 +- plugins/IEView/src/TabSRMMHTMLBuilder.cpp | 42 +- plugins/IEView/src/TemplateHTMLBuilder.cpp | 12 +- plugins/IgnoreState/src/main.cpp | 4 +- plugins/IgnoreState/src/options.cpp | 4 +- plugins/Import/src/import.cpp | 2 +- plugins/Import/src/main.cpp | 4 +- plugins/Import/src/miranda.cpp | 4 +- plugins/Import/src/utils.cpp | 12 +- plugins/Import/src/wizard.cpp | 2 +- plugins/KeyboardNotify/src/flash.cpp | 8 +- plugins/KeyboardNotify/src/ignore.cpp | 10 +- plugins/KeyboardNotify/src/main.cpp | 90 ++-- plugins/KeyboardNotify/src/options.cpp | 120 +++--- plugins/KeyboardNotify/src/trigger.cpp | 22 +- plugins/MenuItemEx/src/main.cpp | 471 +++++++++------------ plugins/MenuItemEx/src/options.cpp | 4 +- plugins/MetaContacts/src/meta_menu.cpp | 151 ++++--- plugins/MetaContacts/src/meta_services.cpp | 30 +- plugins/MetaContacts/src/metacontacts.h | 2 +- plugins/MirOTR/MirOTR/src/dbfilter.cpp | 2 +- plugins/MirOTR/MirOTR/src/dllmain.cpp | 5 +- plugins/MirOTR/MirOTR/src/options.cpp | 60 ++- plugins/MirOTR/MirOTR/src/otr.cpp | 6 +- plugins/MirOTR/MirOTR/src/svcs_menu.cpp | 53 +-- plugins/MirOTR/MirOTR/src/svcs_menu.h | 1 - plugins/MirOTR/MirOTR/src/svcs_srmm.cpp | 8 +- plugins/MirOTR/MirOTR/src/utils.cpp | 4 +- plugins/ModernOpt/src/modernopt.cpp | 2 +- plugins/MsgPopup/src/main.cpp | 8 +- plugins/MsgPopup/src/options.cpp | 4 +- plugins/Msg_Export/src/options.cpp | 4 +- plugins/Msg_Export/src/utils.cpp | 2 +- plugins/MyDetails/src/data.cpp | 12 +- plugins/MyDetails/src/frame.cpp | 10 +- plugins/NewEventNotify/src/main.cpp | 2 +- plugins/NewEventNotify/src/options.cpp | 136 +++--- plugins/NewXstatusNotify/src/main.cpp | 2 +- plugins/New_GPG/src/init.cpp | 48 +-- plugins/New_GPG/src/main.cpp | 144 +++---- plugins/New_GPG/src/messages.cpp | 84 ++-- plugins/New_GPG/src/options.cpp | 128 +++--- plugins/New_GPG/src/srmm.cpp | 14 +- plugins/New_GPG/src/utilities.cpp | 70 +-- plugins/NewsAggregator/Src/Options.cpp | 20 +- plugins/NewsAggregator/Src/Utils.cpp | 6 +- plugins/NoHistory/src/dllmain.cpp | 14 +- plugins/Non-IM Contact/src/contactinfo.cpp | 2 +- plugins/Non-IM Contact/src/services.cpp | 2 +- plugins/NotesAndReminders/src/notes.cpp | 4 +- plugins/NotesAndReminders/src/options.cpp | 8 +- plugins/NotesAndReminders/src/reminders.cpp | 8 +- plugins/NotifyAnything/src/options.cpp | 8 +- plugins/Nudge/src/main.cpp | 12 +- plugins/Nudge/src/nudge.cpp | 69 ++- plugins/Nudge/src/nudge.h | 3 +- plugins/Nudge/src/shake.cpp | 8 +- plugins/PackUpdater/Src/Notifications.cpp | 20 +- plugins/PackUpdater/Src/Options.cpp | 40 +- plugins/PackUpdater/Src/Utils.cpp | 82 ++-- plugins/PasteIt/src/Options.cpp | 56 +-- plugins/PasteIt/src/PasteIt.cpp | 19 +- plugins/Ping/src/icmp.cpp | 4 +- plugins/Ping/src/log.cpp | 6 +- plugins/Ping/src/options.cpp | 48 +-- plugins/Ping/src/ping.cpp | 8 +- plugins/Ping/src/pinggraph.cpp | 22 +- plugins/Ping/src/pinglist.cpp | 66 +-- plugins/Ping/src/pingthread.cpp | 30 +- plugins/Ping/src/utils.cpp | 22 +- plugins/PluginUpdater/src/Common.h | 6 +- plugins/PluginUpdater/src/Events.cpp | 4 +- plugins/PluginUpdater/src/Notifications.cpp | 6 +- plugins/PluginUpdater/src/Options.cpp | 34 +- plugins/PluginUpdater/src/Scanner.cpp | 12 +- plugins/PluginUpdater/src/Utils.cpp | 38 +- plugins/Popup/src/actions.cpp | 8 +- plugins/Popup/src/common.h | 2 +- plugins/Popup/src/config.cpp | 2 +- plugins/Popup/src/font.cpp | 4 +- plugins/Popup/src/headers.h | 2 +- plugins/Popup/src/history.cpp | 2 +- plugins/Popup/src/main.cpp | 6 +- plugins/Popup/src/notifications.cpp | 16 +- plugins/Popup/src/opt_adv.cpp | 38 +- plugins/Popup/src/opt_class.cpp | 16 +- plugins/Popup/src/opt_gen.cpp | 30 +- plugins/Popup/src/opt_skins.cpp | 4 +- plugins/Popup/src/services.cpp | 8 +- plugins/Popup/src/skin.cpp | 2 +- plugins/QuickContacts/src/options.cpp | 16 +- plugins/QuickContacts/src/quickcontacts.cpp | 40 +- plugins/QuickMessages/src/Utils.cpp | 40 +- plugins/QuickMessages/src/main.cpp | 8 +- plugins/QuickMessages/src/options.cpp | 22 +- plugins/QuickReplies/src/events.cpp | 12 +- plugins/QuickReplies/src/options.cpp | 18 +- plugins/Quotes/src/CommonOptionDlg.cpp | 14 +- plugins/Quotes/src/CurrencyConverter.cpp | 4 +- plugins/Quotes/src/DBUtils.cpp | 2 +- plugins/Quotes/src/ImportExport.cpp | 2 +- plugins/Quotes/src/Log.cpp | 2 +- plugins/Quotes/src/ModuleInfo.cpp | 2 +- plugins/Quotes/src/QuoteChart.cpp | 4 +- plugins/Quotes/src/QuotesProviderBase.cpp | Bin 57572 -> 56912 bytes plugins/Quotes/src/QuotesProviderDukasCopy.cpp | Bin 14520 -> 14444 bytes plugins/Quotes/src/QuotesProviderFinance.cpp | 4 +- plugins/Quotes/src/QuotesProviderGoogle.cpp | 8 +- plugins/Quotes/src/QuotesProviderGoogleFinance.cpp | 2 +- plugins/Quotes/src/QuotesProviderYahoo.cpp | 4 +- plugins/Quotes/src/QuotesProviders.cpp | 8 +- plugins/Quotes/src/SettingsDlg.cpp | 102 ++--- plugins/Rate/src/main.cpp | 2 +- plugins/RecentContacts/src/RecentContacts.cpp | 16 +- plugins/RecentContacts/src/options.cpp | 6 +- plugins/SMS/src/SMS_svc.cpp | 2 +- plugins/SMS/src/common.h | 60 ++- plugins/SMS/src/functions.cpp | 29 +- plugins/SMS/src/recvdlg.cpp | 4 +- plugins/SMS/src/senddlg.cpp | 8 +- plugins/Scriver/src/chat/clist.cpp | 12 +- plugins/Scriver/src/chat/log.cpp | 2 +- plugins/Scriver/src/chat/manager.cpp | 8 +- plugins/Scriver/src/chat/options.cpp | 54 +-- plugins/Scriver/src/chat/services.cpp | 8 +- plugins/Scriver/src/chat/tools.cpp | 2 +- plugins/Scriver/src/chat/window.cpp | 10 +- plugins/Scriver/src/globals.cpp | 22 +- plugins/Scriver/src/infobar.cpp | 2 +- plugins/Scriver/src/msgdialog.cpp | 6 +- plugins/Scriver/src/msglog.cpp | 12 +- plugins/Scriver/src/msgoptions.cpp | 42 +- plugins/Scriver/src/msgwindow.cpp | 16 +- plugins/Scriver/src/sendqueue.cpp | 2 +- plugins/SecureIM/src/commonheaders.cpp | 3 +- plugins/SecureIM/src/commonheaders.h | 3 +- plugins/SecureIM/src/crypt_dll.cpp | 2 +- plugins/SecureIM/src/crypt_lists.cpp | 2 +- plugins/SecureIM/src/main.cpp | 9 +- plugins/SecureIM/src/options.cpp | 8 +- plugins/SecureIM/src/popupOptions.cpp | 18 +- plugins/SecureIM/src/splitmsg.cpp | 2 +- plugins/SecureIM/src/svcs_clist.cpp | 61 +-- plugins/SecureIM/src/svcs_proto.cpp | 4 +- plugins/SecureIM/src/svcs_rsa.cpp | 4 +- plugins/SeenPlugin/src/file.cpp | 6 +- plugins/SeenPlugin/src/history.cpp | 4 +- plugins/SeenPlugin/src/main.cpp | 1 - plugins/SeenPlugin/src/menu.cpp | 17 +- plugins/SeenPlugin/src/options.cpp | 14 +- plugins/SeenPlugin/src/seen.h | 4 +- plugins/SeenPlugin/src/userinfo.cpp | 2 +- plugins/SeenPlugin/src/utils.cpp | 22 +- plugins/SendScreenshotPlus/src/CSend.cpp | 2 +- plugins/SendScreenshotPlus/src/UMainForm.cpp | 60 +-- plugins/SendScreenshotPlus/src/dlg_msgbox.cpp | 4 +- plugins/Sessions/Src/Main.cpp | 80 ++-- plugins/Sessions/Src/Options.cpp | 42 +- plugins/Sessions/Src/Utils.cpp | 110 ++--- plugins/SimpleAR/src/Main.cpp | 54 +-- plugins/SimpleAR/src/Options.cpp | 24 +- plugins/SimpleStatusMsg/src/awaymsg.cpp | 69 ++- plugins/SimpleStatusMsg/src/main.cpp | 172 ++++---- plugins/SimpleStatusMsg/src/msgbox.cpp | 126 +++--- plugins/SimpleStatusMsg/src/options.cpp | 204 ++++----- plugins/SimpleStatusMsg/src/utils.cpp | 8 +- plugins/SmileyAdd/src/general.h | 3 +- plugins/SmileyAdd/src/main.cpp | 3 +- plugins/SmileyAdd/src/options.cpp | 10 +- plugins/SmileyAdd/src/services.cpp | 14 +- plugins/SpellChecker/src/dictionary.cpp | 2 +- plugins/SpellChecker/src/options.cpp | 4 +- plugins/SpellChecker/src/utils.cpp | 20 +- plugins/SplashScreen/src/main.cpp | 20 +- plugins/SplashScreen/src/options.cpp | 78 ++-- .../AdvancedAutoAway/advancedautoaway.cpp | 40 +- .../StatusPlugins/AdvancedAutoAway/msgoptions.cpp | 10 +- plugins/StatusPlugins/AdvancedAutoAway/options.cpp | 50 +-- .../StatusPlugins/AdvancedAutoAway/trigger_aaa.cpp | 6 +- plugins/StatusPlugins/KeepStatus/keepstatus.cpp | 26 +- plugins/StatusPlugins/KeepStatus/options.cpp | 104 ++--- plugins/StatusPlugins/StartupStatus/options.cpp | 4 +- plugins/StatusPlugins/StartupStatus/profiles.cpp | 6 +- .../StatusPlugins/StartupStatus/startupstatus.cpp | 4 +- plugins/StatusPlugins/StartupStatus/toolbars.cpp | 2 +- plugins/StopSpamMod/src/stopspam.cpp | 2 +- plugins/StopSpamMod/src/utilities.cpp | 16 +- plugins/StopSpamPlus/src/events.cpp | 32 +- plugins/StopSpamPlus/src/services.cpp | 18 +- plugins/StopSpamPlus/src/settings.cpp | 20 +- plugins/StopSpamPlus/src/utils.cpp | 2 +- plugins/TabSRMM/src/buttonsbar.cpp | 8 +- plugins/TabSRMM/src/chat/clist.cpp | 22 +- plugins/TabSRMM/src/chat/main.cpp | 4 +- plugins/TabSRMM/src/chat/manager.cpp | 12 +- plugins/TabSRMM/src/chat/muchighlight.cpp | 4 +- plugins/TabSRMM/src/chat/options.cpp | 12 +- plugins/TabSRMM/src/chat/services.cpp | 6 +- plugins/TabSRMM/src/chat/tools.cpp | 2 +- plugins/TabSRMM/src/chat/window.cpp | 10 +- plugins/TabSRMM/src/contactcache.cpp | 6 +- plugins/TabSRMM/src/container.cpp | 26 +- plugins/TabSRMM/src/controls.cpp | 2 +- plugins/TabSRMM/src/eventpopups.cpp | 2 +- plugins/TabSRMM/src/generic_msghandlers.cpp | 14 +- plugins/TabSRMM/src/hotkeyhandler.cpp | 2 +- plugins/TabSRMM/src/infopanel.cpp | 6 +- plugins/TabSRMM/src/mim.cpp | 30 +- plugins/TabSRMM/src/modplus.cpp | 6 +- plugins/TabSRMM/src/msgdialog.cpp | 10 +- plugins/TabSRMM/src/msgdlgutils.cpp | 6 +- plugins/TabSRMM/src/msgoptions.cpp | 18 +- plugins/TabSRMM/src/selectcontainer.cpp | 2 +- plugins/TabSRMM/src/sendlater.cpp | 8 +- plugins/TabSRMM/src/sendqueue.cpp | 6 +- plugins/TabSRMM/src/templates.cpp | 2 +- plugins/TabSRMM/src/themeio.cpp | 10 +- plugins/TabSRMM/src/themes.cpp | 4 +- plugins/TabSRMM/src/utils.cpp | 10 +- plugins/TipperYM/src/message_pump.cpp | 8 +- plugins/TipperYM/src/options.cpp | 336 +++++++-------- plugins/TipperYM/src/popwin.cpp | 36 +- plugins/TipperYM/src/skin_parser.cpp | 8 +- plugins/TipperYM/src/subst.cpp | 54 +-- plugins/TipperYM/src/tipper.cpp | 4 +- plugins/TipperYM/src/translations.cpp | 156 +++---- plugins/TopToolBar/src/toolbarwnd.cpp | 8 +- plugins/TopToolBar/src/topbutton.cpp | 4 +- plugins/TranslitSwitcher/src/Layoutproc.cpp | 12 +- plugins/UserGuide/src/main.cpp | 4 +- plugins/UserInfoEx/src/Flags/svc_flags.cpp | 4 +- plugins/UserInfoEx/src/svc_avatar.cpp | 2 +- plugins/UserInfoEx/src/svc_email.cpp | 13 +- plugins/UserInfoEx/src/svc_homepage.cpp | 18 +- plugins/Utils/mir_options.cpp | 48 +-- plugins/Variables/src/action_variables.cpp | 4 +- plugins/Variables/src/condition_variables.cpp | 4 +- plugins/Variables/src/contact.cpp | 14 +- plugins/Variables/src/dbhelpers.h | 38 +- plugins/Variables/src/help.cpp | 2 +- plugins/Variables/src/options.cpp | 4 +- plugins/Variables/src/parse_miranda.cpp | 40 +- plugins/Variables/src/trigger_variables.cpp | 6 +- plugins/VersionInfo/src/CVersionInfo.cpp | 16 +- plugins/VersionInfo/src/dlgHandlers.cpp | 106 ++--- plugins/VersionInfo/src/services.cpp | 2 +- plugins/VersionInfo/src/utils.cpp | 2 +- plugins/Watrack_MPD/src/init.cpp | 2 +- plugins/Watrack_MPD/src/options.cpp | 8 +- plugins/Watrack_MPD/src/utilities.cpp | 4 +- plugins/WhoUsesMyFiles/src/wumfplug.cpp | 2 +- plugins/XSoundNotify/src/xsn_main.cpp | 7 +- plugins/YAMN/src/browser/mailbrowser.cpp | 36 +- plugins/YAMN/src/main.cpp | 33 +- plugins/YAMN/src/proto/pop3/pop3comm.cpp | 22 +- plugins/YAMN/src/proto/pop3/pop3opt.cpp | 18 +- plugins/YAMN/src/services.cpp | 40 +- plugins/YAMN/src/yamn.cpp | 4 +- plugins/YAMN/src/yamn.h | 2 +- plugins/YAPP/src/options.cpp | 2 +- plugins/YAPP/src/services.cpp | 2 +- plugins/ZeroNotification/src/main.cpp | 38 +- plugins/mTextControl/src/textusers.cpp | 8 +- 406 files changed, 4504 insertions(+), 4846 deletions(-) (limited to 'plugins') diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index beff99167f..7cee95c5ff 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -248,7 +248,7 @@ static void NotifyMetaAware(HANDLE hContact, struct CacheNode *node = NULL, AVAT char *szProto = GetContactProto(hContact); if (szProto != NULL) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingString(hContact, szProto, "AvatarHash", &dbv)) { + if ( !db_get_s(hContact, szProto, "AvatarHash", &dbv)) { if (dbv.type == DBVT_TCHAR) { _tcsncpy(cacn.hash, dbv.ptszVal, SIZEOF(cacn.hash)); } else if (dbv.type == DBVT_BLOB) { @@ -372,7 +372,7 @@ void MakePathRelative(HANDLE hContact, TCHAR *path) static void MakePathRelative(HANDLE hContact) { DBVARIANT dbv; - if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) { + if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { MakePathRelative(hContact, dbv.ptszVal); db_free(&dbv); } @@ -390,10 +390,10 @@ static TCHAR *getJGMailID(char *szProto) static TCHAR szJID[MAX_PATH+1]; szJID[0] = '\0'; DBVARIANT dbva, dbvb; - if ( DBGetContactSettingTString(NULL, szProto, "LoginName", &dbva)) + if ( db_get_ts(NULL, szProto, "LoginName", &dbva)) return szJID; - if ( DBGetContactSettingTString(NULL, szProto, "LoginServer", &dbvb)) { + if ( db_get_ts(NULL, szProto, "LoginServer", &dbvb)) { db_free(&dbva); return szJID; } @@ -430,15 +430,15 @@ int CreateAvatarInCache(HANDLE hContact, avatarCacheEntry *ace, char *szProto) } if (db_get_b(hContact, "ContactPhoto", "Locked", 0) - && !DBGetContactSettingTString(hContact, "ContactPhoto", "Backup", &dbv)) { + && !db_get_ts(hContact, "ContactPhoto", "Backup", &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, tszFilename); db_free(&dbv); } - else if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "RFile", &dbv)) { + else if ( !db_get_ts(hContact, "ContactPhoto", "RFile", &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, tszFilename); db_free(&dbv); } - else if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) { + else if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, tszFilename); db_free(&dbv); } @@ -448,13 +448,13 @@ int CreateAvatarInCache(HANDLE hContact, avatarCacheEntry *ace, char *szProto) } else { if (hContact == 0) { // create a protocol picture in the proto picture cache - if ( !DBGetContactSettingTString(NULL, PPICT_MODULE, szProto, &dbv)) { + if ( !db_get_ts(NULL, PPICT_MODULE, szProto, &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, tszFilename); db_free(&dbv); } else { if (lstrcmpA(szProto, AVS_DEFAULT)) { - if ( !DBGetContactSettingTString(NULL, PPICT_MODULE, AVS_DEFAULT, &dbv)) { + if ( !db_get_ts(NULL, PPICT_MODULE, AVS_DEFAULT, &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, tszFilename); db_free(&dbv); } @@ -465,7 +465,7 @@ int CreateAvatarInCache(HANDLE hContact, avatarCacheEntry *ace, char *szProto) return -1; char key[MAX_PATH]; mir_snprintf(key, SIZEOF(key), "Global avatar for %s accounts", pdescr->szProtoName); - if ( !DBGetContactSettingTString(NULL, PPICT_MODULE, key, &dbv)) { + if ( !db_get_ts(NULL, PPICT_MODULE, key, &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, tszFilename); db_free(&dbv); } @@ -477,7 +477,7 @@ int CreateAvatarInCache(HANDLE hContact, avatarCacheEntry *ace, char *szProto) // startup and everytime they are changed. if (szProto[0] == '\0') { // Global avatar - if ( DBGetContactSettingTString(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) + if ( db_get_ts(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) return -10; AVS_pathToAbsolute(dbv.ptszVal, tszFilename); @@ -494,7 +494,7 @@ int CreateAvatarInCache(HANDLE hContact, avatarCacheEntry *ace, char *szProto) else MultiByteToWideChar( CP_ACP, 0, szFileName, -1, tszFilename, SIZEOF(tszFilename)); } - else if ( !DBGetContactSettingTString(NULL, szProto, "AvatarFile", &dbv)) { + else if ( !db_get_ts(NULL, szProto, "AvatarFile", &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, tszFilename); db_free(&dbv); } @@ -546,7 +546,7 @@ int CreateAvatarInCache(HANDLE hContact, avatarCacheEntry *ace, char *szProto) if (imgHash != db_get_dw(hContact, "ContactPhoto", "ImageHash", 0)) { ResetTranspSettings(hContact); - DBWriteContactSettingDword(hContact, "ContactPhoto", "ImageHash", imgHash); + db_set_dw(hContact, "ContactPhoto", "ImageHash", imgHash); } // Make transparent? @@ -1095,7 +1095,7 @@ static void FilterGetStrings(TCHAR *filter, int bytesLeft, BOOL xml, BOOL swf) static void DeleteGlobalUserAvatar() { DBVARIANT dbv = {0}; - if (DBGetContactSettingTString(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) + if (db_get_ts(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) return; TCHAR szFilename[MAX_PATH]; @@ -1135,7 +1135,7 @@ static int InternalRemoveMyAvatar(char *protocol) { // Has global avatar? DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) { + if ( !db_get_ts(NULL, AVS_MODULE, "GlobalUserAvatarFile", &dbv)) { db_free(&dbv); db_set_b(NULL, AVS_MODULE, "GlobalUserAvatarNotConsistent", 1); DeleteGlobalUserAvatar(); diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index b720b900fc..46908870fa 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -400,7 +400,7 @@ INT_PTR CALLBACK DlgProcOptionsProtos(HWND hwndDlg, UINT msg, WPARAM wParam, LPA g_selectedProto = GetProtoFromList(hwndDlg, iItem); if ( g_selectedProto ) { DBVARIANT dbv; - if ( !DBGetContactSettingTString(NULL, PPICT_MODULE, g_selectedProto, &dbv)) { + if ( !db_get_ts(NULL, PPICT_MODULE, g_selectedProto, &dbv)) { if ( !AVS_pathIsAbsolute(dbv.ptszVal)) { TCHAR szFinalPath[MAX_PATH]; mir_sntprintf(szFinalPath, SIZEOF(szFinalPath), _T("%%miranda_path%%\\%s"), dbv.ptszVal); @@ -616,7 +616,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA ProtectAvatar((WPARAM)hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { - if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) { + if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); db_free(&dbv); } @@ -641,7 +641,7 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA DBVARIANT dbv = {0}; ProtectAvatar((WPARAM)hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { - if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) { + if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); db_free(&dbv); } @@ -708,15 +708,15 @@ INT_PTR CALLBACK DlgProcAvatarOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPA szFinalName[0] = 0; - if (is_locked && !DBGetContactSettingTString(hContact, "ContactPhoto", "Backup", &dbv)) { + if (is_locked && !db_get_ts(hContact, "ContactPhoto", "Backup", &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, szFinalName); db_free(&dbv); } - else if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "RFile", &dbv)) { + else if ( !db_get_ts(hContact, "ContactPhoto", "RFile", &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, szFinalName); db_free(&dbv); } - else if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) { + else if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { AVS_pathToAbsolute(dbv.ptszVal, szFinalName); db_free(&dbv); } @@ -847,7 +847,7 @@ INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wParam, LP ProtectAvatar((WPARAM)hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { - if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) { + if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); db_free(&dbv); } @@ -870,7 +870,7 @@ INT_PTR CALLBACK DlgProcAvatarUserInfo(HWND hwndDlg, UINT msg, WPARAM wParam, LP ProtectAvatar((WPARAM)hContact, 0); if (MessageBox(0, TranslateT("Delete picture file from disk (may be necessary to force a reload, but will delete local pictures)?"), TranslateT("Reset contact picture"), MB_YESNO) == IDYES) { - if ( !DBGetContactSettingTString(hContact, "ContactPhoto", "File", &dbv)) { + if ( !db_get_ts(hContact, "ContactPhoto", "File", &dbv)) { DeleteFile(dbv.ptszVal); db_free(&dbv); } diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index 814e5658ef..15de673f7d 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -203,10 +203,10 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp DBVARIANT dbv; char idstr[4]; _itoa(groupId, idstr, 10); - if (DBGetContactSettingTString(NULL, "CListGroups", idstr, &dbv)) break; + if (db_get_ts(NULL, "CListGroups", idstr, &dbv)) break; int id = SendDlgItemMessage(hdlg, IDC_GROUP, CB_ADDSTRING, 0, (LPARAM)(dbv.ptszVal + 1)); SendDlgItemMessage(hdlg, IDC_GROUP, CB_SETITEMDATA, (WPARAM)id, (LPARAM)groupId + 1); - DBFreeVariant(&dbv); + db_free(&dbv); } } SendDlgItemMessage(hdlg, IDC_GROUP, CB_INSERTSTRING, 0, (LPARAM)TranslateT("None")); @@ -214,10 +214,10 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp { DBVARIANT dbv = {0}; - if(!DBGetContactSettingString(NULL,"AddContact","LastProto",&dbv)) + if(!db_get_s(NULL,"AddContact","LastProto",&dbv)) { acs->szProto = dbv.pszVal; - DBFreeVariant(&dbv); + db_free(&dbv); } } if(AddContactDlgAccounts(hdlg, acs)) @@ -348,7 +348,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp TCHAR szHandle[256]; if (GetDlgItemText(hdlg, IDC_MYHANDLE, szHandle, SIZEOF(szHandle))) - DBWriteContactSettingTString(hContact, "CList", "MyHandle", szHandle); + db_set_ts(hContact, "CList", "MyHandle", szHandle); int item = SendDlgItemMessage(hdlg, IDC_GROUP, CB_GETCURSEL, 0, 0); if (item > 0) @@ -359,7 +359,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp if (!IsDlgButtonChecked(hdlg, IDC_ADDTEMP)) { - DBDeleteContactSetting(hContact, "CList", "NotOnList"); + db_unset(hContact, "CList", "NotOnList"); if (IsDlgButtonChecked(hdlg, IDC_ADDED)) CallContactService(hContact, PSS_ADDED, 0, 0); @@ -420,7 +420,7 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lp if (acs) { if(acs->szProto) - DBWriteContactSettingString(NULL,"AddContact","LastProto",acs->szProto); + db_set_s(NULL,"AddContact","LastProto",acs->szProto); if (acs->psr) { mir_free(acs->psr->nick); diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index 1e550be85d..15956ca62d 100644 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -192,12 +192,12 @@ void LoadAlarms() { memset(&alarm, 0, sizeof(ALARM)); sprintf(buff, "Title%d", i); - if (!DBGetContactSettingTString(0, MODULE, buff, &dbv)) { + if (!db_get_ts(0, MODULE, buff, &dbv)) { alarm.szTitle = mir_tstrdup(dbv.ptszVal); db_free(&dbv); } sprintf(buff, "Desc%d", i); - if (!DBGetContactSettingTString(0, MODULE, buff, &dbv)) { + if (!db_get_ts(0, MODULE, buff, &dbv)) { alarm.szDesc = mir_tstrdup(dbv.ptszVal); db_free(&dbv); } @@ -249,11 +249,11 @@ void LoadAlarms() { alarm.action = (unsigned short)db_get_dw(0, MODULE, buff, AAF_POPUP | AAF_SOUND); if (alarm.action & AAF_COMMAND) { sprintf(buff, "ActionCommand%d", i); - if (!DBGetContactSettingTString(0, MODULE, buff, &dbv)) { + if (!db_get_ts(0, MODULE, buff, &dbv)) { alarm.szCommand = mir_tstrdup(dbv.ptszVal); db_free(&dbv); sprintf(buff, "ActionParams%d", i); - if (!DBGetContactSettingTString(0, MODULE, buff, &dbv)) { + if (!db_get_ts(0, MODULE, buff, &dbv)) { alarm.szCommandParams = mir_tstrdup(dbv.ptszVal); db_free(&dbv); } @@ -308,14 +308,14 @@ void SaveAlarms() { sprintf(buff, "Desc%d", index); db_set_ts(0, MODULE, buff, i->szDesc); sprintf(buff, "Occ%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->occurrence); + db_set_w(0, MODULE, buff, i->occurrence); sprintf(buff, "STHour%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->time.wHour); + db_set_w(0, MODULE, buff, i->time.wHour); sprintf(buff, "STMinute%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->time.wMinute); + db_set_w(0, MODULE, buff, i->time.wMinute); sprintf(buff, "STSecond%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->time.wSecond); + db_set_w(0, MODULE, buff, i->time.wSecond); switch(i->occurrence) { case OC_DAILY: @@ -324,22 +324,22 @@ void SaveAlarms() { break; case OC_WEEKLY: sprintf(buff, "STDayOfWeek%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->time.wDayOfWeek); + db_set_w(0, MODULE, buff, i->time.wDayOfWeek); break; case OC_ONCE: sprintf(buff, "STYear%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->time.wYear); + db_set_w(0, MODULE, buff, i->time.wYear); case OC_YEARLY: sprintf(buff, "STMonth%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->time.wMonth); + db_set_w(0, MODULE, buff, i->time.wMonth); case OC_MONTHLY: sprintf(buff, "STDay%d", index); - DBWriteContactSettingWord(0, MODULE, buff, i->time.wDay); + db_set_w(0, MODULE, buff, i->time.wDay); break; } sprintf(buff, "ActionFlags%d", index); - DBWriteContactSettingDword(0, MODULE, buff, i->action); + db_set_dw(0, MODULE, buff, i->action); if (i->action & AAF_COMMAND) { if (_tcslen(i->szCommand)) { sprintf(buff, "ActionCommand%d", index); @@ -358,12 +358,12 @@ void SaveAlarms() { db_set_b(0, MODULE, buff, i->snoozer ? 1 : 0); sprintf(buff, "Flags%d", index); - DBWriteContactSettingDword(0, MODULE, buff, i->flags); + db_set_dw(0, MODULE, buff, i->flags); sprintf(buff, "TriggerID%d", index); - DBWriteContactSettingDword(0, MODULE, buff, i->trigger_id); + db_set_dw(0, MODULE, buff, i->trigger_id); } - DBWriteContactSettingWord(0, MODULE, "Count", index); + db_set_w(0, MODULE, "Count", index); LeaveCriticalSection(&alarm_cs); } diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 3a263d4188..39c4713838 100644 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -1176,9 +1176,9 @@ void LoadOptions() void SaveOptions() { db_set_b(0, MODULE, "UsePopupModule", options.use_popup_module ? 1 : 0); - DBWriteContactSettingDword(0, MODULE, "SnoozeMinutes", options.snooze_minutes); - DBWriteContactSettingDword(0, MODULE, "RowHeight", options.row_height); - DBWriteContactSettingDword(0, MODULE, "Indent", options.indent); + db_set_dw(0, MODULE, "SnoozeMinutes", options.snooze_minutes); + db_set_dw(0, MODULE, "RowHeight", options.row_height); + db_set_dw(0, MODULE, "Indent", options.indent); db_set_b(0, MODULE, "Transparency", options.aw_trans); db_set_b(0, MODULE, "RoundCorners", options.aw_roundcorners ? 1 : 0); db_set_b(0, MODULE, "DontStealFocus", options.aw_dontstealfocus ? 1 : 0); @@ -1186,7 +1186,7 @@ void SaveOptions() db_set_b(0, MODULE, "HideWithClist", options.hide_with_clist ? 1 : 0); db_set_b(0, MODULE, "LoopSound", options.loop_sound ? 1 : 0); db_set_b(0, MODULE, "AutoSize", options.auto_size_vert ? 1 : 0); - DBWriteContactSettingDword(0, MODULE, "ReminderPeriod", options.reminder_period); + db_set_dw(0, MODULE, "ReminderPeriod", options.reminder_period); } INT_PTR NewAlarmMenuFunc(WPARAM wParam, LPARAM lParam) diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index cc2a58828a..4124b493f4 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -51,7 +51,7 @@ static BOOL IsAssocEnabled(const ASSOCDATA *assoc) { char szSetting[MAXMODULELABELLENGTH]; mir_snprintf(szSetting, sizeof(szSetting), "enabled_%s", assoc->pszClassName); - return DBGetContactSettingByte(NULL, "AssocMgr", szSetting, (BYTE)!(assoc->flags&FTDF_DEFAULTDISABLED))!= 0; + return db_get_b(NULL, "AssocMgr", szSetting, (BYTE)!(assoc->flags&FTDF_DEFAULTDISABLED))!= 0; } static void SetAssocEnabled(const ASSOCDATA *assoc, BOOL fEnabled) @@ -59,13 +59,13 @@ static void SetAssocEnabled(const ASSOCDATA *assoc, BOOL fEnabled) char szSetting[MAXMODULELABELLENGTH]; TCHAR szDLL[MAX_PATH], szBuf[MAX_PATH]; mir_snprintf(szSetting, sizeof(szSetting), "enabled_%s", assoc->pszClassName); - DBWriteContactSettingByte(NULL, "AssocMgr", szSetting, (BYTE)fEnabled); + db_set_b(NULL, "AssocMgr", szSetting, (BYTE)fEnabled); /* dll name for uninstall */ if(assoc->hInstance!= NULL && assoc->hInstance!= hInst && assoc->hInstance!= GetModuleHandle(NULL)) if( GetModuleFileName(assoc->hInstance, szBuf, SIZEOF(szBuf))) if( PathToRelativeT(szBuf, szDLL)) { mir_snprintf(szSetting, sizeof(szSetting), "module_%s", assoc->pszClassName); - DBWriteContactSettingTString(NULL, "AssocMgr", szSetting, szDLL); + db_set_ts(NULL, "AssocMgr", szSetting, szDLL); } } @@ -73,10 +73,10 @@ static void DeleteAssocEnabledSetting(const ASSOCDATA *assoc) { char szSetting[MAXMODULELABELLENGTH]; mir_snprintf(szSetting, sizeof(szSetting), "enabled_%s", assoc->pszClassName); - DBDeleteContactSetting(NULL, "AssocMgr", szSetting); + db_unset(NULL, "AssocMgr", szSetting); /* dll name for uninstall */ mir_snprintf(szSetting, sizeof(szSetting), "module_%s", assoc->pszClassName); - DBDeleteContactSetting(NULL, "AssocMgr", szSetting); + db_unset(NULL, "AssocMgr", szSetting); } void CleanupAssocEnabledSettings(void) @@ -95,13 +95,13 @@ void CleanupAssocEnabledSettings(void) for(i = 0;ifTimeFlags&SDWTF_ST_TIME) { - dat->settingLastTime=(time_t)DBGetContactSettingDword(NULL,"AutoShutdown","TimeStamp",SETTING_TIMESTAMP_DEFAULT); + dat->settingLastTime=(time_t)db_get_dw(NULL,"AutoShutdown","TimeStamp",SETTING_TIMESTAMP_DEFAULT); dat->countdown=time(NULL); 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)DBGetContactSettingDword(NULL,"AutoShutdown","Countdown",SETTING_COUNTDOWN_DEFAULT); - dat->countdown*=(time_t)DBGetContactSettingDword(NULL,"AutoShutdown","CountdownUnit",SETTING_COUNTDOWNUNIT_DEFAULT); + dat->countdown=(time_t)db_get_dw(NULL,"AutoShutdown","Countdown",SETTING_COUNTDOWN_DEFAULT); + dat->countdown*=(time_t)db_get_dw(NULL,"AutoShutdown","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 0db48e2a6f..6b6fb3039b 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -36,25 +36,25 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L switch(msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - { WORD setting=DBGetContactSettingWord(NULL,"AutoShutdown","ConfirmDlgCountdown",SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT); + { WORD setting=db_get_w(NULL,"AutoShutdown","ConfirmDlgCountdown",SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT); if(setting<3) setting=SETTING_CONFIRMDLGCOUNTDOWN_DEFAULT; SendDlgItemMessage(hwndDlg,IDC_SPIN_CONFIRMDLGCOUNTDOWN,UDM_SETRANGE,0,MAKELPARAM(999,3)); SendDlgItemMessage(hwndDlg,IDC_EDIT_CONFIRMDLGCOUNTDOWN,EM_SETLIMITTEXT,3,0); SendDlgItemMessage(hwndDlg,IDC_SPIN_CONFIRMDLGCOUNTDOWN,UDM_SETPOS,0,MAKELPARAM(setting,0)); SetDlgItemInt(hwndDlg,IDC_EDIT_CONFIRMDLGCOUNTDOWN,setting,FALSE); } - CheckDlgButton(hwndDlg,IDC_CHECK_SMARTOFFLINECHECK,DBGetContactSettingByte(NULL,"AutoShutdown","SmartOfflineCheck",SETTING_SMARTOFFLINECHECK_DEFAULT)!=0); - CheckDlgButton(hwndDlg,IDC_CHECK_REMEMBERONRESTART,DBGetContactSettingByte(NULL,"AutoShutdown","RememberOnRestart",SETTING_REMEMBERONRESTART_DEFAULT)!=0); - CheckDlgButton(hwndDlg,IDC_CHECK_SHOWCONFIRMDLG,DBGetContactSettingByte(NULL,"AutoShutdown","ShowConfirmDlg",SETTING_SHOWCONFIRMDLG_DEFAULT)!=0); + CheckDlgButton(hwndDlg,IDC_CHECK_SMARTOFFLINECHECK,db_get_b(NULL,"AutoShutdown","SmartOfflineCheck",SETTING_SMARTOFFLINECHECK_DEFAULT)!=0); + CheckDlgButton(hwndDlg,IDC_CHECK_REMEMBERONRESTART,db_get_b(NULL,"AutoShutdown","RememberOnRestart",SETTING_REMEMBERONRESTART_DEFAULT)!=0); + CheckDlgButton(hwndDlg,IDC_CHECK_SHOWCONFIRMDLG,db_get_b(NULL,"AutoShutdown","ShowConfirmDlg",SETTING_SHOWCONFIRMDLG_DEFAULT)!=0); { BOOL enabled=ServiceIsTypeEnabled(SDSDT_SHUTDOWN,0); if(enabled) { if(ServiceExists(MS_SYSINFO_HDDTEMP)) { EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_HDDOVERHEAT),TRUE); - CheckDlgButton(hwndDlg,IDC_CHECK_HDDOVERHEAT,DBGetContactSettingByte(NULL,"AutoShutdown","HddOverheatShutdown",SETTING_HDDOVERHEATSHUTDOWN_DEFAULT)!=0); + CheckDlgButton(hwndDlg,IDC_CHECK_HDDOVERHEAT,db_get_b(NULL,"AutoShutdown","HddOverheatShutdown",SETTING_HDDOVERHEATSHUTDOWN_DEFAULT)!=0); } if(ServiceExists(MS_WEATHER_UPDATE)) { EnableWindow(GetDlgItem(hwndDlg,IDC_CHECK_WEATHER),TRUE); - CheckDlgButton(hwndDlg,IDC_CHECK_WEATHER,DBGetContactSettingByte(NULL,"AutoShutdown","WeatherShutdown",SETTING_WEATHERSHUTDOWN_DEFAULT)!=0); + CheckDlgButton(hwndDlg,IDC_CHECK_WEATHER,db_get_b(NULL,"AutoShutdown","WeatherShutdown",SETTING_WEATHERSHUTDOWN_DEFAULT)!=0); } } } @@ -88,14 +88,14 @@ static INT_PTR CALLBACK ShutdownOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L case WM_NOTIFY: switch(((NMHDR*)lParam)->code) { case PSN_APPLY: - DBWriteContactSettingByte(NULL,"AutoShutdown","ShowConfirmDlg",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWCONFIRMDLG)!=0)); - DBWriteContactSettingWord(NULL,"AutoShutdown","ConfirmDlgCountdown",(WORD)GetDlgItemInt(hwndDlg,IDC_EDIT_CONFIRMDLGCOUNTDOWN,NULL,FALSE)); - DBWriteContactSettingByte(NULL,"AutoShutdown","RememberOnRestart",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_REMEMBERONRESTART)!=0)); - DBWriteContactSettingByte(NULL,"AutoShutdown","SmartOfflineCheck",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SMARTOFFLINECHECK)!=0)); + db_set_b(NULL,"AutoShutdown","ShowConfirmDlg",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWCONFIRMDLG)!=0)); + db_set_w(NULL,"AutoShutdown","ConfirmDlgCountdown",(WORD)GetDlgItemInt(hwndDlg,IDC_EDIT_CONFIRMDLGCOUNTDOWN,NULL,FALSE)); + db_set_b(NULL,"AutoShutdown","RememberOnRestart",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_REMEMBERONRESTART)!=0)); + db_set_b(NULL,"AutoShutdown","SmartOfflineCheck",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SMARTOFFLINECHECK)!=0)); if(IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_WEATHER))) - DBWriteContactSettingByte(NULL,"AutoShutdown","WeatherShutdown",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_WEATHER)!=0)); + db_set_b(NULL,"AutoShutdown","WeatherShutdown",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_WEATHER)!=0)); if(IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_HDDOVERHEAT))) - DBWriteContactSettingByte(NULL,"AutoShutdown","HddOverheatShutdown",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_HDDOVERHEAT)!=0)); + db_set_b(NULL,"AutoShutdown","HddOverheatShutdown",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_HDDOVERHEAT)!=0)); return TRUE; } break; diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 84fa86b5e4..c26d570aa0 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -80,7 +80,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR } /* read-in watcher flags */ { WORD watcherType; - watcherType=DBGetContactSettingWord(NULL,"AutoShutdown","WatcherFlags",SETTING_WATCHERFLAGS_DEFAULT); + watcherType=db_get_w(NULL,"AutoShutdown","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); CheckDlgButton(hwndDlg,IDC_CHECK_MESSAGE,(watcherType&SDWTF_MESSAGE)!=0); @@ -91,14 +91,14 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR } /* read-in countdown val */ { SYSTEMTIME st; - if(!TimeStampToSystemTime((time_t)DBGetContactSettingDword(NULL,"AutoShutdown","TimeStamp",SETTING_TIMESTAMP_DEFAULT),&st)) + if(!TimeStampToSystemTime((time_t)db_get_dw(NULL,"AutoShutdown","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; - setting=DBGetContactSettingDword(NULL,"AutoShutdown","Countdown",SETTING_COUNTDOWN_DEFAULT); + setting=db_get_dw(NULL,"AutoShutdown","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); @@ -112,7 +112,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPAR const TCHAR *unitNames[]={TranslateT("Second(s)"), TranslateT("Minute(s)"), TranslateT("Hour(s)"), TranslateT("Day(s)"), TranslateT("Week(s)"), TranslateT("Month(s)")}; hwndCombo=GetDlgItem(hwndDlg,IDC_COMBO_COUNTDOWNUNIT); - lastUnit=DBGetContactSettingDword(NULL,"AutoShutdown","CountdownUnit",SETTING_COUNTDOWNUNIT_DEFAULT); + lastUnit=db_get_dw(NULL,"AutoShutdown","CountdownUnit",SETTING_COUNTDOWNUNIT_DEFAULT); SendMessage(hwndCombo,CB_SETLOCALE,(WPARAM)locale,0); /* sort order */ SendMessage(hwndCombo,CB_INITSTORAGE,SIZEOF(unitNames),SIZEOF(unitNames)*16); /* approx. */ for(i=0;ihash)) { // same avatar hash, skipping ShowDebugPopup(hContact, TranslateT("AVH Debug"), TranslateT("Hashes are the same... skipping")); - DBFreeVariant(&dbvOldHash); + db_free(&dbvOldHash); return 0; } SkinPlaySound("avatar_changed"); - DBWriteContactSettingTString(hContact, "AvatarHistory", "AvatarHash", avatar->hash); + db_set_ts(hContact, "AvatarHistory", "AvatarHash", avatar->hash); TCHAR history_filename[MAX_PATH] = _T(""); diff --git a/plugins/AvatarHistory/src/AvatarHistory.h b/plugins/AvatarHistory/src/AvatarHistory.h index af3986890a..70ac3dfd1e 100644 --- a/plugins/AvatarHistory/src/AvatarHistory.h +++ b/plugins/AvatarHistory/src/AvatarHistory.h @@ -32,7 +32,7 @@ // Globals extern HINSTANCE hInst; -extern HANDLE hMenu; +extern HGENMENU hMenu; extern DWORD mirVer; extern HANDLE hAvatarWindowsList; extern Options opts; diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index afe581386d..56dcb80d01 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -185,7 +185,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara if ( !lstrcmp(dbv.ptszVal, _A2T(info.name))) SendDlgItemMessage(hwndDlg, IDC_OUTDEVICE, CB_SETCURSEL, i, 0); } - DBFreeVariant(&dbv); + db_free(&dbv); } } return TRUE; @@ -503,7 +503,7 @@ void LoadBassLibrary(TCHAR CurrBassPath[MAX_PATH]) if ( !lstrcmp(dbv.ptszVal, _A2T(info.name))) device = i; - DBFreeVariant(&dbv); + db_free(&dbv); sndLimSnd = db_get_b(NULL, ModuleName, OPT_MAXCHAN, MAXCHAN); if (sndLimSnd > MAXCHAN) @@ -560,7 +560,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) } else { lstrcpy(CurrBassPath, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } } diff --git a/plugins/BasicHistory/src/BasicHistory.cpp b/plugins/BasicHistory/src/BasicHistory.cpp index 7083ac7e4a..1a4c589d4e 100644 --- a/plugins/BasicHistory/src/BasicHistory.cpp +++ b/plugins/BasicHistory/src/BasicHistory.cpp @@ -79,18 +79,8 @@ int PrebuildContactMenu(WPARAM wParam, LPARAM lParam) int count = EventList::GetContactMessageNumber((HANDLE)wParam); bool isInList = HistoryWindow::IsInList(GetForegroundWindow()); - CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_FLAGS; - - if (!count) mi.flags |= CMIF_HIDDEN; - else mi.flags &= ~CMIF_HIDDEN; - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hContactMenu, (LPARAM)&mi); - - mi.flags = CMIM_FLAGS; - if (!count || !isInList) mi.flags |= CMIF_HIDDEN; - else mi.flags &= ~CMIF_HIDDEN; - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hDeleteContactMenu, (LPARAM)&mi); - + Menu_ShowItem(hContactMenu, count != 0); + Menu_ShowItem(hDeleteContactMenu, count != 0 && isInList); return 0; } diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index ea2e1edc69..e5cd9c7384 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -1776,7 +1776,7 @@ void HistoryWindow::ReloadContacts() HANDLE _hContact = db_find_first(); while(_hContact) { - if(EventList::GetContactMessageNumber(_hContact) && (metaContactProto == NULL || DBGetContactSettingByte(_hContact, metaContactProto, "IsSubcontact", 0) == 0)) + if(EventList::GetContactMessageNumber(_hContact) && (metaContactProto == NULL || db_get_b(_hContact, metaContactProto, "IsSubcontact", 0) == 0)) { HANDLE hItem = (HANDLE)SendMessage(contactList, CLM_FINDCONTACT, (WPARAM)_hContact, 0); if(hItem == NULL) @@ -1921,18 +1921,18 @@ void HistoryWindow::RestorePos() Utils_RestoreWindowPosition(hWnd,NULL,MODULE,"history_"); contactToLoad = NULL; } - if(DBGetContactSettingByte(contactToLoad, MODULE, "history_ismax", 0)) + if(db_get_b(contactToLoad, MODULE, "history_ismax", 0)) { ShowWindow(hWnd, SW_SHOWMAXIMIZED); } - LONG pos = DBGetContactSettingDword(contactToLoad, MODULE, "history_splitterv", 0); + LONG pos = db_get_dw(contactToLoad, MODULE, "history_splitterv", 0); if(pos > 0) { SplitterMoved(splitterYhWnd, pos, false); } - pos = DBGetContactSettingDword(contactToLoad, MODULE, "history_splitter", 0); + pos = db_get_dw(contactToLoad, MODULE, "history_splitter", 0); if(pos > 0) { SplitterMoved(splitterXhWnd, pos, false); @@ -1947,13 +1947,13 @@ void HistoryWindow::SavePos(bool all) HANDLE _hContact = db_find_first(); while(_hContact) { - DBDeleteContactSetting(_hContact, MODULE, "history_x"); - DBDeleteContactSetting(_hContact, MODULE, "history_y"); - DBDeleteContactSetting(_hContact, MODULE, "history_width"); - DBDeleteContactSetting(_hContact, MODULE, "history_height"); - DBDeleteContactSetting(_hContact, MODULE, "history_ismax"); - DBDeleteContactSetting(_hContact, MODULE, "history_splitterv"); - DBDeleteContactSetting(_hContact, MODULE, "history_splitter"); + db_unset(_hContact, MODULE, "history_x"); + db_unset(_hContact, MODULE, "history_y"); + db_unset(_hContact, MODULE, "history_width"); + db_unset(_hContact, MODULE, "history_height"); + db_unset(_hContact, MODULE, "history_ismax"); + db_unset(_hContact, MODULE, "history_splitterv"); + db_unset(_hContact, MODULE, "history_splitter"); _hContact = db_find_next(_hContact); } @@ -1964,9 +1964,9 @@ void HistoryWindow::SavePos(bool all) WINDOWPLACEMENT wp; wp.length=sizeof(wp); GetWindowPlacement(hWnd,&wp); - DBWriteContactSettingByte(contactToSave, MODULE, "history_ismax", wp.showCmd == SW_MAXIMIZE ? 1 : 0); - DBWriteContactSettingDword(contactToSave, MODULE, "history_splitterv", splitterX); - DBWriteContactSettingDword(contactToSave, MODULE, "history_splitter", splitterY); + db_set_b(contactToSave, MODULE, "history_ismax", wp.showCmd == SW_MAXIMIZE ? 1 : 0); + db_set_dw(contactToSave, MODULE, "history_splitterv", splitterX); + db_set_dw(contactToSave, MODULE, "history_splitter", splitterY); } #define DEF_FILTERS_START 50000 diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index 4d8b759d7e..3e9283df10 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -288,60 +288,60 @@ void Options::Load(void) Hotkey_Register(&hid); } - showContacts = DBGetContactSettingByte(0, MODULE, "showContacts", 0) ? true : false; - showContactGroups = DBGetContactSettingByte(0, MODULE, "showContactGroups", 1) ? true : false; - noFindBorder = DBGetContactSettingByte(0, MODULE, "noFindBorder", 0) ? true : false; - groupNewOnTop = DBGetContactSettingByte(0, MODULE, "groupNewOnTop", 1) ? true : false; - groupShowEvents = DBGetContactSettingByte(0, MODULE, "groupShowEvents", 1) ? true : false; - groupShowTime = DBGetContactSettingByte(0, MODULE, "groupShowTime", 1) ? true : false; - groupShowName = DBGetContactSettingByte(0, MODULE, "groupShowName", 0) ? true : false; - groupShowMessage = DBGetContactSettingByte(0, MODULE, "groupShowMessage", 1) ? true : false; - groupMessageLen = DBGetContactSettingDword(0, MODULE, "groupMessageLen", 43); + showContacts = db_get_b(0, MODULE, "showContacts", 0) ? true : false; + showContactGroups = db_get_b(0, MODULE, "showContactGroups", 1) ? true : false; + noFindBorder = db_get_b(0, MODULE, "noFindBorder", 0) ? true : false; + groupNewOnTop = db_get_b(0, MODULE, "groupNewOnTop", 1) ? true : false; + groupShowEvents = db_get_b(0, MODULE, "groupShowEvents", 1) ? true : false; + groupShowTime = db_get_b(0, MODULE, "groupShowTime", 1) ? true : false; + groupShowName = db_get_b(0, MODULE, "groupShowName", 0) ? true : false; + groupShowMessage = db_get_b(0, MODULE, "groupShowMessage", 1) ? true : false; + groupMessageLen = db_get_dw(0, MODULE, "groupMessageLen", 43); if(groupMessageLen < 5) groupMessageLen = 5; - groupTime = DBGetContactSettingDword(0, MODULE, "groupTime", 5); + groupTime = db_get_dw(0, MODULE, "groupTime", 5); if(groupTime < 1) groupTime = 1; - groupMessagesNumber = DBGetContactSettingDword(0, MODULE, "groupMessagesNumber", 100); + groupMessagesNumber = db_get_dw(0, MODULE, "groupMessagesNumber", 100); if(groupMessagesNumber < 1) groupMessagesNumber = 1; - messagesNewOnTop = DBGetContactSettingByte(0, MODULE, "messagesNewOnTop", 0) ? true : false; - messagesShowDate = DBGetContactSettingByte(0, MODULE, "messagesShowDate", 0) ? true : false; - messagesShowSec = DBGetContactSettingByte(0, MODULE, "messagesShowSec", 0) ? true : false; - messagesShowName = DBGetContactSettingByte(0, MODULE, "messagesShowName", 1) ? true : false; - messagesShowEvents = DBGetContactSettingByte(0, MODULE, "messagesShowEvents", 0) ? true : false; - messagesUseSmileys = DBGetContactSettingByte(0, MODULE, "messagesUseSmileys", 1) ? true : false; - searchForInList = DBGetContactSettingByte(0, MODULE, "searchForInList", 1) ? true : false; - searchForInMess = DBGetContactSettingByte(0, MODULE, "searchForInMess", 1) ? true : false; - searchMatchCase = DBGetContactSettingByte(0, MODULE, "searchMatchCase", 0) ? true : false; - searchMatchWhole = DBGetContactSettingByte(0, MODULE, "searchMatchWhole", 0) ? true : false; - searchOnlyIn = DBGetContactSettingByte(0, MODULE, "searchOnlyIn", 0) ? true : false; - searchOnlyOut = DBGetContactSettingByte(0, MODULE, "searchOnlyOut", 0) ? true : false; - searchOnlyGroup = DBGetContactSettingByte(0, MODULE, "searchOnlyGroup", 0) ? true : false; - searchAllContacts = DBGetContactSettingByte(0, MODULE, "searchAllContacts", 0) ? true : false; - schedulerAlerts = DBGetContactSettingByte(0, MODULE, "schedulerAlerts", 1) ? true : false; - schedulerHistoryAlerts = DBGetContactSettingByte(0, MODULE, "schedulerHistoryAlerts", 1) ? true : false; - - defFilter = DBGetContactSettingByte(0, MODULE, "defFilter", defFilter); - int filtersCount = DBGetContactSettingDword(0, MODULE, "customFiltersCount", 0); + messagesNewOnTop = db_get_b(0, MODULE, "messagesNewOnTop", 0) ? true : false; + messagesShowDate = db_get_b(0, MODULE, "messagesShowDate", 0) ? true : false; + messagesShowSec = db_get_b(0, MODULE, "messagesShowSec", 0) ? true : false; + messagesShowName = db_get_b(0, MODULE, "messagesShowName", 1) ? true : false; + messagesShowEvents = db_get_b(0, MODULE, "messagesShowEvents", 0) ? true : false; + messagesUseSmileys = db_get_b(0, MODULE, "messagesUseSmileys", 1) ? true : false; + searchForInList = db_get_b(0, MODULE, "searchForInList", 1) ? true : false; + searchForInMess = db_get_b(0, MODULE, "searchForInMess", 1) ? true : false; + searchMatchCase = db_get_b(0, MODULE, "searchMatchCase", 0) ? true : false; + searchMatchWhole = db_get_b(0, MODULE, "searchMatchWhole", 0) ? true : false; + searchOnlyIn = db_get_b(0, MODULE, "searchOnlyIn", 0) ? true : false; + searchOnlyOut = db_get_b(0, MODULE, "searchOnlyOut", 0) ? true : false; + searchOnlyGroup = db_get_b(0, MODULE, "searchOnlyGroup", 0) ? true : false; + searchAllContacts = db_get_b(0, MODULE, "searchAllContacts", 0) ? true : false; + schedulerAlerts = db_get_b(0, MODULE, "schedulerAlerts", 1) ? true : false; + schedulerHistoryAlerts = db_get_b(0, MODULE, "schedulerHistoryAlerts", 1) ? true : false; + + defFilter = db_get_b(0, MODULE, "defFilter", defFilter); + int filtersCount = db_get_dw(0, MODULE, "customFiltersCount", 0); for(int i = 0; i < filtersCount; ++i) { char buf[256]; FilterOptions fo; sprintf_s(buf, "filterName_%d", i); DBVARIANT nameV; - if(!DBGetContactSettingWString(0, MODULE, buf, &nameV)) + if(!db_get_ws(0, MODULE, buf, &nameV)) { fo.name = nameV.pwszVal; - DBFreeVariant(&nameV); + db_free(&nameV); } else break; sprintf_s(buf, "filterInOut_%d", i); - int inOut = DBGetContactSettingByte(0, MODULE, buf, 0); + int inOut = db_get_b(0, MODULE, buf, 0); if(inOut == 1) fo.onlyIncomming = true; else if(inOut == 2) fo.onlyOutgoing = true; sprintf_s(buf, "filterEvents_%d", i); DBVARIANT eventsV; - if(!DBGetContactSettingString(0, MODULE, buf, &eventsV)) + if(!db_get_s(0, MODULE, buf, &eventsV)) { int k = 0; char* id = eventsV.pszVal; @@ -356,7 +356,7 @@ void Options::Load(void) ++k; } - DBFreeVariant(&eventsV); + db_free(&eventsV); } else break; @@ -368,7 +368,7 @@ void Options::Load(void) defFilter = 0; DBVARIANT defFilterStrV; - if(!DBGetContactSettingWString(0, MODULE, "defFilterStr", &defFilterStrV)) + if(!db_get_ws(0, MODULE, "defFilterStr", &defFilterStrV)) { std::wstring filterName = defFilterStrV.pwszVal; for(int i = 0; i < (int)customFilters.size(); ++i) @@ -379,65 +379,65 @@ void Options::Load(void) break; } } - DBFreeVariant(&defFilterStrV); + db_free(&defFilterStrV); } } - codepageTxt = DBGetContactSettingDword(0, MODULE, "codepageTxt", CP_UTF8); - codepageHtml1 = DBGetContactSettingDword(0, MODULE, "codepageHtml1", CP_UTF8); - codepageHtml2 = DBGetContactSettingDword(0, MODULE, "codepageHtml2", CP_UTF8); + codepageTxt = db_get_dw(0, MODULE, "codepageTxt", CP_UTF8); + codepageHtml1 = db_get_dw(0, MODULE, "codepageHtml1", CP_UTF8); + codepageHtml2 = db_get_dw(0, MODULE, "codepageHtml2", CP_UTF8); DBVARIANT encodingV; - if(!DBGetContactSettingWString(0, MODULE, "encodingTxt", &encodingV)) + if(!db_get_ws(0, MODULE, "encodingTxt", &encodingV)) { encodingTxt = encodingV.pwszVal; - DBFreeVariant(&encodingV); + db_free(&encodingV); } else { encodingTxt = _T("UTF-8"); } - if(!DBGetContactSettingWString(0, MODULE, "encodingHtml1", &encodingV)) + if(!db_get_ws(0, MODULE, "encodingHtml1", &encodingV)) { encodingHtml1 = encodingV.pwszVal; - DBFreeVariant(&encodingV); + db_free(&encodingV); } else { encodingHtml1 = _T("UTF-8"); } - if(!DBGetContactSettingWString(0, MODULE, "encodingHtml2", &encodingV)) + if(!db_get_ws(0, MODULE, "encodingHtml2", &encodingV)) { encodingHtml2 = encodingV.pwszVal; - DBFreeVariant(&encodingV); + db_free(&encodingV); } else { encodingHtml2 = _T("UTF-8"); } - exportHtml1ShowDate = DBGetContactSettingByte(0, MODULE, "exportHtml1ShowDate", 1) ? true : false; - exportHtml2ShowDate = DBGetContactSettingByte(0, MODULE, "exportHtml2ShowDate", 0) ? true : false; - exportHtml2UseSmileys = DBGetContactSettingByte(0, MODULE, "exportHtml2UseSmileys", 1) ? true : false; - if(!DBGetContactSettingWString(0, MODULE, "extCssHtml2", &encodingV)) + exportHtml1ShowDate = db_get_b(0, MODULE, "exportHtml1ShowDate", 1) ? true : false; + exportHtml2ShowDate = db_get_b(0, MODULE, "exportHtml2ShowDate", 0) ? true : false; + exportHtml2UseSmileys = db_get_b(0, MODULE, "exportHtml2UseSmileys", 1) ? true : false; + if(!db_get_ws(0, MODULE, "extCssHtml2", &encodingV)) { extCssHtml2 = encodingV.pwszVal; - DBFreeVariant(&encodingV); + db_free(&encodingV); } else { extCssHtml2 = _T(""); } - if(!DBGetContactSettingWString(0, MODULE, "ftpLogPath", &encodingV)) + if(!db_get_ws(0, MODULE, "ftpLogPath", &encodingV)) { ftpLogPath = encodingV.pwszVal; - DBFreeVariant(&encodingV); + db_free(&encodingV); } - if(!DBGetContactSettingWString(0, MODULE, "ftpExePath", &encodingV)) + if(!db_get_ws(0, MODULE, "ftpExePath", &encodingV)) { ftpExePath = encodingV.pwszVal; - DBFreeVariant(&encodingV); + db_free(&encodingV); } else { @@ -467,48 +467,48 @@ COLORREF Options::GetColor(Colors colorId) void Options::Save() { - DBWriteContactSettingByte(0, MODULE, "showContacts", showContacts ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "showContactGroups", showContactGroups ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "noFindBorder", noFindBorder ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "groupNewOnTop", groupNewOnTop ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "groupShowEvents", groupShowEvents ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "groupShowTime", groupShowTime ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "groupShowName", groupShowName ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "groupShowMessage", groupShowMessage ? 1 : 0); + db_set_b(0, MODULE, "showContacts", showContacts ? 1 : 0); + db_set_b(0, MODULE, "showContactGroups", showContactGroups ? 1 : 0); + db_set_b(0, MODULE, "noFindBorder", noFindBorder ? 1 : 0); + db_set_b(0, MODULE, "groupNewOnTop", groupNewOnTop ? 1 : 0); + db_set_b(0, MODULE, "groupShowEvents", groupShowEvents ? 1 : 0); + db_set_b(0, MODULE, "groupShowTime", groupShowTime ? 1 : 0); + db_set_b(0, MODULE, "groupShowName", groupShowName ? 1 : 0); + db_set_b(0, MODULE, "groupShowMessage", groupShowMessage ? 1 : 0); if(groupMessageLen < 5) groupMessageLen = 5; - DBWriteContactSettingDword(0, MODULE, "groupMessageLen", groupMessageLen); + db_set_dw(0, MODULE, "groupMessageLen", groupMessageLen); if(groupTime < 1) groupTime = 1; - DBWriteContactSettingDword(0, MODULE, "groupTime", groupTime); + db_set_dw(0, MODULE, "groupTime", groupTime); if(groupMessagesNumber < 1) groupMessagesNumber = 1; - DBWriteContactSettingDword(0, MODULE, "groupMessagesNumber", groupMessagesNumber); - DBWriteContactSettingByte(0, MODULE, "messagesNewOnTop", messagesNewOnTop ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "messagesShowDate", messagesShowDate ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "messagesShowSec", messagesShowSec ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "messagesShowName", messagesShowName ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "messagesShowEvents", messagesShowEvents ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "messagesUseSmileys", messagesUseSmileys ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchForInList", searchForInList ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchForInMess", searchForInMess ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchMatchCase", searchMatchCase ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchMatchWhole", searchMatchWhole ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchOnlyIn", searchOnlyIn ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchOnlyOut", searchOnlyOut ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchOnlyGroup", searchOnlyGroup ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "searchAllContacts", searchAllContacts ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "schedulerAlerts", schedulerAlerts ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "schedulerHistoryAlerts", schedulerHistoryAlerts ? 1 : 0); + db_set_dw(0, MODULE, "groupMessagesNumber", groupMessagesNumber); + db_set_b(0, MODULE, "messagesNewOnTop", messagesNewOnTop ? 1 : 0); + db_set_b(0, MODULE, "messagesShowDate", messagesShowDate ? 1 : 0); + db_set_b(0, MODULE, "messagesShowSec", messagesShowSec ? 1 : 0); + db_set_b(0, MODULE, "messagesShowName", messagesShowName ? 1 : 0); + db_set_b(0, MODULE, "messagesShowEvents", messagesShowEvents ? 1 : 0); + db_set_b(0, MODULE, "messagesUseSmileys", messagesUseSmileys ? 1 : 0); + db_set_b(0, MODULE, "searchForInList", searchForInList ? 1 : 0); + db_set_b(0, MODULE, "searchForInMess", searchForInMess ? 1 : 0); + db_set_b(0, MODULE, "searchMatchCase", searchMatchCase ? 1 : 0); + db_set_b(0, MODULE, "searchMatchWhole", searchMatchWhole ? 1 : 0); + db_set_b(0, MODULE, "searchOnlyIn", searchOnlyIn ? 1 : 0); + db_set_b(0, MODULE, "searchOnlyOut", searchOnlyOut ? 1 : 0); + db_set_b(0, MODULE, "searchOnlyGroup", searchOnlyGroup ? 1 : 0); + db_set_b(0, MODULE, "searchAllContacts", searchAllContacts ? 1 : 0); + db_set_b(0, MODULE, "schedulerAlerts", schedulerAlerts ? 1 : 0); + db_set_b(0, MODULE, "schedulerHistoryAlerts", schedulerHistoryAlerts ? 1 : 0); if(defFilter < 0 || defFilter - 2 >= (int)customFilters.size()) defFilter = 0; - DBWriteContactSettingByte(0, MODULE, "defFilter", defFilter < 2 ? defFilter : 2); + db_set_b(0, MODULE, "defFilter", defFilter < 2 ? defFilter : 2); if(defFilter >= 2) - DBWriteContactSettingWString(0, MODULE, "defFilterStr", customFilters[defFilter - 2].name.c_str()); - DBWriteContactSettingDword(0, MODULE, "customFiltersCount", (DWORD)customFilters.size()); + db_set_ws(0, MODULE, "defFilterStr", customFilters[defFilter - 2].name.c_str()); + db_set_dw(0, MODULE, "customFiltersCount", (DWORD)customFilters.size()); for(int i = 0 ; i < (int)customFilters.size(); ++i) { char buf[256]; sprintf_s(buf, "filterName_%d", i); - DBWriteContactSettingWString(0, MODULE, buf, customFilters[i].name.c_str()); + db_set_ws(0, MODULE, buf, customFilters[i].name.c_str()); sprintf_s(buf, "filterInOut_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, customFilters[i].onlyIncomming ? 1 : (customFilters[i].onlyOutgoing ? 2 : 0)); + db_set_b(0, MODULE, 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) { @@ -518,27 +518,27 @@ void Options::Save() } sprintf_s(buf, "filterEvents_%d", i); - DBWriteContactSettingString(0, MODULE, buf, events.c_str()); + db_set_s(0, MODULE, buf, events.c_str()); } - DBWriteContactSettingDword(0, MODULE, "codepageTxt", codepageTxt); - DBWriteContactSettingDword(0, MODULE, "codepageHtml1", codepageHtml1); - DBWriteContactSettingDword(0, MODULE, "codepageHtml2", codepageHtml2); - DBWriteContactSettingWString(0, MODULE, "encodingTxt", encodingTxt.c_str()); - DBWriteContactSettingWString(0, MODULE, "encodingHtml1", encodingHtml1.c_str()); - DBWriteContactSettingWString(0, MODULE, "encodingHtml2", encodingHtml2.c_str()); - DBWriteContactSettingByte(0, MODULE, "exportHtml1ShowDate", exportHtml1ShowDate ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "exportHtml2ShowDate", exportHtml2ShowDate ? 1 : 0); - DBWriteContactSettingByte(0, MODULE, "exportHtml2UseSmileys", exportHtml2UseSmileys ? 1 : 0); - DBWriteContactSettingWString(0, MODULE, "extCssHtml2", extCssHtml2.c_str()); - DBWriteContactSettingWString(0, MODULE, "ftpLogPath", ftpLogPath.c_str()); + db_set_dw(0, MODULE, "codepageTxt", codepageTxt); + db_set_dw(0, MODULE, "codepageHtml1", codepageHtml1); + db_set_dw(0, MODULE, "codepageHtml2", codepageHtml2); + db_set_ws(0, MODULE, "encodingTxt", encodingTxt.c_str()); + db_set_ws(0, MODULE, "encodingHtml1", encodingHtml1.c_str()); + db_set_ws(0, MODULE, "encodingHtml2", encodingHtml2.c_str()); + db_set_b(0, MODULE, "exportHtml1ShowDate", exportHtml1ShowDate ? 1 : 0); + db_set_b(0, MODULE, "exportHtml2ShowDate", exportHtml2ShowDate ? 1 : 0); + db_set_b(0, MODULE, "exportHtml2UseSmileys", exportHtml2UseSmileys ? 1 : 0); + db_set_ws(0, MODULE, "extCssHtml2", extCssHtml2.c_str()); + db_set_ws(0, MODULE, "ftpLogPath", ftpLogPath.c_str()); if(ftpExePath != ftpExePathDef) { - DBWriteContactSettingWString(0, MODULE, "ftpExePath", ftpExePath.c_str()); + db_set_ws(0, MODULE, "ftpExePath", ftpExePath.c_str()); } else { - DBDeleteContactSetting(0, MODULE, "ftpExePath"); + db_unset(0, MODULE, "ftpExePath"); } } @@ -552,119 +552,119 @@ void Options::SaveTasks(std::list* tasks) for(std::list::iterator it = tasks->begin(); it != tasks->end(); ++it) { sprintf_s(buf, "Task_compress_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->compress); + db_set_b(0, MODULE, buf, it->compress); sprintf_s(buf, "Task_useFtp_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->useFtp); + db_set_b(0, MODULE, buf, it->useFtp); sprintf_s(buf, "Task_isSystem_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->isSystem); + db_set_b(0, MODULE, buf, it->isSystem); sprintf_s(buf, "Task_active_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->active); + db_set_b(0, MODULE, buf, it->active); sprintf_s(buf, "Task_exportImported_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->exportImported); + db_set_b(0, MODULE, buf, it->exportImported); sprintf_s(buf, "Task_type_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->type); + db_set_b(0, MODULE, buf, it->type); sprintf_s(buf, "Task_eventUnit_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->eventUnit); + db_set_b(0, MODULE, buf, it->eventUnit); sprintf_s(buf, "Task_trigerType_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->trigerType); + db_set_b(0, MODULE, buf, it->trigerType); sprintf_s(buf, "Task_exportType_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->exportType); + db_set_b(0, MODULE, buf, it->exportType); sprintf_s(buf, "Task_importType_%d", i); - DBWriteContactSettingByte(0, MODULE, buf, it->importType); + db_set_b(0, MODULE, buf, it->importType); sprintf_s(buf, "Task_eventDeltaTime_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, it->eventDeltaTime); + db_set_dw(0, MODULE, buf, it->eventDeltaTime); sprintf_s(buf, "Task_filterId_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, it->filterId); + db_set_dw(0, MODULE, buf, it->filterId); sprintf_s(buf, "Task_dayTime_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, it->dayTime); + db_set_dw(0, MODULE, buf, it->dayTime); sprintf_s(buf, "Task_dayOfWeek_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, it->dayOfWeek); + db_set_dw(0, MODULE, buf, it->dayOfWeek); sprintf_s(buf, "Task_dayOfMonth_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, it->dayOfMonth); + db_set_dw(0, MODULE, buf, it->dayOfMonth); sprintf_s(buf, "Task_deltaTime_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, it->deltaTime); + db_set_dw(0, MODULE, buf, it->deltaTime); sprintf_s(buf, "Task_lastExport_low_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, (int)it->lastExport); + db_set_dw(0, MODULE, buf, (int)it->lastExport); sprintf_s(buf, "Task_lastExport_hi_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, ((unsigned long long int)it->lastExport) >> 32); + db_set_dw(0, MODULE, buf, ((unsigned long long int)it->lastExport) >> 32); sprintf_s(buf, "Task_ftpName_%d", i); - DBWriteContactSettingWString(0, MODULE, buf, it->ftpName.c_str()); + db_set_ws(0, MODULE, buf, it->ftpName.c_str()); sprintf_s(buf, "Task_filterName_%d", i); - DBWriteContactSettingWString(0, MODULE, buf, it->filterName.c_str()); + db_set_ws(0, MODULE, buf, it->filterName.c_str()); sprintf_s(buf, "Task_filePath_%d", i); - DBWriteContactSettingWString(0, MODULE, buf, it->filePath.c_str()); + db_set_ws(0, MODULE, buf, it->filePath.c_str()); sprintf_s(buf, "Task_taskName_%d", i); - DBWriteContactSettingWString(0, MODULE, buf, it->taskName.c_str()); + db_set_ws(0, MODULE, buf, it->taskName.c_str()); sprintf_s(buf, "Task_zipPassword_%d", i); - DBWriteContactSettingString(0, MODULE, buf, it->zipPassword.c_str()); + db_set_s(0, MODULE, buf, it->zipPassword.c_str()); HANDLE _hContact = db_find_first(); sprintf_s(buf, "IsInTask_%d", i); while(_hContact) { - DBDeleteContactSetting(_hContact, MODULE, buf); + db_unset(_hContact, MODULE, buf); _hContact = db_find_next(_hContact); } for(size_t j = 0; j < it->contacts.size(); ++j) { - DBWriteContactSettingByte(it->contacts[j], MODULE, buf, 1); + db_set_b(it->contacts[j], MODULE, buf, 1); } it->orderNr = i++; taskOptions.push_back(*it); } - DBWriteContactSettingDword(0, MODULE, "Task_count", i); + db_set_dw(0, MODULE, "Task_count", i); for(i = (int)tasks->size(); i < oldTaskNr; ++i) { sprintf_s(buf, "Task_compress_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_useFtp_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_isSystem_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_active_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_type_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_eventUnit_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_trigerType_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_exportType_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_eventDeltaTime_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_filterId_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_dayTime_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_dayOfWeek_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_dayOfMonth_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_deltaTime_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_lastExport_low_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_lastExport_hi_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_ftpName_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_filterName_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_filePath_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); sprintf_s(buf, "Task_taskName_%d", i); - DBDeleteContactSetting(NULL, MODULE, buf); + db_unset(NULL, MODULE, buf); HANDLE _hContact = db_find_first(); sprintf_s(buf, "IsInTask_%d", i); while(_hContact) { - DBDeleteContactSetting(_hContact, MODULE, buf); + db_unset(_hContact, MODULE, buf); _hContact = db_find_next(_hContact); } } @@ -677,92 +677,92 @@ void Options::SaveTaskTime(TaskOptions& to) int i = to.orderNr; char buf[256]; sprintf_s(buf, "Task_lastExport_low_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, (int)to.lastExport); + db_set_dw(0, MODULE, buf, (int)to.lastExport); sprintf_s(buf, "Task_lastExport_hi_%d", i); - DBWriteContactSettingDword(0, MODULE, buf, ((unsigned long long int)to.lastExport) >> 32); + db_set_dw(0, MODULE, buf, ((unsigned long long int)to.lastExport) >> 32); } void Options::LoadTasks() { - int taskCount = DBGetContactSettingDword(0, MODULE, "Task_count", 0); + int taskCount = db_get_dw(0, MODULE, "Task_count", 0); char buf[256]; for(int i = 0; i < taskCount; ++i) { TaskOptions to; sprintf_s(buf, "Task_compress_%d", i); - to.compress = DBGetContactSettingByte(0, MODULE, buf, to.compress) != 0; + to.compress = db_get_b(0, MODULE, buf, to.compress) != 0; sprintf_s(buf, "Task_useFtp_%d", i); - to.useFtp = DBGetContactSettingByte(0, MODULE, buf, to.useFtp) != 0; + to.useFtp = db_get_b(0, MODULE, buf, to.useFtp) != 0; sprintf_s(buf, "Task_isSystem_%d", i); - to.isSystem = DBGetContactSettingByte(0, MODULE, buf, to.isSystem) != 0; + to.isSystem = db_get_b(0, MODULE, buf, to.isSystem) != 0; sprintf_s(buf, "Task_active_%d", i); - to.active = DBGetContactSettingByte(0, MODULE, buf, to.active) != 0; + to.active = db_get_b(0, MODULE, buf, to.active) != 0; sprintf_s(buf, "Task_exportImported_%d", i); - to.exportImported = DBGetContactSettingByte(0, MODULE, buf, to.exportImported) != 0; + to.exportImported = db_get_b(0, MODULE, buf, to.exportImported) != 0; sprintf_s(buf, "Task_type_%d", i); - to.type = (TaskOptions::TaskType)DBGetContactSettingByte(0, MODULE, buf, to.type); + to.type = (TaskOptions::TaskType)db_get_b(0, MODULE, buf, to.type); sprintf_s(buf, "Task_eventUnit_%d", i); - to.eventUnit = (TaskOptions::EventUnit)DBGetContactSettingByte(0, MODULE, buf, to.eventUnit); + to.eventUnit = (TaskOptions::EventUnit)db_get_b(0, MODULE, buf, to.eventUnit); sprintf_s(buf, "Task_trigerType_%d", i); - to.trigerType = (TaskOptions::TrigerType)DBGetContactSettingByte(0, MODULE, buf, to.trigerType); + to.trigerType = (TaskOptions::TrigerType)db_get_b(0, MODULE, buf, to.trigerType); sprintf_s(buf, "Task_exportType_%d", i); - to.exportType = (IExport::ExportType)DBGetContactSettingByte(0, MODULE, buf, to.exportType); + to.exportType = (IExport::ExportType)db_get_b(0, MODULE, buf, to.exportType); sprintf_s(buf, "Task_importType_%d", i); - to.importType = (IImport::ImportType)DBGetContactSettingByte(0, MODULE, buf, to.importType); + to.importType = (IImport::ImportType)db_get_b(0, MODULE, buf, to.importType); sprintf_s(buf, "Task_eventDeltaTime_%d", i); - to.eventDeltaTime = DBGetContactSettingDword(0, MODULE, buf, to.eventDeltaTime); + to.eventDeltaTime = db_get_dw(0, MODULE, buf, to.eventDeltaTime); sprintf_s(buf, "Task_filterId_%d", i); - to.filterId = DBGetContactSettingDword(0, MODULE, buf, to.filterId); + to.filterId = db_get_dw(0, MODULE, buf, to.filterId); sprintf_s(buf, "Task_dayTime_%d", i); - to.dayTime = DBGetContactSettingDword(0, MODULE, buf, to.dayTime); + to.dayTime = db_get_dw(0, MODULE, buf, to.dayTime); sprintf_s(buf, "Task_dayOfWeek_%d", i); - to.dayOfWeek = DBGetContactSettingDword(0, MODULE, buf, to.dayOfWeek); + to.dayOfWeek = db_get_dw(0, MODULE, buf, to.dayOfWeek); sprintf_s(buf, "Task_dayOfMonth_%d", i); - to.dayOfMonth = DBGetContactSettingDword(0, MODULE, buf, to.dayOfMonth); + to.dayOfMonth = db_get_dw(0, MODULE, buf, to.dayOfMonth); sprintf_s(buf, "Task_deltaTime_%d", i); - to.deltaTime = DBGetContactSettingDword(0, MODULE, buf, to.deltaTime); + to.deltaTime = db_get_dw(0, MODULE, buf, to.deltaTime); unsigned long long int le = to.lastExport; sprintf_s(buf, "Task_lastExport_low_%d", i); - to.lastExport = DBGetContactSettingDword(0, MODULE, buf, (int)le) & 0xffffffff; + to.lastExport = db_get_dw(0, MODULE, buf, (int)le) & 0xffffffff; sprintf_s(buf, "Task_lastExport_hi_%d", i); - to.lastExport |= ((unsigned long long int)DBGetContactSettingDword(0, MODULE, buf, le >> 32)) << 32; + to.lastExport |= ((unsigned long long int)db_get_dw(0, MODULE, buf, le >> 32)) << 32; sprintf_s(buf, "Task_ftpName_%d", i); DBVARIANT var; - if(!DBGetContactSettingWString(0, MODULE, buf, &var)) + if(!db_get_ws(0, MODULE, buf, &var)) { to.ftpName = var.ptszVal; - DBFreeVariant(&var); + db_free(&var); } sprintf_s(buf, "Task_filterName_%d", i); - if(!DBGetContactSettingWString(0, MODULE, buf, &var)) + if(!db_get_ws(0, MODULE, buf, &var)) { to.filterName = var.ptszVal; - DBFreeVariant(&var); + db_free(&var); } sprintf_s(buf, "Task_filePath_%d", i); - if(!DBGetContactSettingWString(0, MODULE, buf, &var)) + if(!db_get_ws(0, MODULE, buf, &var)) { to.filePath = var.ptszVal; - DBFreeVariant(&var); + db_free(&var); } sprintf_s(buf, "Task_taskName_%d", i); - if(!DBGetContactSettingWString(0, MODULE, buf, &var)) + if(!db_get_ws(0, MODULE, buf, &var)) { to.taskName = var.ptszVal; - DBFreeVariant(&var); + db_free(&var); } sprintf_s(buf, "Task_zipPassword_%d", i); - if(!DBGetContactSettingString(0, MODULE, buf, &var)) + if(!db_get_s(0, MODULE, buf, &var)) { to.zipPassword = var.pszVal; - DBFreeVariant(&var); + db_free(&var); } HANDLE _hContact = db_find_first(); sprintf_s(buf, "IsInTask_%d", i); while(_hContact) { - if(DBGetContactSettingByte(_hContact, MODULE, buf, 0) == 1) + if(db_get_b(_hContact, MODULE, buf, 0) == 1) { to.contacts.push_back(_hContact); } diff --git a/plugins/Boltun/src/actionQueue.cpp b/plugins/Boltun/src/actionQueue.cpp index e652ce8061..a3915bf255 100644 --- a/plugins/Boltun/src/actionQueue.cpp +++ b/plugins/Boltun/src/actionQueue.cpp @@ -75,9 +75,9 @@ void UpdateTimer() static bool NotifyTyping(HANDLE hContact) { - int res = DBGetContactSettingByte(hContact, "SRMsg", "SupportTyping", 2); + int res = db_get_b(hContact, "SRMsg", "SupportTyping", 2); if (res == 2) - res = DBGetContactSettingByte(NULL, "SRMsg", "DefaultTyping", 1); + res = db_get_b(NULL, "SRMsg", "DefaultTyping", 1); return res != 0; } @@ -226,11 +226,11 @@ void DoAnswer(HANDLE hContact, const TalkBot::MessageInfo *info, bool sticky = f void AnswerToContact(HANDLE hContact, const TCHAR* messageToAnswer) { - if (Config.TalkWarnContacts && DBGetContactSettingByte(hContact, BOLTUN_KEY, + if (Config.TalkWarnContacts && db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_WARNED, FALSE) == FALSE) { DoAnswer(hContact, new TalkBot::MessageInfo((const TCHAR*)Config.WarnText), true); - DBWriteContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_WARNED, TRUE); + db_set_b(hContact, BOLTUN_KEY, DB_CONTACT_WARNED, TRUE); } else DoAnswer(hContact, bot->Reply(hContact, messageToAnswer, false)); diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index fdf9fbf78c..69cc4f0055 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -188,7 +188,7 @@ static bool LoadMind(const TCHAR* filename, int &line) static bool BoltunAutoChat(HANDLE hContact) { - if (DBGetContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT + if (db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT , FALSE) == TRUE) return false; @@ -207,11 +207,11 @@ static bool BoltunAutoChat(HANDLE hContact) return true; } - if ((DBGetContactSettingByte(hContact,"CList","NotOnList",0) == 1) && + if ((db_get_b(hContact,"CList","NotOnList",0) == 1) && Config.TalkWithNotInList) return true; - if (DBGetContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, + if (db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, FALSE) == TRUE) return true; @@ -512,8 +512,8 @@ static int ContactClick(WPARAM wParam, LPARAM lParam, BOOL clickNotToChat) { HANDLE hContact = (HANDLE)wParam; - BOOL boltunautochat = DBGetContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, FALSE); - BOOL boltunnottochat = DBGetContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT, FALSE); + BOOL boltunautochat = db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, FALSE); + BOOL boltunnottochat = db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT, FALSE); if (clickNotToChat) { @@ -532,12 +532,12 @@ static int ContactClick(WPARAM wParam, LPARAM lParam, BOOL clickNotToChat) } else { - DBWriteContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_WARNED, FALSE); + db_set_b(hContact, BOLTUN_KEY, DB_CONTACT_WARNED, FALSE); } } - DBWriteContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, (BYTE)boltunautochat); - DBWriteContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT, (BYTE)boltunnottochat); + db_set_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, (BYTE)boltunautochat); + db_set_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT, (BYTE)boltunnottochat); return 0; } @@ -564,7 +564,7 @@ static int MessagePrebuild(WPARAM wParam, LPARAM lParam) CLISTMENUITEM clmi = { sizeof(clmi) }; HANDLE hContact = (HANDLE)wParam; - if (!blInit || (DBGetContactSettingByte(hContact,"CList","NotOnList",0) == 1)) + if (!blInit || (db_get_b(hContact,"CList","NotOnList",0) == 1)) { clmi.flags = CMIM_FLAGS | CMIF_GRAYED; @@ -573,8 +573,8 @@ static int MessagePrebuild(WPARAM wParam, LPARAM lParam) } else { - BOOL boltunautochat = DBGetContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, FALSE); - BOOL boltunnottochat = DBGetContactSettingByte(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT, FALSE); + BOOL boltunautochat = db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_AUTO_CHAT, FALSE); + BOOL boltunnottochat = db_get_b(hContact, BOLTUN_KEY, DB_CONTACT_BOLTUN_NOT_TO_CHAT, FALSE); clmi.flags = CMIM_FLAGS | CMIM_ICON | (boltunautochat ? CMIF_CHECKED : 0); clmi.hIcon = LoadIcon( GetModuleHandle(NULL), MAKEINTRESOURCE((boltunautochat ? IDI_TICK : IDI_NOTICK))); @@ -649,7 +649,7 @@ extern "C" int __declspec(dllexport) Load(void) MessageBox(NULL, path, TranslateTS(BOLTUN_ERROR), MB_ICONERROR|MB_TASKMODAL|MB_OK); } /*record for Uninstall plugin*/ - DBWriteContactSettingString(NULL, "Uninstall", BOLTUN_NAME, BOLTUN_KEY); + db_set_s(NULL, "Uninstall", BOLTUN_NAME, BOLTUN_KEY); return 0; } diff --git a/plugins/Boltun/src/config.cpp b/plugins/Boltun/src/config.cpp index b2dcf3849f..b05a560b2b 100644 --- a/plugins/Boltun/src/config.cpp +++ b/plugins/Boltun/src/config.cpp @@ -40,12 +40,12 @@ inline TCHAR* GetString(char* key, const TCHAR* def) { DBVARIANT dbv; TCHAR* val; - if (!DBGetContactSettingTString(NULL, BOLTUN_KEY, key, &dbv)) + if (!db_get_ts(NULL, BOLTUN_KEY, key, &dbv)) { size_t len = wcslen(dbv.ptszVal) + 1; val = new TCHAR[len]; _tcscpy_s(val, len, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else { @@ -61,22 +61,22 @@ inline const TCHAR* SetString(char* key, const TCHAR* value) size_t len = _tcslen(value) + 1; TCHAR* val = new TCHAR[len]; _tcscpy_s(val, len, value); - DBWriteContactSettingTString(NULL, BOLTUN_KEY, key, val); + db_set_ts(NULL, BOLTUN_KEY, key, val); return val; } #define BUILDETTERS(x, str, def) \ const bool BoltunConfig::Get##x() { \ - return DBGetContactSettingDword(NULL, BOLTUN_KEY, str, def) != 0; } \ + return db_get_dw(NULL, BOLTUN_KEY, str, def) != 0; } \ const bool BoltunConfig::Set##x(const bool value) { \ - DBWriteContactSettingDword(NULL, BOLTUN_KEY, str, value); \ + db_set_dw(NULL, BOLTUN_KEY, str, value); \ return value; } #define BUILDINTETTERS(x, str, def) \ const int BoltunConfig::Get##x() { \ - return DBGetContactSettingDword(NULL, BOLTUN_KEY, str, def); } \ + return db_get_dw(NULL, BOLTUN_KEY, str, def); } \ const int BoltunConfig::Set##x(const int value) { \ - DBWriteContactSettingDword(NULL, BOLTUN_KEY, str, value); \ + db_set_dw(NULL, 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 4802db7834..f760da383e 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -309,10 +309,10 @@ static void CreateTrayIcon(bool create) { NOTIFYICONDATA nim; DBVARIANT dbVar; - if (!DBGetContactSettingTString(NULL,MOD_NAME,"ToolTipText",&dbVar)) + if (!db_get_ts(NULL,MOD_NAME,"ToolTipText",&dbVar)) { mir_sntprintf(nim.szTip, 64, _T("%s"), dbVar.ptszVal); - DBFreeVariant(&dbVar); + db_free(&dbVar); } else lstrcpy(nim.szTip, _T("Miranda NG")); @@ -333,14 +333,14 @@ static void RestoreOldSettings(void) CallService(MS_POPUP_QUERY, PUQS_ENABLEPOPUPS, 0); if (g_bOldSetting & OLD_SOUND) - DBWriteContactSettingByte(NULL,"Skin","UseSound", 1); + db_set_b(NULL,"Skin","UseSound", 1); if (g_bOldSetting & OLD_FLTCONT) // show Floating contacts if needed { if(ServiceExists("FloatingContacts/MainHideAllThumbs")) CallService("FloatingContacts/MainHideAllThumbs",0,0); else - DBWriteContactSettingByte(NULL,"FloatingContacts","HideAll", 0); + db_set_b(NULL,"FloatingContacts","HideAll", 0); } g_bOldSetting = 0; } @@ -381,10 +381,10 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) if (g_wMask & OPT_CHANGESTATUS) // is this even needed? { - BYTE bReqMode = DBGetContactSettingByte(NULL, MOD_NAME, "stattype", 2); + BYTE bReqMode = db_get_b(NULL, MOD_NAME, "stattype", 2); unsigned uMode = (STATUS_ARR_TO_ID[bReqMode]); DBVARIANT dbVar; - if (g_wMask & OPT_USEDEFMSG || DBGetContactSettingTString(NULL,MOD_NAME,"statmsg",&dbVar)) + if (g_wMask & OPT_USEDEFMSG || db_get_ts(NULL,MOD_NAME,"statmsg",&dbVar)) { TCHAR *ptszDefMsg = GetDefStatusMsg(uMode, 0); ChangeAllProtoStatuses(uMode, ptszDefMsg); @@ -408,7 +408,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) mir_free(ptszParsed); }else ChangeAllProtoStatuses(uMode, dbVar.ptszVal); - DBFreeVariant(&dbVar); + db_free(&dbVar); } } @@ -427,17 +427,17 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) } // disable sounds - if ((g_wMask & OPT_DISABLESNDS) && DBGetContactSettingByte(NULL,"Skin","UseSound",1)) + if ((g_wMask & OPT_DISABLESNDS) && db_get_b(NULL,"Skin","UseSound",1)) { // save current g_bOldSetting |= OLD_SOUND; - DBWriteContactSettingByte(NULL,"Skin","UseSound",0); + db_set_b(NULL,"Skin","UseSound",0); } g_bWindowHidden = true; g_bOldSetting |= OLD_WASHIDDEN; - DBWriteContactSettingByte(NULL, MOD_NAME, "OldSetting", g_bOldSetting); + db_set_b(NULL, MOD_NAME, "OldSetting", g_bOldSetting); return(0); } break; case WM_USER+52: // back @@ -447,12 +447,12 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) if (g_wMask & OPT_REQPASS){ //password request DBVARIANT dbVar = {0}; - if (!DBGetContactSettingString(NULL,MOD_NAME,"password",&dbVar)) + if (!db_get_s(NULL,MOD_NAME,"password",&dbVar)) { g_fPassRequested = true; strncpy(g_password, dbVar.pszVal, MAXPASSLEN); - DBFreeVariant(&dbVar); + db_free(&dbVar); CallService( MS_DB_CRYPT_DECODESTRING, MAXPASSLEN+1, ( LPARAM )g_password ); int res = DialogBox(g_hInstance,(MAKEINTRESOURCE(IDD_PASSDIALOGNEW)),GetForegroundWindow(),(DLGPROC)DlgStdInProc); @@ -508,7 +508,7 @@ LRESULT CALLBACK ListenWndProc(HWND hWnd,UINT uMsg,WPARAM wParam,LPARAM lParam) PostMessage(hWnd, WM_MOUSEMOVE, 0, (LPARAM)MAKELONG(2, 2)); // reset core's IDLE g_bWindowHidden = false; - DBWriteContactSettingByte(NULL, MOD_NAME, "OldSetting", 0); + db_set_b(NULL, MOD_NAME, "OldSetting", 0); return(0); } break; default:break; @@ -579,7 +579,7 @@ static TCHAR *HokeyVkToName(WORD vkKey) static TCHAR *GetBossKeyText(void) { - WORD wHotKey = DBGetContactSettingWord(NULL,"SkinHotKeys","Hide/Show Miranda",HOTKEYCODE(HOTKEYF_CONTROL, VK_F12)); + WORD wHotKey = db_get_w(NULL,"SkinHotKeys","Hide/Show Miranda",HOTKEYCODE(HOTKEYF_CONTROL, VK_F12)); BYTE key = LOBYTE(wHotKey); BYTE shift = HIBYTE(wHotKey); @@ -715,7 +715,7 @@ static int EnumProtos(WPARAM wParam, LPARAM lParam) int MirandaLoaded(WPARAM wParam,LPARAM lParam) { - g_wMask = DBGetContactSettingWord(NULL,MOD_NAME,"optsmask",DEFAULTSETTING); + g_wMask = db_get_w(NULL,MOD_NAME,"optsmask",DEFAULTSETTING); RegisterCoreHotKeys(); @@ -809,20 +809,20 @@ extern "C" int __declspec(dllexport) Load(void) { mir_getLP(&pluginInfo); - g_wMaskAdv = DBGetContactSettingWord(NULL,MOD_NAME,"optsmaskadv",0); - g_bOldSetting = DBGetContactSettingByte(NULL, MOD_NAME, "OldSetting", 0); + g_wMaskAdv = db_get_w(NULL,MOD_NAME,"optsmaskadv",0); + g_bOldSetting = db_get_b(NULL, 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 (DBGetContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1) == 0) - DBWriteContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 1); - if (DBGetContactSettingByte(NULL, "YAPP", "Enabled", 1) == 0) - DBWriteContactSettingByte(NULL, "YAPP", "Enabled", 1); + if (db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) == 0) + db_set_b(NULL, "PopUp", "ModuleIsEnabled", 1); + if (db_get_b(NULL, "YAPP", "Enabled", 1) == 0) + db_set_b(NULL, "YAPP", "Enabled", 1); } - if (g_wMaskAdv & OPT_HIDEONSTART && DBGetContactSettingByte(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(NULL, "PopUp", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled { g_bOldSetting |= OLD_POPUP; - DBWriteContactSettingByte(NULL, "PopUp", "ModuleIsEnabled", 0); + db_set_b(NULL, "PopUp", "ModuleIsEnabled", 0); } Icon_Register(g_hInstance, "BossKey", iconList, SIZEOF(iconList)); diff --git a/plugins/BossKeyPlus/src/BossKeyIdle.cpp b/plugins/BossKeyPlus/src/BossKeyIdle.cpp index eba26fd29e..a71bd2200c 100644 --- a/plugins/BossKeyPlus/src/BossKeyIdle.cpp +++ b/plugins/BossKeyPlus/src/BossKeyIdle.cpp @@ -80,7 +80,7 @@ VOID CALLBACK IdleTimer(HWND hwnd, UINT umsg, UINT_PTR idEvent, DWORD dwTime) void InitIdleTimer() { - minutes = DBGetContactSettingByte(NULL,MOD_NAME,"time",10); + minutes = db_get_b(NULL,MOD_NAME,"time",10); MyGetLastInputInfo=(BOOL (WINAPI *)(LASTINPUTINFO*))GetProcAddress(GetModuleHandleA("user32"), "GetLastInputInfo"); hTimer=SetTimer(NULL, 0, 2000, IdleTimer); } diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index 9947eb3073..01b0b073ae 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -69,12 +69,12 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) DBVARIANT dbVar; - if (!DBGetContactSettingString(NULL,MOD_NAME,"password",&dbVar)) + if (!db_get_s(NULL,MOD_NAME,"password",&dbVar)) { CallService( MS_DB_CRYPT_DECODESTRING, strlen( dbVar.pszVal )+1, ( LPARAM )dbVar.pszVal ); SetDlgItemTextA(hwndDlg,IDC_MAINOPT_PASS,dbVar.pszVal); - DBFreeVariant(&dbVar); + db_free(&dbVar); } CheckDlgButton(hwndDlg,IDC_MAINOPT_SETONLINEBACK,(g_wMask & OPT_SETONLINEBACK) ? (BST_CHECKED) : (BST_UNCHECKED)); @@ -90,7 +90,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) for (BYTE i = 0;i < 8; i++) SendDlgItemMessage(hwndDlg,IDC_MAINOPT_CHGSTS,CB_INSERTSTRING,-1,(LPARAM)TranslateTS(STATUS_ARR_TO_NAME[i])); - SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, DBGetContactSettingByte(NULL, MOD_NAME, "stattype", 2), 0); + SendDlgItemMessage(hwndDlg, IDC_MAINOPT_CHGSTS, CB_SETCURSEL, db_get_b(NULL, MOD_NAME, "stattype", 2), 0); SendMessage(hwndDlg,WM_USER + 60,0,0); SendMessage(hwndDlg,WM_USER + 50,0,0); @@ -112,7 +112,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) // write down status type if (IsDlgButtonChecked(hwndDlg,IDC_MAINOPT_CHANGESTATUSBOX) == BST_CHECKED) { - DBWriteContactSettingByte(NULL,MOD_NAME,"stattype",(BYTE)SendDlgItemMessage(hwndDlg,IDC_MAINOPT_CHGSTS,CB_GETCURSEL,0,0)); + db_set_b(NULL,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 @@ -120,9 +120,9 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) TCHAR tszMsg[1025]; GetDlgItemText(hwndDlg,IDC_MAINOPT_STATMSG,tszMsg,1024); if (lstrlen(tszMsg) != 0) - DBWriteContactSettingTString(NULL,MOD_NAME,"statmsg",tszMsg); + db_set_ts(NULL,MOD_NAME,"statmsg",tszMsg); else // delete current setting - DBDeleteContactSetting(NULL,MOD_NAME,"statmsg"); + db_unset(NULL,MOD_NAME,"statmsg"); } wMask |= OPT_CHANGESTATUS; } @@ -134,7 +134,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) GetDlgItemTextA(hwndDlg,IDC_MAINOPT_PASS,szPass,MAXPASSLEN+1); if (strlen(szPass) != 0){ CallService( MS_DB_CRYPT_ENCODESTRING, MAXPASSLEN+1, ( LPARAM )szPass ); - DBWriteContactSettingString(NULL,MOD_NAME,"password",szPass); + db_set_s(NULL,MOD_NAME,"password",szPass); wMask |= OPT_REQPASS; } } @@ -144,7 +144,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; - DBWriteContactSettingWord(NULL,MOD_NAME,"optsmask",wMask); + db_set_w(NULL,MOD_NAME,"optsmask",wMask); g_wMask = wMask; return(true); @@ -166,10 +166,10 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) { DBVARIANT dbVar; SendDlgItemMessage(hwndDlg,IDC_MAINOPT_STATMSG,EM_LIMITTEXT,1024,0); - if (!DBGetContactSettingTString(NULL,MOD_NAME,"statmsg",&dbVar)) + if (!db_get_ts(NULL,MOD_NAME,"statmsg",&dbVar)) { SetDlgItemText(hwndDlg,IDC_MAINOPT_STATMSG,dbVar.ptszVal); - DBFreeVariant(&dbVar); + db_free(&dbVar); } } EnableWindow(GetDlgItem(hwndDlg,IDC_MAINOPT_STATMSG),(IsDlgButtonChecked(hwndDlg,IDC_MAINOPT_CHANGESTATUSBOX) == BST_CHECKED) && (IsDlgButtonChecked(hwndDlg,IDC_MAINOPT_USEDEFMSG) != BST_CHECKED)); @@ -283,7 +283,7 @@ INT_PTR CALLBACK AdvOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) g_fOptionsOpen = true; - minutes = DBGetContactSettingByte(NULL,MOD_NAME,"time",10); + minutes = db_get_b(NULL,MOD_NAME,"time",10); char szMinutes[4] = {0}; _itoa(minutes, szMinutes, 10); SendDlgItemMessage(hwndDlg,IDC_MAINOPT_TIME,EM_LIMITTEXT,2,0); @@ -324,8 +324,8 @@ INT_PTR CALLBACK AdvOptDlg(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) char szMinutes[4] = {0}; GetDlgItemTextA(hwndDlg,IDC_MAINOPT_TIME,szMinutes,3); (atoi(szMinutes) > 0) ? minutes = atoi(szMinutes) : minutes = 1; - DBWriteContactSettingByte(NULL,MOD_NAME,"time",minutes); - DBWriteContactSettingWord(NULL,MOD_NAME,"optsmaskadv",wMaskAdv); + db_set_b(NULL,MOD_NAME,"time",minutes); + db_set_w(NULL,MOD_NAME,"optsmaskadv",wMaskAdv); g_wMaskAdv = wMaskAdv; return(true); diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index d3a55b4afa..13a6303ee3 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -447,24 +447,17 @@ int onPrebuildContactMenu(WPARAM wParam, LPARAM lParam) return 0; CLISTMENUITEM mi = { sizeof(mi) }; - - if (db_get_b((HANDLE)wParam, proto, "ChatRoom", 0) || !(CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND)) - mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - else - mi.flags = CMIM_FLAGS; - + mi.flags = CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB | CMIF_TCHAR; if (db_get_b((HANDLE)wParam, MODULE_NAME, "MissYou", 0)) { - mi.flags |= CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB | CMIF_TCHAR; mi.ptszName = LPGENT("Disable Miss You"); mi.icolibItem = iconList[1].hIcolib; } else { - mi.flags |= CMIM_ICON | CMIM_NAME | CMIF_ICONFROMICOLIB | CMIF_TCHAR; mi.ptszName = LPGENT("Enable Miss You"); mi.icolibItem = iconList[2].hIcolib; } Menu_ModifyItem(hContactMenu, &mi); - + Menu_ShowItem(hContactMenu, !db_get_b((HANDLE)wParam, proto, "ChatRoom", 0) && (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IMSEND)); return 0; } @@ -496,7 +489,7 @@ int SettingChanged(WPARAM wParam, LPARAM lParam) return 0; int currentStatus = inf->value.wVal; - int prevStatus = DBGetContactSettingWord(hContact, "UserOnline", "OldStatus", ID_STATUS_OFFLINE); + int prevStatus = db_get_w(hContact, "UserOnline", "OldStatus", ID_STATUS_OFFLINE); if (currentStatus == prevStatus) return 0; @@ -722,8 +715,8 @@ extern "C" int __declspec(dllexport) Load(void) HANDLE hContact = db_find_first(); DWORD current_time = (DWORD)time(0); while (hContact != 0) { - if ( !DBGetContactSetting(hContact, MODULE_NAME, "CreationTime", &dbv)) - DBFreeVariant(&dbv); + if ( !db_get(hContact, MODULE_NAME, "CreationTime", &dbv)) + db_free(&dbv); else db_set_dw(hContact, MODULE_NAME, "CreationTime", current_time); diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 202d83d2ff..3cd321b1d7 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -469,7 +469,7 @@ INT_PTR CALLBACK UserinfoDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lpar else { /* - int status = DBGetContactSettingWord((HANDLE)lparam, MODULE_NAME, "LastStatus", ID_STATUS_OFFLINE); + int status = db_get_w((HANDLE)lparam, MODULE_NAME, "LastStatus", ID_STATUS_OFFLINE); char *strptr = (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)status, 0); */ _tcsftime(tmpBuf, 50, _T("%#x"), gmtime(&tmpTime)); diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index a3ff2cb3f0..7730653313 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -76,11 +76,11 @@ void getDefaultMessage(HWND hwnd, UINT control, HANDLE hContact) DBVARIANT dbv; if (!db_get_ts(hContact, modname, "PounceMsg", &dbv)) { SetDlgItemText(hwnd, control, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else if (!db_get_ts(NULL, modname, "PounceMsg", &dbv)) { SetDlgItemText(hwnd, control, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } } INT_PTR CALLBACK StatusModesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -333,7 +333,7 @@ INT_PTR CALLBACK BuddyPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l db_set_w(hContact, modname, "SendIfTheirStatusIsFLAG", (WORD)db_get_w(NULL, modname, "SendIfTheirStatusIsFLAG",0)); db_set_b(hContact, modname, "Reuse",(BYTE)db_get_b(NULL, modname, "Reuse",0)); db_set_b(hContact, modname, "GiveUpDays", (BYTE)db_get_b(NULL, modname, "GiveUpDays",0)); - db_set_dw(hContact, modname, "GiveUpDate", (DWORD)DBGetContactSettingDword(NULL, modname, "GiveUpDate",0)); + db_set_dw(hContact, modname, "GiveUpDate", (DWORD)db_get_dw(NULL, modname, "GiveUpDate",0)); db_set_w(hContact, modname, "ConfirmTimeout", (WORD)db_get_w(NULL, modname, "ConfirmTimeout",0)); } break; @@ -536,7 +536,7 @@ INT_PTR CALLBACK SendPounceDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP SetWindowLongPtr(hwnd, GWLP_USERDATA, (WPARAM)spdps); if (db_get_ts(spdps->hContact, modname, "PounceMsg", &dbv)) DestroyWindow(hwnd); SetDlgItemText(hwnd,IDC_MESSAGE, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); SetTimer(hwnd,1,1000,NULL); SendMessage(hwnd,WM_TIMER,0,0); } @@ -587,7 +587,7 @@ INT_PTR CALLBACK PounceSentDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP if (db_get_ts(hContact, modname, "PounceMsg", &dbv)) DestroyWindow(hwnd); SetDlgItemText(hwnd, IDC_MESSAGE, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } break; case WM_COMMAND: diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index f95b995798..1b92532deb 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -186,7 +186,7 @@ int UserOnlineSettingChanged(WPARAM wParam,LPARAM lParam) else SendPounce(dbv.ptszVal, hContact); } } - DBFreeVariant(&dbv); + db_free(&dbv); } } } @@ -228,7 +228,7 @@ INT_PTR AddToPounce(WPARAM wParam, LPARAM lParam) _tcscat(newPounce, message); db_set_ws(hContact, modname, "PounceMsg", newPounce); mir_free(newPounce); - DBFreeVariant(&dbv); + db_free(&dbv); } else AddSimpleMessage((WPARAM)hContact, (LPARAM)message); return 0; diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index bf2f093749..4fe55e4279 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -270,14 +270,14 @@ void importCustomStatuses(CSWindow* csw, int result) si->m_iIcon = i-1; mir_snprintf(bufTitle, 32, "XStatus%dName", i); - if ( !DBGetContactSettingTString( NULL, protoName, bufTitle, &dbv )) { + if ( !db_get_ts( NULL, protoName, bufTitle, &dbv )) { lstrcpy(si->m_tszTitle, dbv.ptszVal); db_free(&dbv); } else si->m_tszTitle[0] = 0; mir_snprintf(bufMessage, 32, "XStatus%dMsg", i); - if ( !DBGetContactSettingTString( NULL, protoName, bufMessage, &dbv )) { + if ( !db_get_ts( NULL, protoName, bufMessage, &dbv )) { lstrcpy(si->m_tszMessage, dbv.ptszVal); db_free(&dbv); } diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index ea788fb912..61da136140 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -27,55 +27,55 @@ INT_PTR APIChangeTextLayout(WPARAM wParam, LPARAM lParam) void ReadMainOptions() { - moOptions.dwHotkey_Layout = DBGetContactSettingDword(NULL, ModuleName, "HotkeyLayout", 119); - moOptions.dwHotkey_Layout2 = DBGetContactSettingDword(NULL, ModuleName, "HotkeyLayout2", 120); - moOptions.dwHotkey_Case = DBGetContactSettingDword(NULL, ModuleName, "HotkeyCase", 121); - moOptions.CurrentWordLayout = DBGetContactSettingByte(NULL, ModuleName, "CurrentWordLayout", 0); - moOptions.CurrentWordLayout2 = DBGetContactSettingByte(NULL, ModuleName, "CurrentWordLayout2", 1); - moOptions.CurrentWordCase = DBGetContactSettingByte(NULL, ModuleName, "CurrentWordCase", 0); - moOptions.TwoWay = DBGetContactSettingByte(NULL, ModuleName, "TwoWay", 1); - moOptions.ChangeSystemLayout = DBGetContactSettingByte(NULL, ModuleName, "ChangeSystemLayout", 1); - moOptions.CopyToClipboard = DBGetContactSettingByte(NULL, ModuleName, "CopyToClipboard", 0); - moOptions.ShowPopup = DBGetContactSettingByte(NULL, ModuleName, "ShowPopup", 1); - moOptions.bCaseOperations = DBGetContactSettingByte(NULL, ModuleName, "CaseOperations", 0); + 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); } void WriteMainOptions() { - DBWriteContactSettingDword(NULL, ModuleName, "HotkeyLayout", moOptions.dwHotkey_Layout); - DBWriteContactSettingDword(NULL, ModuleName, "HotkeyLayout2", moOptions.dwHotkey_Layout2); - DBWriteContactSettingDword(NULL, ModuleName, "HotkeyCase", moOptions.dwHotkey_Case); - DBWriteContactSettingByte(NULL, ModuleName, "CurrentWordLayout", moOptions.CurrentWordLayout); - DBWriteContactSettingByte(NULL, ModuleName, "CurrentWordLayout2", moOptions.CurrentWordLayout2); - DBWriteContactSettingByte(NULL, ModuleName, "CurrentWordCase", moOptions.CurrentWordCase); - DBWriteContactSettingByte(NULL, ModuleName, "TwoWay", moOptions.TwoWay); - DBWriteContactSettingByte(NULL, ModuleName, "ChangeSystemLayout", moOptions.ChangeSystemLayout); - DBWriteContactSettingByte(NULL, ModuleName, "CopyToClipboard", moOptions.CopyToClipboard); - DBWriteContactSettingByte(NULL, ModuleName, "ShowPopup", moOptions.ShowPopup); - DBWriteContactSettingByte(NULL, ModuleName, "CaseOperations", moOptions.bCaseOperations); + 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); } void ReadPopupOptions() { - poOptions.bColourType = DBGetContactSettingByte(NULL, ModuleName, "ColourType", 0); - poOptions.crBackColour = (COLORREF)DBGetContactSettingDword(NULL, ModuleName, "BackColor", 0xD2CABF); - poOptions.crTextColour = (COLORREF)DBGetContactSettingDword(NULL, ModuleName, "TextColor", 0x000000); - poOptions.bTimeoutType = DBGetContactSettingByte(NULL, ModuleName, "TimeoutType", 0); - poOptions.bTimeout = DBGetContactSettingByte(NULL, ModuleName, "Timeout", 10); - poOptions.bLeftClick = DBGetContactSettingByte(NULL, ModuleName, "LeftClick", 0); - poOptions.bRightClick = DBGetContactSettingByte(NULL, ModuleName, "RightClick", 1); + 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); } void WritePopupOptions() { - DBWriteContactSettingByte(NULL, ModuleName, "ColourType", poOptions.bColourType); - DBWriteContactSettingDword(NULL, ModuleName, "BackColor", poOptions.crBackColour); - DBWriteContactSettingDword(NULL, ModuleName, "TextColor", poOptions.crTextColour); - DBWriteContactSettingByte(NULL, ModuleName, "TimeoutType", poOptions.bTimeoutType); - DBWriteContactSettingByte(NULL, ModuleName, "Timeout", poOptions.bTimeout); - DBWriteContactSettingByte(NULL, ModuleName, "LeftClick", poOptions.bLeftClick); - DBWriteContactSettingByte(NULL, ModuleName, "RightClick", poOptions.bRightClick); + 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); } void RegPopupActions() @@ -117,7 +117,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) for (i = 0; i < bLayNum; i++) { ptszCurrLayout = GenerateLayoutString(hklLayouts[i]); ptszTemp = GetNameOfLayout(hklLayouts[i]); - iRes = DBGetContactSettingTString(NULL, ModuleName, ptszTemp, &dbv); + iRes = db_get_ts(NULL, ModuleName, ptszTemp, &dbv); if (iRes != 0) ptszLayStrings[i] = ptszCurrLayout; else @@ -129,7 +129,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) { ptszLayStrings[i] = dbv.ptszVal; if(_tcscmp(ptszCurrLayout, ptszLayStrings[i]) == 0) - DBDeleteContactSetting(NULL, ModuleName, ptszTemp); + db_unset(NULL, ModuleName, ptszTemp); mir_free(ptszCurrLayout); } mir_free(ptszTemp); @@ -161,7 +161,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam) OnIconsChanged(0, 0); RegPopupActions(); - DBWriteContactSettingDword(NULL, ModuleName, "CurrentVer", PLUGIN_MAKE_VERSION(__MAJOR_VERSION, __MINOR_VERSION, __RELEASE_NUM, __BUILD_NUM)); + db_set_dw(NULL, ModuleName, "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 1136e4b15a..3eaab6917f 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(_tcscmp(ptszMemLay, ptszGenLay) != 0) - DBWriteContactSettingTString(NULL, ModuleName, pszNameLay, ptszMemLay); + db_set_ts(NULL, ModuleName, pszNameLay, ptszMemLay); else - DBDeleteContactSetting(NULL, ModuleName, pszNameLay); + db_unset(NULL, ModuleName, pszNameLay); mir_free(pszNameLay); mir_free(ptszGenLay); diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index b57836ab78..dac4399850 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -184,7 +184,7 @@ void ShowPopup(SHOWPOPUP_DATA *sd) _ASSERT(ppd.lchIcon); if (!ppd.lchIcon || (DWORD)ppd.lchIcon == CALLSERVICE_NOTFOUND) { // if we didn't succeed retrieving client icon, show the usual status icon instead - ppd.lchIcon = LoadSkinnedProtoIcon(szProto, DBGetContactSettingWord(sd->hContact, szProto, "Status", ID_STATUS_OFFLINE)); + ppd.lchIcon = LoadSkinnedProtoIcon(szProto, db_get_w(sd->hContact, szProto, "Status", ID_STATUS_OFFLINE)); pdata->hIcon = NULL; } _tcsncpy(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)sd->hContact, GCDNF_TCHAR), lengthof(ppd.lptzContactName) - 1); @@ -216,12 +216,12 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) if (bMetaContactsExists && !strcmp(szProto, (char*)CallService(MS_MC_GETPROTOCOLNAME, 0, 0))) // workaround for metacontacts return 0; - sd.MirVer = DBGetContactSettingString(hContact, szProto, DB_MIRVER, _T("")); + sd.MirVer = db_get_s(hContact, szProto, DB_MIRVER, _T("")); if (sd.MirVer.IsEmpty()) return 0; } - sd.OldMirVer = DBGetContactSettingString(hContact, MOD_NAME, DB_OLDMIRVER, _T("")); - DBWriteContactSettingTString(hContact, MOD_NAME, DB_OLDMIRVER, sd.MirVer); // we have to write it here, because we modify sd.OldMirVer and sd.MirVer to conform our settings later + sd.OldMirVer = db_get_s(hContact, MOD_NAME, DB_OLDMIRVER, _T("")); + db_set_ts(hContact, MOD_NAME, DB_OLDMIRVER, sd.MirVer); // we have to write it here, because we modify sd.OldMirVer and sd.MirVer to conform our settings later if (sd.OldMirVer.IsEmpty()) // looks like it's the right way to do return 0; @@ -237,14 +237,14 @@ int ContactSettingChanged(WPARAM wParam, LPARAM lParam) if (!hContactOrMeta) hContactOrMeta = hContact; - if (hContact && DBGetContactSettingByte(hContactOrMeta, "CList", "Hidden", 0)) + if (hContact && db_get_b(hContactOrMeta, "CList", "Hidden", 0)) return 0; - int PerContactSetting = hContact ? DBGetContactSettingByte(hContact, MOD_NAME, DB_CCN_NOTIFY, NOTIFY_USEGLOBAL) : NOTIFY_ALWAYS; // NOTIFY_ALWAYS for preview + int PerContactSetting = hContact ? db_get_b(hContact, MOD_NAME, DB_CCN_NOTIFY, NOTIFY_USEGLOBAL) : NOTIFY_ALWAYS; // NOTIFY_ALWAYS for preview if (PerContactSetting == NOTIFY_USEGLOBAL && hContactOrMeta != hContact) // subcontact setting has a priority over a metacontact setting - PerContactSetting = DBGetContactSettingByte(hContactOrMeta, MOD_NAME, DB_CCN_NOTIFY, NOTIFY_USEGLOBAL); + PerContactSetting = db_get_b(hContactOrMeta, MOD_NAME, DB_CCN_NOTIFY, NOTIFY_USEGLOBAL); - if (PerContactSetting && (PerContactSetting == NOTIFY_ALMOST_ALWAYS || PerContactSetting == NOTIFY_ALWAYS || !PopupOptPage.GetValue(IDC_POPUPOPTDLG_USESTATUSNOTIFYFLAG) || !(DBGetContactSettingDword(hContactOrMeta, "Ignore", "Mask1", 0) & 0x8))) { // check if we need to notify at all + if (PerContactSetting && (PerContactSetting == NOTIFY_ALMOST_ALWAYS || PerContactSetting == NOTIFY_ALWAYS || !PopupOptPage.GetValue(IDC_POPUPOPTDLG_USESTATUSNOTIFYFLAG) || !(db_get_dw(hContactOrMeta, "Ignore", "Mask1", 0) & 0x8))) { // check if we need to notify at all sd.hContact = hContact; sd.PopupOptPage = &PopupOptPage; if (!PopupOptPage.GetValue(IDC_POPUPOPTDLG_VERCHGNOTIFY) || !PopupOptPage.GetValue(IDC_POPUPOPTDLG_SHOWVER)) { @@ -365,7 +365,7 @@ INT_PTR CALLBACK CCNErrorDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM case WM_DESTROY: if (IsDlgButtonChecked(hwndDlg, IDC_DONTREMIND)) - DBWriteContactSettingByte(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 1); + db_set_b(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 1); break; } return 0; @@ -411,7 +411,7 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam) } // seems that Fingerprint is not installed - if (!bFingerprintExists && !DBGetContactSettingByte(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 0)) + if (!bFingerprintExists && !db_get_b(NULL, MOD_NAME, DB_NO_FINGERPRINT_ERROR, 0)) CreateDialog(g_hInstance, MAKEINTRESOURCE(IDD_CCN_ERROR), NULL, CCNErrorDlgProc); logservice_register(LOG_ID, LPGENT("ClientChangeNotify"), _T("ClientChangeNotify?puts(p,?dbsetting(%subject%,Protocol,p))?if2(_?dbsetting(,?get(p),?pinfo(?get(p),uidsetting)),).log"), TranslateT("`[`!cdate()-!ctime()`]` ?cinfo(%subject%,display) (?cinfo(%subject%,id)) changed client to %extratext%")); @@ -425,16 +425,16 @@ extern "C" int __declspec(dllexport) Load(void) HookEvent(ME_SYSTEM_MODULESLOADED, MirandaLoaded); DuplicateHandle(GetCurrentProcess(), GetCurrentThread(), GetCurrentProcess(), &g_hMainThread, THREAD_SET_CONTEXT, false, 0); InitOptions(); - if (DBGetContactSettingString(NULL, "KnownModules", MOD_NAME, (char*)NULL) == NULL) - DBWriteContactSettingString(NULL, "KnownModules", MOD_NAME, MOD_NAME); + if (db_get_s(NULL, "KnownModules", MOD_NAME, (char*)NULL) == NULL) + db_set_s(NULL, "KnownModules", MOD_NAME, MOD_NAME); - if (DBGetContactSettingByte(NULL, MOD_NAME, DB_SETTINGSVER, 0) < 1) { + if (db_get_b(NULL, MOD_NAME, DB_SETTINGSVER, 0) < 1) { TCString Str; - Str = DBGetContactSettingString(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, _T("")); + Str = db_get_s(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, _T("")); if (Str.GetLen()) // fix incorrect regexp from v0.1.1.0 - DBWriteContactSettingTString(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, Str.Replace(_T("/Miranda[0-9A-F]{8}/"), _T("/[0-9A-F]{8}(\\W|$)/"))); + db_set_ts(NULL, MOD_NAME, DB_IGNORESUBSTRINGS, Str.Replace(_T("/Miranda[0-9A-F]{8}/"), _T("/[0-9A-F]{8}(\\W|$)/"))); - DBWriteContactSettingByte(NULL, MOD_NAME, DB_SETTINGSVER, 1); + db_set_b(NULL, MOD_NAME, DB_SETTINGSVER, 1); } return 0; } diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index d86c6a473e..7edc46a53c 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -140,7 +140,7 @@ INT_PTR CALLBACK PopupOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara DBCONTACTWRITESETTING cws = {0}; cws.szModule = "ICQ"; cws.szSetting = DB_MIRVER; - DBWriteContactSettingString(NULL, MOD_NAME, DB_OLDMIRVER, "ICQ Lite v5"); + db_set_s(NULL, MOD_NAME, DB_OLDMIRVER, "ICQ Lite v5"); ContactSettingChanged(NULL, (LPARAM)&cws); // simulate a version change delete g_PreviewOptPage; g_PreviewOptPage = NULL; diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index 462fc9d5e7..f81e31abe0 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -131,7 +131,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam GetWindowLong(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), GWL_STYLE) | TVS_NOHSCROLL | TVS_CHECKBOXES); { int i; - DWORD exStyle = DBGetContactSettingDword(NULL, "CLC", "ExStyle", pcli->pfnGetDefaultExStyle()); + DWORD exStyle = db_get_dw(NULL, "CLC", "ExStyle", pcli->pfnGetDefaultExStyle()); for (i = 0; i < SIZEOF(checkBoxToStyleEx); i++) CheckDlgButton(hwndDlg, checkBoxToStyleEx[i].id, (exStyle & checkBoxToStyleEx[i].flag) ^ (checkBoxToStyleEx[i].flag * @@ -142,24 +142,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, SIZEOF(accel), (LPARAM) & accel); SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_SETPOS, 0, - MAKELONG(DBGetContactSettingWord(NULL, "CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME), 0)); + MAKELONG(db_get_w(NULL, "CLC", "ScrollTime", CLCDEFAULT_SCROLLTIME), 0)); } - CheckDlgButton(hwndDlg, IDC_IDLE, DBGetContactSettingByte(NULL, "CLC", "ShowIdle", CLCDEFAULT_SHOWIDLE) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_IDLE, db_get_b(NULL, "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(DBGetContactSettingByte(NULL, "CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN), 0)); + MAKELONG(db_get_b(NULL, "CLC", "LeftMargin", CLCDEFAULT_LEFTMARGIN), 0)); SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETRANGE, 0, MAKELONG(50, 0)); SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_SETPOS, 0, - MAKELONG(DBGetContactSettingByte(NULL, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT), 0)); + MAKELONG(db_get_b(NULL, "CLC", "GroupIndent", CLCDEFAULT_GROUPINDENT), 0)); CheckDlgButton(hwndDlg, IDC_GREYOUT, - DBGetContactSettingDword(NULL, "CLC", "GreyoutFlags", CLCDEFAULT_GREYOUTFLAGS) ? BST_CHECKED : BST_UNCHECKED); + db_get_dw(NULL, "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, SIZEOF(greyoutValues), - DBGetContactSettingDword(NULL, "CLC", "FullGreyoutFlags", CLCDEFAULT_FULLGREYOUTFLAGS)); + db_get_dw(NULL, "CLC", "FullGreyoutFlags", CLCDEFAULT_FULLGREYOUTFLAGS)); FillCheckBoxTree(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS), offlineValues, SIZEOF(offlineValues), - DBGetContactSettingDword(NULL, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES)); - CheckDlgButton(hwndDlg, IDC_NOSCROLLBAR, DBGetContactSettingByte(NULL, "CLC", "NoVScrollBar", 0) ? BST_CHECKED : BST_UNCHECKED); + db_get_dw(NULL, "CLC", "OfflineModes", CLCDEFAULT_OFFLINEMODES)); + CheckDlgButton(hwndDlg, IDC_NOSCROLLBAR, db_get_b(NULL, "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); @@ -212,33 +212,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; - DBWriteContactSettingDword(NULL, "CLC", "ExStyle", exStyle); + db_set_dw(NULL, "CLC", "ExStyle", exStyle); { DWORD fullGreyoutFlags = MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_GREYOUTOPTS)); - DBWriteContactSettingDword(NULL, "CLC", "FullGreyoutFlags", fullGreyoutFlags); + db_set_dw(NULL, "CLC", "FullGreyoutFlags", fullGreyoutFlags); if (IsDlgButtonChecked(hwndDlg, IDC_GREYOUT)) - DBWriteContactSettingDword(NULL, "CLC", "GreyoutFlags", fullGreyoutFlags); + db_set_dw(NULL, "CLC", "GreyoutFlags", fullGreyoutFlags); else - DBWriteContactSettingDword(NULL, "CLC", "GreyoutFlags", 0); + db_set_dw(NULL, "CLC", "GreyoutFlags", 0); } - DBWriteContactSettingByte(NULL, "CLC", "ShowIdle", (BYTE) (IsDlgButtonChecked(hwndDlg, IDC_IDLE) ? 1 : 0)); - DBWriteContactSettingDword(NULL, "CLC", "OfflineModes", MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg, IDC_HIDEOFFLINEOPTS))); - DBWriteContactSettingByte(NULL, "CLC", "LeftMargin", + 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", (BYTE) SendDlgItemMessage(hwndDlg, IDC_LEFTMARGINSPIN, UDM_GETPOS, 0, 0)); - DBWriteContactSettingWord(NULL, "CLC", "ScrollTime", + db_set_w(NULL, "CLC", "ScrollTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_SMOOTHTIMESPIN, UDM_GETPOS, 0, 0)); - DBWriteContactSettingByte(NULL, "CLC", "GroupIndent", + db_set_b(NULL, "CLC", "GroupIndent", (BYTE) SendDlgItemMessage(hwndDlg, IDC_GROUPINDENTSPIN, UDM_GETPOS, 0, 0)); - DBWriteContactSettingByte(NULL, "CLC", "NoVScrollBar", (BYTE) (IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0)); + db_set_b(NULL, "CLC", "NoVScrollBar", (BYTE) (IsDlgButtonChecked(hwndDlg, IDC_NOSCROLLBAR) ? 1 : 0)); GetDlgItemText(hwndDlg, IDC_T_CONTACT, tmp, 1024); - DBWriteContactSettingTString(NULL, "CLC", "TemplateContact", tmp); + db_set_ts(NULL, "CLC", "TemplateContact", tmp); GetDlgItemText(hwndDlg, IDC_T_GROUP, tmp, 1024); - DBWriteContactSettingTString(NULL, "CLC", "TemplateGroup", tmp); + db_set_ts(NULL, "CLC", "TemplateGroup", tmp); GetDlgItemText(hwndDlg, IDC_T_DIVIDER, tmp, 1024); - DBWriteContactSettingTString(NULL, "CLC", "TemplateDivider", tmp); + db_set_ts(NULL, "CLC", "TemplateDivider", tmp); GetDlgItemText(hwndDlg, IDC_T_INFO, tmp, 1024); - DBWriteContactSettingTString(NULL, "CLC", "TemplateInfo", tmp); + db_set_ts(NULL, "CLC", "TemplateInfo", tmp); pcli->pfnClcOptionsChanged(); return TRUE; diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index e5ad505615..d7811cb19b 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -43,23 +43,23 @@ 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_ONTOP, DBGetContactSettingByte(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ONTOP, db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_HIDEOFFLINE, - DBGetContactSettingByte(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_HIDEEMPTYGROUPS, - DBGetContactSettingByte(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DISABLEGROUPS, - DBGetContactSettingByte(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? BST_UNCHECKED : BST_CHECKED); - CheckDlgButton(hwndDlg, IDC_SORTBYNAME, !DBGetContactSettingByte(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) - && !DBGetContactSettingByte(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + 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, - DBGetContactSettingByte(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "SortByStatus", SETTING_SORTBYSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SORTBYPROTO, - DBGetContactSettingByte(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "SortByProto", SETTING_SORTBYPROTO_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CONFIRMDELETE, - DBGetContactSettingByte(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_AUTOHIDE, - DBGetContactSettingByte(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_HIDETIME), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); EnableWindow(GetDlgItem(hwndDlg, IDC_HIDETIMESPIN), IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); { @@ -79,24 +79,24 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP } SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETRANGE, 0, MAKELONG(900, 1)); SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_SETPOS, 0, - MAKELONG(DBGetContactSettingWord(NULL, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0)); + MAKELONG(db_get_w(NULL, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0)); CheckDlgButton(hwndDlg, IDC_ONECLK, - DBGetContactSettingByte(NULL, "CList", "Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "Tray1Click", SETTING_TRAY1CLICK_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_ALWAYSSTATUS, - DBGetContactSettingByte(NULL, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "AlwaysStatus", SETTING_ALWAYSSTATUS_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_ALWAYSMULTI, - !DBGetContactSettingByte(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + !db_get_b(NULL, "CList", "AlwaysMulti", SETTING_ALWAYSMULTI_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DONTCYCLE, - DBGetContactSettingByte(NULL, "CList", "TrayIcon", + db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CYCLE, - DBGetContactSettingByte(NULL, "CList", "TrayIcon", + db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_CYCLE ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_MULTITRAY, - DBGetContactSettingByte(NULL, "CList", "TrayIcon", + db_get_b(NULL, "CList", "TrayIcon", SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_MULTI ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_DISABLEBLINK, - DBGetContactSettingByte(NULL, "CList", "DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "DisableTrayFlash", 0) == 1 ? BST_CHECKED : BST_UNCHECKED); EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKTIME), !IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); EnableWindow(GetDlgItem(hwndDlg, IDC_BLINKSPIN), !IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); EnableWindow(GetDlgItem(hwndDlg, IDC_STMSDELAY), !IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); @@ -116,13 +116,13 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP } SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETRANGE, 0, MAKELONG(120, 1)); SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_SETPOS, 0, - MAKELONG(DBGetContactSettingWord(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); + MAKELONG(db_get_w(NULL, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT), 0)); { int i, count, item; PROTOACCOUNT **accs; char szName[64]; DBVARIANT dbv = { DBVT_DELETED }; - DBGetContactSetting(NULL, "CList", "PrimaryStatus", &dbv); + db_get(NULL, "CList", "PrimaryStatus", &dbv); CallService( MS_PROTO_ENUMACCOUNTS, (WPARAM)&count, (LPARAM)&accs); item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global")); SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0); @@ -135,13 +135,13 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP if (dbv.type == DBVT_ASCIIZ && !lstrcmpA(dbv.pszVal, accs[i]->szModuleName)) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETCURSEL, item, 0); } - DBFreeVariant(&dbv); + db_free(&dbv); } if (-1 == (int) SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0)) 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(DBGetContactSettingWord(NULL, "CList", "IconFlashTime", 550), 0)); + SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_SETPOS, 0, MAKELONG(db_get_w(NULL, "CList", "IconFlashTime", 550), 0)); return TRUE; case WM_COMMAND: if (LOWORD(wParam) == IDC_AUTOHIDE) { @@ -174,48 +174,48 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case 0: switch (((LPNMHDR) lParam)->code) { case PSN_APPLY: - DBWriteContactSettingByte(NULL, "CList", "HideOffline", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE)); + db_set_b(NULL, "CList", "HideOffline", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEOFFLINE)); { DWORD caps = CallService(MS_CLUI_GETCAPS, CLUICAPS_FLAGS1, 0); if (caps & CLUIF_HIDEEMPTYGROUPS) - DBWriteContactSettingByte(NULL, "CList", "HideEmptyGroups", + db_set_b(NULL, "CList", "HideEmptyGroups", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_HIDEEMPTYGROUPS)); if (caps & CLUIF_DISABLEGROUPS) - DBWriteContactSettingByte(NULL, "CList", "UseGroups", (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS)); + db_set_b(NULL, "CList", "UseGroups", (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_DISABLEGROUPS)); if (!(caps & CLUIF_HASONTOPOPTION)) { - DBWriteContactSettingByte(NULL, "CList", "OnTop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); + db_set_b(NULL, "CList", "OnTop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); SetWindowPos( pcli->hwndContactList, IsDlgButtonChecked(hwndDlg, IDC_ONTOP) ? HWND_TOPMOST : HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE); } if (!(caps & CLUIF_HASAUTOHIDEOPTION)) { - DBWriteContactSettingByte(NULL, "CList", "AutoHide", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); - DBWriteContactSettingWord(NULL, "CList", "HideTime", + 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)); } } - DBWriteContactSettingByte(NULL, "CList", "SortByStatus", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SORTBYSTATUS)); - DBWriteContactSettingByte(NULL, "CList", "SortByProto", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SORTBYPROTO)); - DBWriteContactSettingByte(NULL, "CList", "ConfirmDelete", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CONFIRMDELETE)); - DBWriteContactSettingByte(NULL, "CList", "Tray1Click", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONECLK)); - DBWriteContactSettingByte(NULL, "CList", "AlwaysStatus", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ALWAYSSTATUS)); - DBWriteContactSettingByte(NULL, "CList", "AlwaysMulti", (BYTE) ! IsDlgButtonChecked(hwndDlg, IDC_ALWAYSMULTI)); - DBWriteContactSettingByte(NULL, "CList", "TrayIcon", + db_set_b(NULL, "CList", "SortByStatus", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SORTBYSTATUS)); + db_set_b(NULL, "CList", "SortByProto", (BYTE) 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", (BYTE) (IsDlgButtonChecked(hwndDlg, IDC_DONTCYCLE) ? SETTING_TRAYICON_SINGLE : (IsDlgButtonChecked(hwndDlg, IDC_CYCLE) ? SETTING_TRAYICON_CYCLE : SETTING_TRAYICON_MULTI))); - DBWriteContactSettingWord(NULL, "CList", "CycleTime", + db_set_w(NULL, "CList", "CycleTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_CYCLETIMESPIN, UDM_GETPOS, 0, 0)); - DBWriteContactSettingWord(NULL, "CList", "IconFlashTime", + db_set_w(NULL, "CList", "IconFlashTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_BLINKSPIN, UDM_GETPOS, 0, 0)); - DBWriteContactSettingByte(NULL, "CList", "DisableTrayFlash", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DISABLEBLINK)); + db_set_b(NULL, "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 == NULL ) - DBDeleteContactSetting(NULL, "CList", "PrimaryStatus"); + db_unset(NULL, "CList", "PrimaryStatus"); else - DBWriteContactSettingString(NULL, "CList", "PrimaryStatus", pa->szModuleName ); + db_set_s(NULL, "CList", "PrimaryStatus", pa->szModuleName ); } pcli->pfnTrayIconIconsChanged(); diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 937645a848..4c71790871 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -30,37 +30,37 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); CheckDlgButton(hwndDlg, IDC_BRINGTOFRONT, - DBGetContactSettingByte(NULL, "CList", "BringToFront", SETTING_BRINGTOFRONT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONTOP, DBGetContactSettingByte(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + 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); CheckDlgButton(hwndDlg, IDC_TOOLWND, - DBGetContactSettingByte(NULL, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_MIN2TRAY, - DBGetContactSettingByte(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); if (IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)) EnableWindow(GetDlgItem(hwndDlg, IDC_MIN2TRAY), FALSE); CheckDlgButton(hwndDlg, IDC_SHOWCAPTION, - DBGetContactSettingByte(NULL, "CLUI", "ShowCaption", SETTING_SHOWCAPTION_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CLUI", "ShowCaption", SETTING_SHOWCAPTION_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_SHOWMAINMENU, - DBGetContactSettingByte(NULL, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_CLIENTDRAG, - DBGetContactSettingByte(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); if (!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, DBGetContactSettingByte(NULL, "CLUI", "FadeInOut", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_AUTOSIZE, DBGetContactSettingByte(NULL, "CLUI", "AutoSize", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_DROPSHADOW, DBGetContactSettingByte(NULL, "CList", "WindowShadow", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_ONDESKTOP, DBGetContactSettingByte(NULL, "CList", "OnDesktop", 0) ? BST_CHECKED : BST_UNCHECKED); + 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); SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETRANGE, 0, MAKELONG(100, 0)); - SendDlgItemMessage(hwndDlg, IDC_MAXSIZESPIN, UDM_SETPOS, 0, DBGetContactSettingByte(NULL, "CLUI", "MaxSizeHeight", 75)); - CheckDlgButton(hwndDlg, IDC_AUTOSIZEUPWARD, DBGetContactSettingByte(NULL, "CLUI", "AutoSizeUpward", 0) ? BST_CHECKED : BST_UNCHECKED); + 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, - DBGetContactSettingByte(NULL, "CList", "AutoHide", SETTING_AUTOHIDE_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "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(DBGetContactSettingWord(NULL, "CList", "HideTime", SETTING_HIDETIME_DEFAULT), 0)); + MAKELONG(db_get_w(NULL, "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)); @@ -73,9 +73,9 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } { DBVARIANT dbv; - if ( !DBGetContactSettingTString(NULL, "CList", "TitleText", &dbv)) { + if ( !db_get_ts(NULL, "CList", "TitleText", &dbv)) { SetDlgItemText(hwndDlg, IDC_TITLETEXT, dbv.ptszVal); - DBFreeVariant( &dbv ); + db_free( &dbv ); } else SetDlgItemTextA(hwndDlg, IDC_TITLETEXT, MIRANDANAME); } @@ -86,7 +86,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } else CheckDlgButton(hwndDlg, IDC_TRANSPARENT, - DBGetContactSettingByte(NULL, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); + db_get_b(NULL, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT) ? BST_CHECKED : BST_UNCHECKED); if (!IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)) { EnableWindow(GetDlgItem(hwndDlg, IDC_STATIC11), FALSE); @@ -98,9 +98,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, DBGetContactSettingByte(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT)); + SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_SETPOS, TRUE, db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT)); SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_SETPOS, TRUE, - DBGetContactSettingByte(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT)); + db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT)); SendMessage(hwndDlg, WM_HSCROLL, 0x12345678, 0); return TRUE; @@ -156,28 +156,28 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break; case WM_NOTIFY: if (((LPNMHDR) lParam)->code == PSN_APPLY) { - DBWriteContactSettingByte(NULL, "CList", "OnTop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONTOP)); - DBWriteContactSettingByte(NULL, "CList", "ToolWindow", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TOOLWND)); - DBWriteContactSettingByte(NULL, "CList", "BringToFront", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_BRINGTOFRONT)); - DBWriteContactSettingByte(NULL, "CLUI", "FadeInOut", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_FADEINOUT)); - DBWriteContactSettingByte(NULL, "CLUI", "AutoSize", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZE)); - DBWriteContactSettingByte(NULL, "CLUI", "MaxSizeHeight", (BYTE) GetDlgItemInt(hwndDlg, IDC_MAXSIZEHEIGHT, NULL, FALSE)); - DBWriteContactSettingByte(NULL, "CLUI", "AutoSizeUpward", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOSIZEUPWARD)); - DBWriteContactSettingByte(NULL, "CList", "AutoHide", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_AUTOHIDE)); - DBWriteContactSettingWord(NULL, "CList", "HideTime", (WORD) SendDlgItemMessage(hwndDlg, IDC_HIDETIMESPIN, UDM_GETPOS, 0, 0)); - DBWriteContactSettingByte(NULL, "CList", "Transparent", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_TRANSPARENT)); - DBWriteContactSettingByte(NULL, "CList", "Alpha", (BYTE) SendDlgItemMessage(hwndDlg, IDC_TRANSACTIVE, TBM_GETPOS, 0, 0)); - DBWriteContactSettingByte(NULL, "CList", "AutoAlpha", (BYTE) SendDlgItemMessage(hwndDlg, IDC_TRANSINACTIVE, TBM_GETPOS, 0, 0)); - DBWriteContactSettingByte(NULL, "CList", "WindowShadow", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_DROPSHADOW)); - DBWriteContactSettingByte(NULL, "CList", "OnDesktop", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_ONDESKTOP)); - DBWriteContactSettingByte(NULL, "CLUI", "ShowCaption", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWCAPTION)); - DBWriteContactSettingByte(NULL, "CLUI", "ShowMainMenu", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWMAINMENU)); - DBWriteContactSettingByte(NULL, "CLUI", "ClientAreaDrag", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_CLIENTDRAG)); - DBWriteContactSettingByte(NULL, "CList", "Min2Tray", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_MIN2TRAY)); + 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, NULL, 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)); { TCHAR title[256]; GetDlgItemText(hwndDlg, IDC_TITLETEXT, title, SIZEOF(title)); - DBWriteContactSettingTString(NULL, "CList", "TitleText", title); + db_set_ts(NULL, "CList", "TitleText", title); SetWindowText(pcli->hwndContactList, title); } pcli->pfnLoadCluiGlobalOpts(); @@ -221,7 +221,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L SetWindowLong(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLong(pcli->hwndContactList, GWL_EXSTYLE) | WS_EX_LAYERED); if (MySetLayeredWindowAttributes) MySetLayeredWindowAttributes(pcli->hwndContactList, RGB(0, 0, 0), - (BYTE) DBGetContactSettingByte(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), + (BYTE) db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT), LWA_ALPHA); } else SetWindowLong(pcli->hwndContactList, GWL_EXSTYLE, GetWindowLong(pcli->hwndContactList, GWL_EXSTYLE) & ~WS_EX_LAYERED); @@ -239,18 +239,18 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L switch (msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_SHOWSBAR, DBGetContactSettingByte(NULL, "CLUI", "ShowSBar", 1) ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_SHOWSBAR, db_get_b(NULL, "CLUI", "ShowSBar", 1) ? BST_CHECKED : BST_UNCHECKED); { - BYTE showOpts = DBGetContactSettingByte(NULL, "CLUI", "SBarShow", 1); + BYTE showOpts = db_get_b(NULL, "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, DBGetContactSettingByte(NULL, "CLUI", "SBarRightClk", 0) ? BST_UNCHECKED : BST_CHECKED); + CheckDlgButton(hwndDlg, IDC_RIGHTSTATUS, db_get_b(NULL, "CLUI", "SBarRightClk", 0) ? BST_UNCHECKED : BST_CHECKED); CheckDlgButton(hwndDlg, IDC_RIGHTMIRANDA, !IsDlgButtonChecked(hwndDlg, IDC_RIGHTSTATUS) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_EQUALSECTIONS, DBGetContactSettingByte(NULL, "CLUI", "EqualSections", 0) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SBPANELBEVEL, DBGetContactSettingByte(NULL, "CLUI", "SBarBevel", 1) ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwndDlg, IDC_SHOWGRIP, DBGetContactSettingByte(NULL, "CLUI", "ShowGrip", 1) ? 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); if (!IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) { EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWICON), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWPROTO), FALSE); @@ -277,23 +277,23 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break; case WM_NOTIFY: if (((LPNMHDR) lParam)->code == PSN_APPLY ) { - DBWriteContactSettingByte(NULL, "CLUI", "ShowSBar", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)); - DBWriteContactSettingByte(NULL, "CLUI", "SBarShow", + 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))); - DBWriteContactSettingByte(NULL, "CLUI", "SBarRightClk", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_RIGHTMIRANDA)); - DBWriteContactSettingByte(NULL, "CLUI", "EqualSections", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_EQUALSECTIONS)); - DBWriteContactSettingByte(NULL, "CLUI", "SBarBevel", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SBPANELBEVEL)); + 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)); pcli->pfnLoadCluiGlobalOpts(); - if (DBGetContactSettingByte(NULL, "CLUI", "ShowGrip", 1) != (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) { + if (db_get_b(NULL, "CLUI", "ShowGrip", 1) != (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)) { HWND parent = GetParent(pcli->hwndStatus); int flags = WS_CHILD | CCS_BOTTOM; - DBWriteContactSettingByte(NULL, "CLUI", "ShowGrip", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)); + db_set_b(NULL, "CLUI", "ShowGrip", (BYTE) IsDlgButtonChecked(hwndDlg, IDC_SHOWGRIP)); ShowWindow(pcli->hwndStatus, SW_HIDE); DestroyWindow(pcli->hwndStatus); - flags |= DBGetContactSettingByte(NULL, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; - flags |= DBGetContactSettingByte(NULL, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; + flags |= db_get_b(NULL, "CLUI", "ShowSBar", 1) ? WS_VISIBLE : 0; + flags |= db_get_b(NULL, "CLUI", "ShowGrip", 1) ? SBARS_SIZEGRIP : 0; pcli->hwndStatus = CreateWindow(STATUSCLASSNAME, NULL, flags, 0, 0, 0, 0, parent, NULL, g_hInst, NULL); } if (IsDlgButtonChecked(hwndDlg, IDC_SHOWSBAR)) diff --git a/plugins/Clist_blind/src/commonheaders.h b/plugins/Clist_blind/src/commonheaders.h index 7fe4329c30..0dbece6987 100644 --- a/plugins/Clist_blind/src/commonheaders.h +++ b/plugins/Clist_blind/src/commonheaders.h @@ -54,7 +54,7 @@ extern HINSTANCE g_hInst; all the bad free()'s to good ones, however it's still incorrect code. The reasons for not changing them include: - * DBFreeVariant has a CallService() lookup + * db_free has a CallService() lookup * free() is executed in some large loops to do with clist creation of group data * easy search and replace diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index 70fb9e2865..445591c950 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -194,7 +194,7 @@ TCHAR* MyDBGetContactSettingTString(HANDLE hContact, char* module, char* setting out[0] = _T('\0'); - if (!DBGetContactSettingTString(hContact, module, setting, &dbv)) { + if (!db_get_ts(hContact, module, setting, &dbv)) { if (dbv.type == DBVT_ASCIIZ) MultiByteToWideChar(CP_ACP, 0, dbv.pszVal, -1, out, (int)len); else if (dbv.type == DBVT_UTF8) @@ -204,7 +204,7 @@ TCHAR* MyDBGetContactSettingTString(HANDLE hContact, char* module, char* setting else if (def != NULL) lstrcpyn(out, def, (int)len); - DBFreeVariant(&dbv); + db_free(&dbv); } else { if (def != NULL) @@ -462,7 +462,7 @@ TCHAR *GetStatusName(struct ClcContact *item) return status_name; // Get status name - status = DBGetContactSettingWord(item->hContact, item->proto, "Status", ID_STATUS_OFFLINE); + status = db_get_w(item->hContact, item->proto, "Status", ID_STATUS_OFFLINE); lstrcpyn(status_name, pcli->pfnGetStatusModeDescription(status, GSMDF_TCHAR), MAX_REGS(status_name)); return status_name; diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h index fb15b1e25a..ec4e3acc01 100644 --- a/plugins/Clist_modern/src/hdr/modern_static_clui.h +++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h @@ -165,9 +165,7 @@ static BOOL bTransparentFocus=TRUE, bNeedFixSizingRect=FALSE, bShowEventStarted=FALSE; -static HANDLE hRenameMenuItem, - hShowAvatarMenuItem, - hHideAvatarMenuItem; +static HGENMENU hRenameMenuItem, hShowAvatarMenuItem, hHideAvatarMenuItem; static UINT uMsgGetProfile=0; diff --git a/plugins/Clist_modern/src/modern_cachefuncs.cpp b/plugins/Clist_modern/src/modern_cachefuncs.cpp index 0c4e280d8d..14c460ed7a 100644 --- a/plugins/Clist_modern/src/modern_cachefuncs.cpp +++ b/plugins/Clist_modern/src/modern_cachefuncs.cpp @@ -299,7 +299,7 @@ int GetStatusName(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus // Get XStatusName if ( !noAwayMsg && !noXstatus && xstatus_has_priority && pdnce->hContact && pdnce->m_cache_cszProto) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { //lstrcpyn(text, dbv.pszVal, text_size); CopySkipUnprintableChars(text, dbv.ptszVal, text_size-1); db_free(&dbv); @@ -321,7 +321,7 @@ int GetStatusName(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xstatus // Get XStatusName if ( !noAwayMsg && !noXstatus && !xstatus_has_priority && pdnce->hContact && pdnce->m_cache_cszProto) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { //lstrcpyn(text, dbv.pszVal, text_size); CopySkipUnprintableChars(text, dbv.ptszVal, text_size-1); db_free(&dbv); @@ -347,7 +347,7 @@ void GetListeningTo(TCHAR *text, int text_size, ClcCacheEntry *pdnce) if (wStatus == ID_STATUS_OFFLINE || wStatus == 0) return; - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "ListeningTo", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "ListeningTo", &dbv)) { CopySkipUnprintableChars(text, dbv.ptszVal, text_size-1); db_free(&dbv); } @@ -370,7 +370,7 @@ int GetStatusMessage(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xst // Get XStatusMsg if ( !noAwayMsg && xstatus_has_priority && pdnce->hContact && pdnce->m_cache_cszProto) { // Try to get XStatusMsg - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusMsg", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusMsg", &dbv)) { //lstrcpyn(text, dbv.pszVal, text_size); CopySkipUnprintableChars(text, dbv.ptszVal, text_size-1); db_free(&dbv); @@ -382,7 +382,7 @@ int GetStatusMessage(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xst // Get StatusMsg if (pdnce->hContact && text[0] == '\0') { - if ( !DBGetContactSettingTString(pdnce->hContact, "CList", "StatusMsg", &dbv)) { + if ( !db_get_ts(pdnce->hContact, "CList", "StatusMsg", &dbv)) { //lstrcpyn(text, dbv.pszVal, text_size); CopySkipUnprintableChars(text, dbv.ptszVal, text_size-1); db_free(&dbv); @@ -395,7 +395,7 @@ int GetStatusMessage(TCHAR *text, int text_size, ClcCacheEntry *pdnce, BOOL xst // Get XStatusMsg if ( !noAwayMsg && !xstatus_has_priority && pdnce->hContact && pdnce->m_cache_cszProto && text[0] == '\0') { // Try to get XStatusMsg - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusMsg", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusMsg", &dbv)) { //lstrcpyn(text, dbv.pszVal, text_size); CopySkipUnprintableChars(text, dbv.ptszVal, text_size-1); db_free(&dbv); @@ -424,7 +424,7 @@ int Cache_GetLineText( DBVARIANT dbv = {0}; // Try to get XStatusMsg - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusMsg", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusMsg", &dbv)) { if (dbv.ptszVal != NULL && dbv.ptszVal[0] != 0) { TCHAR *tmp = NEWTSTR_ALLOCA(text); mir_sntprintf(text, text_size, _T("%s: %s"), tmp, dbv.ptszVal); @@ -439,7 +439,7 @@ int Cache_GetLineText( case TEXT_NICKNAME: if (pdnce->hContact && pdnce->m_cache_cszProto) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "Nick", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "Nick", &dbv)) { lstrcpyn(text, dbv.ptszVal, text_size); db_free(&dbv); CopySkipUnprintableChars(text, text, text_size-1); @@ -453,7 +453,7 @@ int Cache_GetLineText( DBVARIANT dbv = {0}; // Try to get XStatusName - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { if (dbv.pszVal != NULL && dbv.pszVal[0] != 0) { TCHAR *tmp = NEWTSTR_ALLOCA(text); mir_sntprintf(text, text_size, _T("%s: %s"), dbv.pszVal, tmp); @@ -465,7 +465,7 @@ int Cache_GetLineText( else if (use_name_and_message_for_xstatus && xstatus_has_priority) { DBVARIANT dbv = {0}; // Try to get XStatusName - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "XStatusName", &dbv)) { if (dbv.pszVal != NULL && dbv.pszVal[0] != 0) mir_sntprintf(text, text_size, _T("%s"), dbv.pszVal); CopySkipUnprintableChars(text, text, text_size-1); @@ -525,7 +525,7 @@ void Cache_GetFirstLineText(ClcData *dat, ClcContact *contact) TCHAR *name = pcli->pfnGetContactDisplayName(contact->hContact,0); if (dat->first_line_append_nick && (!dat->force_in_dialog)) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(pdnce->hContact, pdnce->m_cache_cszProto, "Nick", &dbv)) { + if ( !db_get_ts(pdnce->hContact, pdnce->m_cache_cszProto, "Nick", &dbv)) { TCHAR nick[SIZEOF(contact->szText)]; lstrcpyn(nick, dbv.ptszVal, SIZEOF(contact->szText)); db_free(&dbv); @@ -856,7 +856,7 @@ void Cache_GetAvatar(ClcData *dat, ClcContact *contact) contact->avatar_pos = AVATAR_POS_DONT_HAVE; if (dat->avatars_show && !db_get_b(contact->hContact, "CList", "HideContactAvatar", 0)) { DBVARIANT dbv; - if ( !DBGetContactSettingTString(contact->hContact, "ContactPhoto", "File", &dbv)) { + if ( !db_get_ts(contact->hContact, "ContactPhoto", "File", &dbv)) { HBITMAP hBmp = (HBITMAP) CallService(MS_UTILS_LOADBITMAPT, 0, (LPARAM)dbv.ptszVal); if (hBmp != NULL) { // Make bounds diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp index fc2edc9c7a..e01d9be1bc 100644 --- a/plugins/Clist_modern/src/modern_clc.cpp +++ b/plugins/Clist_modern/src/modern_clc.cpp @@ -1842,7 +1842,7 @@ int ClcDoProtoAck(HANDLE wParam,ACKDATA * ack) } else { - //DBDeleteContactSetting(ack->hContact,"CList","StatusMsg"); + //db_unset(ack->hContact,"CList","StatusMsg"); //char a = '\0'; {//Do not change DB if it is IRC protocol if (ack->szModule != NULL) diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index 08ced8922c..753a8f0682 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -735,7 +735,7 @@ int __fastcall CLVM_GetContactHiddenStatus(HANDLE hContact, char *szProto, ClcDa filterResult = strstr(g_CluiData.protoFilter, szTemp) ? 1 : 0; } if (g_CluiData.bFilterEffective & CLVM_FILTER_GROUPS) { - if ( !DBGetContactSettingTString(hContact, "CList", "Group", &dbv)) { + if ( !db_get_ts(hContact, "CList", "Group", &dbv)) { mir_sntprintf(szGroupMask, SIZEOF(szGroupMask), _T("%s|"), &dbv.ptszVal[0]); filterResult = (g_CluiData.filterFlags & CLVM_PROTOGROUP_OP) ? (filterResult | (_tcsstr(g_CluiData.groupFilter, szGroupMask) ? 1 : 0)) : (filterResult & (_tcsstr(g_CluiData.groupFilter, szGroupMask) ? 1 : 0)); mir_free(dbv.ptszVal); diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 4dd2d44ec8..7cf0c32840 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -583,12 +583,12 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w CheckDlgButton(hwndDlg,IDC_BITMAP,db_get_b(NULL,"StatusBar","UseBitmap",CLCDEFAULT_USEBITMAP)?BST_CHECKED:BST_UNCHECKED); SendMessage(hwndDlg,WM_USER+10, 0, 0); SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETDEFAULTCOLOUR, 0, CLCDEFAULT_BKCOLOUR); - // SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL,"StatusBar","BkColour",CLCDEFAULT_BKCOLOUR)); + // SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR, 0, db_get_dw(NULL,"StatusBar","BkColour",CLCDEFAULT_BKCOLOUR)); SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETDEFAULTCOLOUR, 0, CLCDEFAULT_SELBKCOLOUR); SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR, 0, db_get_dw(NULL,"StatusBar","SelBkColour",CLCDEFAULT_SELBKCOLOUR)); { DBVARIANT dbv; - if ( !DBGetContactSettingString(NULL, "StatusBar", "BkBitmap", &dbv)) { + if ( !db_get_s(NULL, "StatusBar", "BkBitmap", &dbv)) { SetDlgItemTextA(hwndDlg,IDC_FILENAME,dbv.pszVal); char szPath[MAX_PATH]; @@ -1211,7 +1211,7 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP { DBVARIANT dbv = {0}; TCHAR *s; - if ( !DBGetContactSettingTString(NULL,"CList","TitleText",&dbv)) + if ( !db_get_ts(NULL,"CList","TitleText",&dbv)) s = dbv.ptszVal; else s = _T(MIRANDANAME); @@ -1224,17 +1224,17 @@ static INT_PTR CALLBACK DlgProcClistWindowOpts(HWND hwndDlg, UINT msg, WPARAM wP sprintf(szUin,"%u",db_get_dw(NULL,"ICQ","UIN",0)); SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING, 0, (LPARAM)szUin); - if ( !DBGetContactSettingString(NULL,"ICQ","Nick",&dbv)) { + if ( !db_get_s(NULL,"ICQ","Nick",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING, 0, (LPARAM)dbv.pszVal); db_free(&dbv); dbv.pszVal = NULL; } - if ( !DBGetContactSettingString(NULL,"ICQ","FirstName",&dbv)) { + if ( !db_get_s(NULL,"ICQ","FirstName",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING, 0, (LPARAM)dbv.pszVal); db_free(&dbv); dbv.pszVal = NULL; } - if ( !DBGetContactSettingString(NULL,"ICQ","e-mail",&dbv)) { + if ( !db_get_s(NULL,"ICQ","e-mail",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING, 0, (LPARAM)dbv.pszVal); db_free(&dbv); dbv.pszVal = NULL; @@ -1494,7 +1494,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, dat->item[indx].useWinColours = db_get_b(NULL,module, "UseWinColours", CLCDEFAULT_USEWINDOWSCOLOURS); { DBVARIANT dbv; - if ( !DBGetContactSettingString(NULL,module,"BkBitmap",&dbv)) + if ( !db_get_s(NULL,module,"BkBitmap",&dbv)) { int retval = PathToAbsolute(dbv.pszVal, dat->item[indx].filename); if ( !retval || retval == CALLSERVICE_NOTFOUND) diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 63a30b58de..037143b7d6 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -629,7 +629,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(NULL, "CList","SecondLineText", &dbv)) + if ( !db_get_ts(NULL, "CList","SecondLineText", &dbv)) { lstrcpyn(dat->second_line_text, dbv.ptszVal, SIZEOF(dat->second_line_text)-1); dat->second_line_text[SIZEOF(dat->second_line_text)-1] = _T('\0'); @@ -667,7 +667,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(NULL, "CList","ThirdLineText", &dbv)) + if ( !db_get_ts(NULL, "CList","ThirdLineText", &dbv)) { lstrcpyn(dat->third_line_text, dbv.ptszVal, SIZEOF(dat->third_line_text)-1); dat->third_line_text[SIZEOF(dat->third_line_text)-1] = _T('\0'); @@ -721,7 +721,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) { if ( db_get_b(NULL,"CLC","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSettingString(NULL,"CLC","BkBitmap",&dbv)) + if ( !db_get_s(NULL,"CLC","BkBitmap",&dbv)) { dat->hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal); db_free(&dbv); @@ -737,7 +737,7 @@ void LoadCLCOptions(HWND hwnd, ClcData *dat ) dat->MenuTextHiColor = sttGetColor("Menu","SelTextColour",CLCDEFAULT_MODERN_SELTEXTCOLOUR); if ( db_get_b(NULL,"Menu","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSettingString(NULL,"Menu","BkBitmap",&dbv)) { + if ( !db_get_s(NULL,"Menu","BkBitmap",&dbv)) { dat->hMenuBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal); db_free(&dbv); } diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index c335c32bbc..7778b24724 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -278,7 +278,7 @@ static int ehhEventAreaBackgroundSettingsChanged(WPARAM wParam, LPARAM lParam) DBVARIANT dbv; event_area.bkColour = sttGetColor("EventArea","BkColour",CLCDEFAULT_BKCOLOUR); if ( db_get_b(NULL,"EventArea","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSettingString(NULL,"EventArea","BkBitmap",&dbv)) { + if ( !db_get_s(NULL,"EventArea","BkBitmap",&dbv)) { event_area.hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal); db_free(&dbv); } diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index 7d18bd4c34..ec7a3bdb85 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -529,7 +529,7 @@ static INT_PTR CALLBACK DlgProcItemTextOpts(HWND hwndDlg, UINT msg, WPARAM wPara case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); CheckDlgButton(hwndDlg, IDC_RTL, db_get_b(NULL,"CList","TextRTL",SETTING_TEXT_RTL_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED ); - //TODO: init IDC_ALIGNGROUPCOMBO from DBGetContactSettingByte(NULL,"CList","AlignGroupCaptions",SETTING_ALIGNGROPCAPTION_DEFAULT); + //TODO: init IDC_ALIGNGROUPCOMBO from db_get_b(NULL,"CList","AlignGroupCaptions",SETTING_ALIGNGROPCAPTION_DEFAULT); { int item; TCHAR *align[] = {LPGENT("Left align group names"), LPGENT("Center group names"), LPGENT("Right align group names")}; @@ -575,7 +575,7 @@ static INT_PTR CALLBACK DlgProcItemTextOpts(HWND hwndDlg, UINT msg, WPARAM wPara switch (((LPNMHDR)lParam)->code) { case PSN_APPLY: db_set_b(NULL,"CList","TextRTL", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_RTL)); - //TODO: Store IDC_ALIGNGROUPCOMBO at DBGetContactSettingByte(NULL,"CList","AlignGroupCaptions",SETTING_ALIGNGROPCAPTION_DEFAULT); + //TODO: Store IDC_ALIGNGROUPCOMBO at db_get_b(NULL,"CList","AlignGroupCaptions",SETTING_ALIGNGROPCAPTION_DEFAULT); db_set_b(NULL,"CList","AlignGroupCaptions",(BYTE)SendDlgItemMessage(hwndDlg,IDC_ALIGNGROUPCOMBO,CB_GETCURSEL, 0, 0)); db_set_b(NULL,"CList","TextAlignToRight", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_ALIGN_RIGHT)); db_set_b(NULL,"CList","TextReplaceSmileys", (BYTE)IsDlgButtonChecked(hwndDlg,IDC_REPLACE_SMILEYS)); @@ -610,7 +610,7 @@ static INT_PTR CALLBACK DlgProcItemSecondLineOpts(HWND hwndDlg, UINT msg, WPARAM CheckDlgButton(hwndDlg, IDC_DRAW_SMILEYS, db_get_b(NULL,"CList","SecondLineDrawSmileys",SETTING_SECONDLINE_SMILEYS_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED); { DBVARIANT dbv; - if ( !DBGetContactSettingTString(NULL, "CList","SecondLineText", &dbv)) { + if ( !db_get_ts(NULL, "CList","SecondLineText", &dbv)) { SetWindowText(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), dbv.ptszVal); db_free(&dbv); } @@ -786,7 +786,7 @@ static INT_PTR CALLBACK DlgProcItemThirdLineOpts(HWND hwndDlg, UINT msg, WPARAM CheckDlgButton(hwndDlg, IDC_DRAW_SMILEYS, db_get_b(NULL,"CList","ThirdLineDrawSmileys",SETTING_THIRDLINE_SMILEYS_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED ); { DBVARIANT dbv; - if ( !DBGetContactSettingTString(NULL, "CList","ThirdLineText", &dbv)) { + if ( !db_get_ts(NULL, "CList","ThirdLineText", &dbv)) { SetWindowText(GetDlgItem(hwndDlg,IDC_VARIABLE_TEXT), dbv.ptszVal); db_free(&dbv); } diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index dd241971ee..7d2c965705 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -251,7 +251,7 @@ void cliCheckCacheItem(ClcCacheEntry *pdnce) if (pdnce->tszGroup == NULL) { DBVARIANT dbv = {0}; - if ( !DBGetContactSettingTString(pdnce->hContact,"CList","Group",&dbv)) { + if ( !db_get_ts(pdnce->hContact,"CList","Group",&dbv)) { pdnce->tszGroup = mir_tstrdup(dbv.ptszVal); db_free(&dbv); } diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index 9a4525ad1f..b4339c7720 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -196,7 +196,7 @@ void cliTrayIconUpdateBase(const char *szChangedProto) if ( db_get_b(NULL,"CList","TrayIcon",SETTING_TRAYICON_DEFAULT) == SETTING_TRAYICON_SINGLE && db_get_b(NULL,"CList","AlwaysPrimary",SETTING_ALWAYSPRIMARY_DEFAULT)) { - if ( !DBGetContactSettingString(NULL,"CList","PrimaryStatus",&dbv)) { + if ( !db_get_s(NULL,"CList","PrimaryStatus",&dbv)) { szProto = NEWSTR_ALLOCA(dbv.pszVal); db_free(&dbv); } @@ -209,7 +209,7 @@ void cliTrayIconUpdateBase(const char *szChangedProto) switch( db_get_b(NULL,"CList","TrayIcon",SETTING_TRAYICON_DEFAULT)) { case SETTING_TRAYICON_SINGLE: { - if ( !DBGetContactSettingString(NULL,"CList","PrimaryStatus",&dbv)) { + if ( !db_get_s(NULL,"CList","PrimaryStatus",&dbv)) { szProto = NEWSTR_ALLOCA(dbv.pszVal); db_free(&dbv); } @@ -330,7 +330,7 @@ void cliTrayIconUpdateBase(const char *szChangedProto) } else if (status >= ID_STATUS_OFFLINE && status <= ID_STATUS_IDLE) { - if (DBGetContactSettingString(NULL,"CList","PrimaryStatus",&dbv)) + if (db_get_s(NULL,"CList","PrimaryStatus",&dbv)) szProto = NULL; else szProto = dbv.pszVal; diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 012fea9575..3ab3bafa9e 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -107,18 +107,12 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM wParam, LPARAM lParam) if ( lstrcmp( _T(CLISTCONTROL_CLASS), cls)) hwndClist = pcli->hwndContactList; - CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_FLAGS; HANDLE hItem = (HANDLE)SendMessage(hwndClist, CLM_GETSELECTION, 0, 0); - if ( !hItem) - mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hRenameMenuItem, (LPARAM)&mi); + Menu_ShowItem(hRenameMenuItem, hItem != 0); if ( !hItem || !IsHContactContact(hItem) || !db_get_b(NULL,"CList","AvatarsShow",SETTINGS_SHOWAVATARS_DEFAULT)) { - mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hShowAvatarMenuItem, (LPARAM)&mi); - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideAvatarMenuItem, (LPARAM)&mi); + Menu_ShowItem(hShowAvatarMenuItem, false); + Menu_ShowItem(hHideAvatarMenuItem, false); } else { int has_avatar; @@ -126,8 +120,8 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM wParam, LPARAM lParam) if ( ServiceExists(MS_AV_GETAVATARBITMAP)) has_avatar = CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hItem, 0); else { - DBVARIANT dbv = {0}; - if ( DBGetContactSettingTString(hItem, "ContactPhoto", "File", &dbv)) + DBVARIANT dbv; + if ( db_get_ts(hItem, "ContactPhoto", "File", &dbv)) has_avatar = 0; else { has_avatar = 1; @@ -135,18 +129,9 @@ int CLUI::OnEvent_ContactMenuPreBuild(WPARAM wParam, LPARAM lParam) } } - if ( db_get_b(hItem, "CList", "HideContactAvatar", 0)) { - mi.flags = CMIM_FLAGS | (has_avatar ? 0 : CMIF_GRAYED); - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hShowAvatarMenuItem, (LPARAM)&mi); - mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideAvatarMenuItem, (LPARAM)&mi); - } - else { - mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hShowAvatarMenuItem, (LPARAM)&mi); - mi.flags = CMIM_FLAGS | (has_avatar ? 0 : CMIF_GRAYED); - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hHideAvatarMenuItem, (LPARAM)&mi); - } + bool bHideAvatar = db_get_b(hItem, "CList", "HideContactAvatar", 0) != 0; + Menu_ShowItem(hShowAvatarMenuItem, bHideAvatar); + Menu_ShowItem(hHideAvatarMenuItem, !bHideAvatar); } return 0; @@ -641,7 +626,7 @@ void CLUI_ChangeWindowMode() //4- Set Title TCHAR titleText[255] = {0}; DBVARIANT dbv; - if ( DBGetContactSettingTString(NULL, "CList", "TitleText", &dbv)) + if ( db_get_ts(NULL, "CList", "TitleText", &dbv)) lstrcpyn(titleText,_T(MIRANDANAME),SIZEOF(titleText)); else { lstrcpyn(titleText,dbv.ptszVal,SIZEOF(titleText)); @@ -1003,7 +988,7 @@ static int CLUI_CreateTimerForConnectingIcon(WPARAM wParam,LPARAM lParam) KillTimer(pcli->hwndContactList,TM_STATUSBARUPDATE+pt->nIndex); int cnt = CLUI_GetConnectingIconForProtoCount(szProto); if (cnt != 0) { - nAnimatedIconStep = 100;/*DBGetContactSettingWord(NULL,"CLUI","DefaultStepConnectingIcon",100);*/ + nAnimatedIconStep = 100;/*db_get_w(NULL,"CLUI","DefaultStepConnectingIcon",100);*/ pt->nIconsCount = cnt; if (pt->himlIconList) ImageList_Destroy(pt->himlIconList); @@ -1296,7 +1281,7 @@ int CLUI_TestCursorOnBorders() if (g_bTransparentFlag) { if ( !bTransparentFocus && gf != hwnd) { CLUI_SmoothAlphaTransition(hwnd, db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), 1); - //g_proc_SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)DBGetContactSettingByte(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), LWA_ALPHA); + //g_proc_SetLayeredWindowAttributes(hwnd, RGB(0, 0, 0), (BYTE)db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), LWA_ALPHA); bTransparentFocus = 1; CLUI_SafeSetTimer(hwnd, TM_AUTOALPHA,250, NULL); } diff --git a/plugins/Clist_modern/src/modern_cluiframes.cpp b/plugins/Clist_modern/src/modern_cluiframes.cpp index 56357fb542..ff162fc7f7 100644 --- a/plugins/Clist_modern/src/modern_cluiframes.cpp +++ b/plugins/Clist_modern/src/modern_cluiframes.cpp @@ -672,7 +672,7 @@ static int DBLoadFrameSettingsAtPos(int pos,int Frameid) _itoa(pos,sadd,10); - //DBWriteContactSettingString(0, CLUIFrameModule,strcat("Name",sadd),Frames[Frameid].name); + //db_set_s(0, CLUIFrameModule,strcat("Name",sadd),Frames[Frameid].name); //bool g_pfwFrames[Frameid].collapsed = db_get_b(0, CLUIFrameModule,AS(buf,"Collapse",sadd),g_pfwFrames[Frameid].collapsed); @@ -735,7 +735,7 @@ static int LocateStorePosition(int Frameid,int maxstored) for (int i=0; i < maxstored; i++) { mir_snprintf(settingname,SIZEOF(settingname),"Name%d",i); DBVARIANT dbv = {0}; - if ( DBGetContactSettingTString( NULL, CLUIFrameModule, settingname, &dbv )) + if ( db_get_ts( NULL, CLUIFrameModule, settingname, &dbv )) continue; if ( lstrcmpi(dbv.ptszVal, g_pfwFrames[Frameid].Name) == 0) { @@ -2600,7 +2600,7 @@ int CLUIFramesOnClistResize(WPARAM wParam,LPARAM lParam) } - //if (DBGetContactSettingByte(NULL,"CLUI","ShowSBar",SETTING_SHOWSBAR_DEFAULT))GetWindowRect(pcli->hwndStatus,&rcStatus); + //if (db_get_b(NULL,"CLUI","ShowSBar",SETTING_SHOWSBAR_DEFAULT))GetWindowRect(pcli->hwndStatus,&rcStatus); //else rcStatus.top = rcStatus.bottom = 0; // nRect.top--; /* $$$ rcStatus.top = rcStatus.bottom = 0; @@ -2663,7 +2663,7 @@ int OnFrameTitleBarBackgroundChange(WPARAM wParam,LPARAM lParam) if (g_CluiData.fDisableSkinEngine) { if ( db_get_b(NULL,"FrameTitleBar","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSettingString(NULL,"FrameTitleBar","BkBitmap",&dbv)) { + if ( !db_get_s(NULL,"FrameTitleBar","BkBitmap",&dbv)) { hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal); db_free(&dbv); } diff --git a/plugins/Clist_modern/src/modern_newrowopts.cpp b/plugins/Clist_modern/src/modern_newrowopts.cpp index 3cbb3fc197..7e5d9533cc 100644 --- a/plugins/Clist_modern/src/modern_newrowopts.cpp +++ b/plugins/Clist_modern/src/modern_newrowopts.cpp @@ -173,7 +173,7 @@ BOOL CALLBACK DlgProcItemNewRowOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (RemoveNode(res1)) res1 = 0; TRACE("*********** Nodes DUMP 2 ***********\n"); TraceTreeLevel(RootNode); - //CheckDlgButton(hwndDlg, IDC_HIDE_ICON_ON_AVATAR, DBGetContactSettingByte(NULL,"CList","IconHideOnAvatar",SETTING_HIDEICONONAVATAR_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED ); + //CheckDlgButton(hwndDlg, IDC_HIDE_ICON_ON_AVATAR, db_get_b(NULL,"CList","IconHideOnAvatar",SETTING_HIDEICONONAVATAR_DEFAULT) == 1 ? BST_CHECKED : BST_UNCHECKED ); MessageBox(hwndDlg,_T("Init NewRow Dialog"),_T("Notify"),MB_OK); break; } diff --git a/plugins/Clist_modern/src/modern_statusbar.cpp b/plugins/Clist_modern/src/modern_statusbar.cpp index 8cf08c44d8..496c18ffd4 100644 --- a/plugins/Clist_modern/src/modern_statusbar.cpp +++ b/plugins/Clist_modern/src/modern_statusbar.cpp @@ -119,7 +119,7 @@ int LoadStatusBarData() DBVARIANT dbv; g_StatusBarData.bkColour = sttGetColor("StatusBar","BkColour",CLCDEFAULT_BKCOLOUR); if ( db_get_b(NULL,"StatusBar","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSettingString(NULL,"StatusBar","BkBitmap",&dbv)) { + if ( !db_get_s(NULL,"StatusBar","BkBitmap",&dbv)) { g_StatusBarData.hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal); db_free(&dbv); } diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index 8b7598c66e..592320f7c9 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -261,7 +261,7 @@ static int FillDialog(HWND hwnd) for (i=0;;i++) { mir_snprintf(buf, 20, "%d", i); - if (DBGetContactSettingTString(NULL, "CListGroups", buf, &dbv)) + if (db_get_ts(NULL, "CListGroups", buf, &dbv)) break; item.pszText = &dbv.ptszVal[1]; @@ -557,10 +557,10 @@ static void UpdateFilters() mir_sntprintf(szTemp, 100, TranslateT("Configuring view mode: %s"), szTempBuf); SetDlgItemText(clvmHwnd, IDC_CURVIEWMODE2, szTemp); mir_snprintf(szSetting, 128, "%c%s_PF", 246, szBuf); - if (DBGetContactSettingString(NULL, CLVM_MODULE, szSetting, &dbv_pf)) + if (db_get_s(NULL, CLVM_MODULE, szSetting, &dbv_pf)) goto cleanup; mir_snprintf(szSetting, 128, "%c%s_GF", 246, szBuf); - if (DBGetContactSettingTString(NULL, CLVM_MODULE, szSetting, &dbv_gf)) + if (db_get_ts(NULL, CLVM_MODULE, szSetting, &dbv_gf)) goto cleanup; mir_snprintf(szSetting, 128, "%c%s_OPT", 246, szBuf); if ((opt = db_get_dw(NULL, CLVM_MODULE, szSetting, -1)) != -1) @@ -1275,7 +1275,7 @@ static int ehhViewModeBackgroundSettingsChanged(WPARAM wParam, LPARAM lParam) DBVARIANT dbv; view_mode.bkColour = sttGetColor("ViewMode","BkColour",CLCDEFAULT_BKCOLOUR); if ( db_get_b(NULL,"ViewMode","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSettingString(NULL,"ViewMode","BkBitmap",&dbv)) { + if ( !db_get_s(NULL,"ViewMode","BkBitmap",&dbv)) { view_mode.hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal); db_free(&dbv); } @@ -1341,7 +1341,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) if ( !name) // Name is null - apply last stored view mode { - if ( !DBGetContactSettingString(NULL, CLVM_MODULE, szSetting, &dbv)) + if ( !db_get_s(NULL, CLVM_MODULE, szSetting, &dbv)) { name = (char*)_alloca(strlen(dbv.pszVal)+1); strcpy(name,dbv.pszVal); @@ -1378,7 +1378,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) if ( !onlySelector ) { mir_snprintf(szSetting, 256, "%c%s_PF", 246, name); - if ( !DBGetContactSettingString(NULL, CLVM_MODULE, szSetting, &dbv)) { + if ( !db_get_s(NULL, CLVM_MODULE, szSetting, &dbv)) { if (lstrlenA(dbv.pszVal) >= 2) { strncpy(g_CluiData.protoFilter, dbv.pszVal, SIZEOF(g_CluiData.protoFilter)); @@ -1388,7 +1388,7 @@ void ApplyViewMode(const char *Name, bool onlySelector ) mir_free(dbv.pszVal); } mir_snprintf(szSetting, 256, "%c%s_GF", 246, name); - if ( !DBGetContactSettingTString(NULL, CLVM_MODULE, szSetting, &dbv)) + if ( !db_get_ts(NULL, CLVM_MODULE, szSetting, &dbv)) { if (lstrlen(dbv.ptszVal) >= 2) { diff --git a/plugins/Clist_mw/src/BkgrCfg.cpp b/plugins/Clist_mw/src/BkgrCfg.cpp index 5dced4e4db..237cd6317c 100644 --- a/plugins/Clist_mw/src/BkgrCfg.cpp +++ b/plugins/Clist_mw/src/BkgrCfg.cpp @@ -65,11 +65,11 @@ static INT_PTR CALLBACK DlgProcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP dat->item[indx].changed = FALSE; dat->item[indx].useBitmap = db_get_b(NULL,module, "UseBitmap", DEFAULT_USEBITMAP); - dat->item[indx].bkColor = DBGetContactSettingDword(NULL,module, "BkColour", DEFAULT_BKCOLOUR); - dat->item[indx].selColor = DBGetContactSettingDword(NULL,module, "SelBkColour", DEFAULT_SELBKCOLOUR); + dat->item[indx].bkColor = db_get_dw(NULL,module, "BkColour", DEFAULT_BKCOLOUR); + dat->item[indx].selColor = db_get_dw(NULL,module, "SelBkColour", DEFAULT_SELBKCOLOUR); { DBVARIANT dbv; - if ( !DBGetContactSettingString(NULL,module,"BkBitmap",&dbv)) + if ( !db_get_s(NULL,module,"BkBitmap",&dbv)) { int retval = PathToAbsolute(dbv.pszVal, dat->item[indx].filename); if ( !retval || retval == CALLSERVICE_NOTFOUND) @@ -221,14 +221,14 @@ static INT_PTR CALLBACK DlgProcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP COLORREF col; if ((col = dat->item[indx].bkColor) == DEFAULT_BKCOLOUR) - DBDeleteContactSetting(NULL, module, "BkColour"); + db_unset(NULL, module, "BkColour"); else - DBWriteContactSettingDword(NULL, module, "BkColour", col); + db_set_dw(NULL, module, "BkColour", col); if ((col = dat->item[indx].selColor) == DEFAULT_SELBKCOLOUR) - DBDeleteContactSetting(NULL, module, "SelBkColour"); + db_unset(NULL, module, "SelBkColour"); else - DBWriteContactSettingDword(NULL, module, "SelBkColour", col); + db_set_dw(NULL, module, "SelBkColour", col); } { char str[MAX_PATH]; @@ -238,7 +238,7 @@ static INT_PTR CALLBACK DlgProcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP else db_set_s(NULL, module, "BkBitmap", str); } - DBWriteContactSettingWord(NULL, module, "BkBmpUse", dat->item[indx].flags); + db_set_w(NULL, module, "BkBmpUse", dat->item[indx].flags); dat->item[indx].changed = FALSE; NotifyEventHooks(hEventBkgrChanged, (WPARAM)module, 0); } diff --git a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp index b504a96f0e..498dc2e896 100644 --- a/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/cluiframes.cpp @@ -516,25 +516,25 @@ int DBStoreFrameSettingsAtPos(int pos,int Frameid) _itoa(pos,sadd,10); - DBWriteContactSettingTString(0,CLUIFrameModule,AS(buf,"Name",sadd),Frames[Frameid].name); + db_set_ts(0,CLUIFrameModule,AS(buf,"Name",sadd),Frames[Frameid].name); //boolean db_set_b(0,CLUIFrameModule,AS(buf,"Collapse",sadd),(BYTE)btoint(Frames[Frameid].collapsed)); db_set_b(0,CLUIFrameModule,AS(buf,"Locked",sadd),(BYTE)btoint(Frames[Frameid].Locked)); db_set_b(0,CLUIFrameModule,AS(buf,"Visible",sadd),(BYTE)btoint(Frames[Frameid].visible)); db_set_b(0,CLUIFrameModule,AS(buf,"TBVisile",sadd),(BYTE)btoint(Frames[Frameid].TitleBar.ShowTitleBar)); - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"Height",sadd),(WORD)Frames[Frameid].height); - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"HeightCollapsed",sadd),(WORD)Frames[Frameid].HeightWhenCollapsed); - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"Align",sadd),(WORD)Frames[Frameid].align); + db_set_w(0,CLUIFrameModule,AS(buf,"Height",sadd),(WORD)Frames[Frameid].height); + db_set_w(0,CLUIFrameModule,AS(buf,"HeightCollapsed",sadd),(WORD)Frames[Frameid].HeightWhenCollapsed); + db_set_w(0,CLUIFrameModule,AS(buf,"Align",sadd),(WORD)Frames[Frameid].align); //FloatingPos - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"FloatX",sadd),(WORD)Frames[Frameid].FloatingPos.x); - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"FloatY",sadd),(WORD)Frames[Frameid].FloatingPos.y); - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"FloatW",sadd),(WORD)Frames[Frameid].FloatingSize.x); - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"FloatH",sadd),(WORD)Frames[Frameid].FloatingSize.y); + db_set_w(0,CLUIFrameModule,AS(buf,"FloatX",sadd),(WORD)Frames[Frameid].FloatingPos.x); + db_set_w(0,CLUIFrameModule,AS(buf,"FloatY",sadd),(WORD)Frames[Frameid].FloatingPos.y); + db_set_w(0,CLUIFrameModule,AS(buf,"FloatW",sadd),(WORD)Frames[Frameid].FloatingSize.x); + db_set_w(0,CLUIFrameModule,AS(buf,"FloatH",sadd),(WORD)Frames[Frameid].FloatingSize.y); db_set_b(0,CLUIFrameModule,AS(buf,"Floating",sadd),(BYTE)btoint(Frames[Frameid].floating)); db_set_b(0,CLUIFrameModule,AS(buf,"UseBorder",sadd),(BYTE)btoint(Frames[Frameid].UseBorder)); - DBWriteContactSettingWord(0,CLUIFrameModule,AS(buf,"Order",sadd),(WORD)Frames[Frameid].order); + db_set_w(0,CLUIFrameModule,AS(buf,"Order",sadd),(WORD)Frames[Frameid].order); //db_set_s(0,CLUIFrameModule,AS(buf,"TBName",sadd),Frames[Frameid].TitleBar.tbname); return 0; } @@ -593,7 +593,7 @@ int CLUIFramesStoreFrameSettings(int Frameid) } DBStoreFrameSettingsAtPos(storpos,Frameid); - DBWriteContactSettingWord(0,CLUIFrameModule,"StoredFrames",(WORD)maxstored); + db_set_w(0,CLUIFrameModule,"StoredFrames",(WORD)maxstored); //ulockfrm(); return 0; } @@ -1739,9 +1739,9 @@ int CLUIFramesResize(const RECT newsize) int sepw = GapBetweenFrames; SortData *sdarray; - GapBetweenTitlebar = (int)DBGetContactSettingDword(NULL,"CLUIFrames","GapBetweenTitleBar",1); - GapBetweenFrames = DBGetContactSettingDword(NULL,"CLUIFrames","GapBetweenFrames",1); - TitleBarH = DBGetContactSettingDword(NULL,"CLUIFrames","TitleBarH",DEFAULT_TITLEBAR_HEIGHT); + GapBetweenTitlebar = (int)db_get_dw(NULL,"CLUIFrames","GapBetweenTitleBar",1); + GapBetweenFrames = db_get_dw(NULL,"CLUIFrames","GapBetweenFrames",1); + TitleBarH = db_get_dw(NULL,"CLUIFrames","TitleBarH",DEFAULT_TITLEBAR_HEIGHT); sepw = GapBetweenFrames; if (nFramescount < 1) @@ -1941,12 +1941,12 @@ int OnFrameTitleBarBackgroundChange(WPARAM wParam,LPARAM lParam) AlignCOLLIconToLeft = db_get_b(NULL,"FrameTitleBar","AlignCOLLIconToLeft",0); - bkColour = DBGetContactSettingDword(NULL,"FrameTitleBar","BkColour",CLCDEFAULT_BKCOLOUR); - //SelBkColour = DBGetContactSettingDword(NULL,"FrameTitleBar","SelBkColour",0); + bkColour = db_get_dw(NULL,"FrameTitleBar","BkColour",CLCDEFAULT_BKCOLOUR); + //SelBkColour = db_get_dw(NULL,"FrameTitleBar","SelBkColour",0); if (hBmpBackground) {DeleteObject(hBmpBackground); hBmpBackground = NULL;} if ( db_get_b(NULL,"FrameTitleBar","UseBitmap",CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSetting(NULL,"FrameTitleBar","BkBitmap",&dbv)) { + if ( !db_get(NULL,"FrameTitleBar","BkBitmap",&dbv)) { hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); } @@ -2108,7 +2108,7 @@ static int DrawTitleBar(HDC dc,RECT rect,int Frameid) DrawBackGroundTTB(Frames[pos].TitleBar.hwnd,hdcMem); //hFront = CreateSolidPe (SelBkColour); //SelectObject(hdcMem,hFront); - SelBkColour = DBGetContactSettingDword(NULL,"CLUIFrames","FramesTitleBarFontCol",0); + SelBkColour = db_get_dw(NULL,"CLUIFrames","FramesTitleBarFontCol",0); if (SelBkColour) SetTextColor(hdcMem,SelBkColour); if ( !AlignCOLLIconToLeft) { @@ -2871,7 +2871,7 @@ int LoadCLUIFramesModule(void) RegisterClass(&cntclass); //end container helper - GapBetweenFrames = DBGetContactSettingDword(NULL,"CLUIFrames","GapBetweenFrames",1); + GapBetweenFrames = db_get_dw(NULL,"CLUIFrames","GapBetweenFrames",1); nFramescount = 0; InitializeCriticalSection(&csFrameHook); diff --git a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp index f5d577d70c..10a0ad3b4b 100644 --- a/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp +++ b/plugins/Clist_mw/src/CLUIFrames/statusbar.cpp @@ -30,20 +30,20 @@ int extraspace; int OnStatusBarBackgroundChange() { showOpts = db_get_b(NULL,"CLUI","SBarShow",1); - bkColour = DBGetContactSettingDword(NULL,"StatusBar","BkColour",CLCDEFAULT_BKCOLOUR); + bkColour = db_get_dw(NULL,"StatusBar","BkColour",CLCDEFAULT_BKCOLOUR); if (hBmpBackground) DeleteObject(hBmpBackground), hBmpBackground = NULL; if ( db_get_b(NULL,"StatusBar","UseBitmap",CLCDEFAULT_USEBITMAP)) { DBVARIANT dbv; - if ( !DBGetContactSettingTString(NULL, "StatusBar", "BkBitmap", &dbv)) { + if ( !db_get_ts(NULL, "StatusBar", "BkBitmap", &dbv)) { hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAPT, 0, (LPARAM)dbv.ptszVal); db_free(&dbv); } } backgroundBmpUse = db_get_w(NULL,"StatusBar","BkBmpUse",CLCDEFAULT_BKBMPUSE); - extraspace = DBGetContactSettingDword(NULL,"StatusBar","BkExtraSpace",0); + extraspace = db_get_dw(NULL,"StatusBar","BkExtraSpace",0); RecreateStatusBar(pcli->hwndContactList); if (pcli->hwndStatus) InvalidateRect(pcli->hwndStatus,NULL,TRUE); @@ -228,8 +228,8 @@ void DrawBackGround(HWND hwnd,HDC mhdc) ds.hwndItem = hwnd; ds.hDC = hdcMem; - int startoffset = DBGetContactSettingDword(NULL,"StatusBar","FirstIconOffset",0); - int extraspace = DBGetContactSettingDword(NULL,"StatusBar","BkExtraSpace",0); + int startoffset = db_get_dw(NULL,"StatusBar","FirstIconOffset",0); + int extraspace = db_get_dw(NULL,"StatusBar","BkExtraSpace",0); int nParts = SendMessage(hwnd,SB_GETPARTS,0,0); RECT rc = { 0 }, clrc; diff --git a/plugins/Clist_mw/src/clc.cpp b/plugins/Clist_mw/src/clc.cpp index dce9541b22..26924d1f8c 100644 --- a/plugins/Clist_mw/src/clc.cpp +++ b/plugins/Clist_mw/src/clc.cpp @@ -219,7 +219,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L ClcGroup *group; if ( FindItem(hwnd,dat,(HANDLE)wParam,&contact,&group,NULL) && contact != NULL) { contact->flags &= ~CONTACTF_STATUSMSG; - if ( !DBGetContactSettingTString((HANDLE)wParam, "CList", "StatusMsg", &dbv)) { + if ( !db_get_ts((HANDLE)wParam, "CList", "StatusMsg", &dbv)) { int j; if (dbv.ptszVal == NULL||_tcslen(dbv.ptszVal) == 0) break; lstrcpyn(contact->szStatusMsg, dbv.ptszVal, SIZEOF(contact->szStatusMsg)); @@ -228,7 +228,7 @@ LRESULT CALLBACK ContactListControlWndProc(HWND hwnd, UINT msg, WPARAM wParam, L contact->szStatusMsg[j] = ' '; } } - DBFreeVariant(&dbv); + db_free(&dbv); if (_tcslen(contact->szStatusMsg)>0) { contact->flags |= CONTACTF_STATUSMSG; dat->needsResort = TRUE; diff --git a/plugins/Clist_mw/src/clcitems.cpp b/plugins/Clist_mw/src/clcitems.cpp index bea0430653..245afe3048 100644 --- a/plugins/Clist_mw/src/clcitems.cpp +++ b/plugins/Clist_mw/src/clcitems.cpp @@ -166,7 +166,7 @@ static struct ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group group->cl.items[i]->proto = szProto; if (dat->style & CLS_SHOWSTATUSMESSAGES) { - if ( !DBGetContactSettingTString(hContact, "CList", "StatusMsg", &dbv)) { + if ( !db_get_ts(hContact, "CList", "StatusMsg", &dbv)) { int j; lstrcpyn(group->cl.items[i]->szStatusMsg, dbv.ptszVal, SIZEOF(group->cl.items[i]->szStatusMsg)); for (j = (int)_tcslen(group->cl.items[i]->szStatusMsg)-1;j>=0;j--) { @@ -174,7 +174,7 @@ static struct ClcContact * AddContactToGroup(struct ClcData *dat,ClcGroup *group group->cl.items[i]->szStatusMsg[j] = ' '; } } - DBFreeVariant(&dbv); + db_free(&dbv); if (_tcslen(group->cl.items[i]->szStatusMsg)>0) { group->cl.items[i]->flags |= CONTACTF_STATUSMSG; } @@ -292,7 +292,7 @@ void DeleteItemFromTree(HWND hwnd,HANDLE hItem) if ( !IsHContactContact(hItem)) return; ClearClcContactCache(dat,hItem); - if (DBGetContactSettingTString(hItem,"CList","Group",&dbv)) return; + if (db_get_ts(hItem,"CList","Group",&dbv)) return; //decrease member counts of all parent groups too group = &dat->list; @@ -423,7 +423,7 @@ void RebuildEntireList(HWND hwnd,struct ClcData *dat) sprintf(buf,"RebuildEntireList %d \r\n",tick); OutputDebugStringA(buf); - DBWriteContactSettingDword((HANDLE)0,"CLUI","PF:Last RebuildEntireList Time:",tick); + db_set_dw((HANDLE)0,"CLUI","PF:Last RebuildEntireList Time:",tick); } } @@ -512,7 +512,7 @@ void SortCLC(HWND hwnd,struct ClcData *dat,int useInsertionSort) if (tick > 5) { sprintf(buf,"SortCLC %d \r\n",tick); OutputDebugStringA(buf); - DBWriteContactSettingDword((HANDLE)0,"CLUI","PF:Last SortCLC Time:",tick); + db_set_dw((HANDLE)0,"CLUI","PF:Last SortCLC Time:",tick); } } #endif diff --git a/plugins/Clist_mw/src/clcopts.cpp b/plugins/Clist_mw/src/clcopts.cpp index 63ee91a856..845e3d104d 100644 --- a/plugins/Clist_mw/src/clcopts.cpp +++ b/plugins/Clist_mw/src/clcopts.cpp @@ -216,7 +216,7 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),GWL_STYLE,GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),GWL_STYLE)|TVS_NOHSCROLL|TVS_CHECKBOXES); SetWindowLongPtr(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),GWL_STYLE,GetWindowLongPtr(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),GWL_STYLE)|TVS_NOHSCROLL|TVS_CHECKBOXES); { - DWORD exStyle = DBGetContactSettingDword(NULL,"CLC","ExStyle",pcli->pfnGetDefaultExStyle()); + DWORD exStyle = db_get_dw(NULL,"CLC","ExStyle",pcli->pfnGetDefaultExStyle()); for (int i = 0;i < SIZEOF(checkBoxToStyleEx); i++) CheckDlgButton(hwndDlg,checkBoxToStyleEx[i].id,(exStyle&checkBoxToStyleEx[i].flag)^(checkBoxToStyleEx[i].flag*checkBoxToStyleEx[i].not)?BST_CHECKED:BST_UNCHECKED); @@ -231,13 +231,13 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam SendDlgItemMessage(hwndDlg,IDC_LEFTMARGINSPIN,UDM_SETPOS,0,MAKELONG( db_get_b(NULL,"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)); - CheckDlgButton(hwndDlg,IDC_GREYOUT,DBGetContactSettingDword(NULL,"CLC","GreyoutFlags",CLCDEFAULT_GREYOUTFLAGS)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hwndDlg,IDC_GREYOUT,db_get_dw(NULL,"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,SIZEOF(greyoutValues),DBGetContactSettingDword(NULL,"CLC","FullGreyoutFlags",CLCDEFAULT_FULLGREYOUTFLAGS)); - FillCheckBoxTree(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),offlineValues,SIZEOF(offlineValues),DBGetContactSettingDword(NULL,"CLC","OfflineModes",CLCDEFAULT_OFFLINEMODES)); + FillCheckBoxTree(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS),greyoutValues,SIZEOF(greyoutValues),db_get_dw(NULL,"CLC","FullGreyoutFlags",CLCDEFAULT_FULLGREYOUTFLAGS)); + FillCheckBoxTree(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS),offlineValues,SIZEOF(offlineValues),db_get_dw(NULL,"CLC","OfflineModes",CLCDEFAULT_OFFLINEMODES)); CheckDlgButton(hwndDlg,IDC_NOSCROLLBAR,db_get_b(NULL,"CLC","NoVScrollBar",0)?BST_CHECKED:BST_UNCHECKED); return TRUE; @@ -283,19 +283,19 @@ static INT_PTR CALLBACK DlgProcClcMainOpts(HWND hwndDlg, UINT msg, WPARAM wParam for (i = 0;i < SIZEOF(checkBoxToStyleEx);i++) if ((IsDlgButtonChecked(hwndDlg,checkBoxToStyleEx[i].id) == 0) == checkBoxToStyleEx[i].not) exStyle |= checkBoxToStyleEx[i].flag; - DBWriteContactSettingDword(NULL,"CLC","ExStyle",exStyle); + db_set_dw(NULL,"CLC","ExStyle",exStyle); DWORD fullGreyoutFlags = MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg,IDC_GREYOUTOPTS)); - DBWriteContactSettingDword(NULL,"CLC","FullGreyoutFlags",fullGreyoutFlags); + db_set_dw(NULL,"CLC","FullGreyoutFlags",fullGreyoutFlags); if (IsDlgButtonChecked(hwndDlg,IDC_GREYOUT)) - DBWriteContactSettingDword(NULL,"CLC","GreyoutFlags",fullGreyoutFlags); + db_set_dw(NULL,"CLC","GreyoutFlags",fullGreyoutFlags); else - DBWriteContactSettingDword(NULL,"CLC","GreyoutFlags",0); + db_set_dw(NULL,"CLC","GreyoutFlags",0); db_set_b(NULL,"CLC","ShowIdle",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_IDLE)?1:0)); - DBWriteContactSettingDword(NULL,"CLC","OfflineModes",MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS))); + db_set_dw(NULL,"CLC","OfflineModes",MakeCheckBoxTreeFlags(GetDlgItem(hwndDlg,IDC_HIDEOFFLINEOPTS))); db_set_b(NULL,"CLC","LeftMargin",(BYTE)SendDlgItemMessage(hwndDlg,IDC_LEFTMARGINSPIN,UDM_GETPOS,0,0)); - DBWriteContactSettingWord(NULL,"CLC","ScrollTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_SMOOTHTIMESPIN,UDM_GETPOS,0,0)); + db_set_w(NULL,"CLC","ScrollTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_SMOOTHTIMESPIN,UDM_GETPOS,0,0)); db_set_b(NULL,"CLC","GroupIndent",(BYTE)SendDlgItemMessage(hwndDlg,IDC_GROUPINDENTSPIN,UDM_GETPOS,0,0)); db_set_b(NULL,"CLC","NoVScrollBar",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_NOSCROLLBAR)?1:0)); @@ -320,12 +320,12 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w CheckDlgButton(hwndDlg,IDC_BITMAP,db_get_b(NULL,"StatusBar","UseBitmap",CLCDEFAULT_USEBITMAP)?BST_CHECKED:BST_UNCHECKED); SendMessage(hwndDlg,WM_USER+10,0,0); SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETDEFAULTCOLOUR,0,CLCDEFAULT_BKCOLOUR); - SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"StatusBar","BkColour",CLCDEFAULT_BKCOLOUR)); + SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,db_get_dw(NULL,"StatusBar","BkColour",CLCDEFAULT_BKCOLOUR)); SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETDEFAULTCOLOUR,0,CLCDEFAULT_SELBKCOLOUR); - SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"StatusBar","SelBkColour",CLCDEFAULT_SELBKCOLOUR)); + SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR,0,db_get_dw(NULL,"StatusBar","SelBkColour",CLCDEFAULT_SELBKCOLOUR)); { DBVARIANT dbv; - if ( !DBGetContactSettingString(NULL,"StatusBar","BkBitmap",&dbv)) { + if ( !db_get_s(NULL,"StatusBar","BkBitmap",&dbv)) { SetDlgItemTextA(hwndDlg,IDC_FILENAME,dbv.pszVal); char szPath[MAX_PATH]; @@ -398,11 +398,11 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w { COLORREF col; col = SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_GETCOLOUR,0,0); - if (col == CLCDEFAULT_BKCOLOUR) DBDeleteContactSetting(NULL,"StatusBar","BkColour"); - else DBWriteContactSettingDword(NULL,"StatusBar","BkColour",col); + if (col == CLCDEFAULT_BKCOLOUR) db_unset(NULL,"StatusBar","BkColour"); + else db_set_dw(NULL,"StatusBar","BkColour",col); col = SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_GETCOLOUR,0,0); - if (col == CLCDEFAULT_SELBKCOLOUR) DBDeleteContactSetting(NULL,"StatusBar","SelBkColour"); - else DBWriteContactSettingDword(NULL,"StatusBar","SelBkColour",col); + if (col == CLCDEFAULT_SELBKCOLOUR) db_unset(NULL,"StatusBar","SelBkColour"); + else db_set_dw(NULL,"StatusBar","SelBkColour",col); char str[MAX_PATH],strrel[MAX_PATH]; GetDlgItemTextA(hwndDlg,IDC_FILENAME,str,SIZEOF(str)); @@ -420,7 +420,7 @@ static INT_PTR CALLBACK DlgProcStatusBarBkgOpts(HWND hwndDlg, UINT msg, WPARAM w if (IsDlgButtonChecked(hwndDlg,IDC_PROPORTIONAL)) flags |= CLBF_PROPORTIONAL; if (IsDlgButtonChecked(hwndDlg,IDC_TILEVROWH)) flags |= CLBF_TILEVTOROWHEIGHT; - DBWriteContactSettingWord(NULL,"StatusBar","BkBmpUse",flags); + db_set_w(NULL,"StatusBar","BkBmpUse",flags); } pcli->pfnClcOptionsChanged(); @@ -442,12 +442,12 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, CheckDlgButton(hwndDlg,IDC_BITMAP,db_get_b(NULL,"CLC","UseBitmap",CLCDEFAULT_USEBITMAP)?BST_CHECKED:BST_UNCHECKED); SendMessage(hwndDlg,WM_USER+10,0,0); SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETDEFAULTCOLOUR,0,CLCDEFAULT_BKCOLOUR); - SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"CLC","BkColour",CLCDEFAULT_BKCOLOUR)); + SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,db_get_dw(NULL,"CLC","BkColour",CLCDEFAULT_BKCOLOUR)); SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETDEFAULTCOLOUR,0,CLCDEFAULT_SELBKCOLOUR); - SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"CLC","SelBkColour",CLCDEFAULT_SELBKCOLOUR)); + SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_SETCOLOUR,0,db_get_dw(NULL,"CLC","SelBkColour",CLCDEFAULT_SELBKCOLOUR)); { DBVARIANT dbv; - if ( !DBGetContactSettingString(NULL,"CLC","BkBitmap",&dbv)) { + if ( !db_get_s(NULL,"CLC","BkBitmap",&dbv)) { SetDlgItemTextA(hwndDlg,IDC_FILENAME,dbv.pszVal); char szPath[MAX_PATH]; @@ -517,11 +517,11 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, db_set_b(NULL,"CLC","UseBitmap",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_BITMAP)); { COLORREF col; col = SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_GETCOLOUR,0,0); - if (col == CLCDEFAULT_BKCOLOUR) DBDeleteContactSetting(NULL,"CLC","BkColour"); - else DBWriteContactSettingDword(NULL,"CLC","BkColour",col); + if (col == CLCDEFAULT_BKCOLOUR) db_unset(NULL,"CLC","BkColour"); + else db_set_dw(NULL,"CLC","BkColour",col); col = SendDlgItemMessage(hwndDlg,IDC_SELCOLOUR,CPM_GETCOLOUR,0,0); - if (col == CLCDEFAULT_SELBKCOLOUR) DBDeleteContactSetting(NULL,"CLC","SelBkColour"); - else DBWriteContactSettingDword(NULL,"CLC","SelBkColour",col); + if (col == CLCDEFAULT_SELBKCOLOUR) db_unset(NULL,"CLC","SelBkColour"); + else db_set_dw(NULL,"CLC","SelBkColour",col); } { char str[MAX_PATH],strrel[MAX_PATH]; @@ -540,7 +540,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if (IsDlgButtonChecked(hwndDlg,IDC_PROPORTIONAL)) flags |= CLBF_PROPORTIONAL; if (IsDlgButtonChecked(hwndDlg,IDC_TILEVROWH)) flags |= CLBF_TILEVTOROWHEIGHT; - DBWriteContactSettingWord(NULL,"CLC","BkBmpUse",flags); + db_set_w(NULL,"CLC","BkBmpUse",flags); } pcli->pfnClcOptionsChanged(); diff --git a/plugins/Clist_mw/src/clistmod.cpp b/plugins/Clist_mw/src/clistmod.cpp index dda20b767f..41a73e0041 100644 --- a/plugins/Clist_mw/src/clistmod.cpp +++ b/plugins/Clist_mw/src/clistmod.cpp @@ -101,15 +101,15 @@ static int ProtocolAck(WPARAM wParam,LPARAM lParam) ACKDATA *ack = (ACKDATA*)lParam; if (ack->type == ACKTYPE_AWAYMSG && ack->lParam) { DBVARIANT dbv; - if ( !DBGetContactSettingTString(ack->hContact, "CList", "StatusMsg", &dbv)) { + if ( !db_get_ts(ack->hContact, "CList", "StatusMsg", &dbv)) { if ( !_tcscmp(dbv.ptszVal, (TCHAR *)ack->lParam)) { - DBFreeVariant(&dbv); + db_free(&dbv); return 0; } - DBFreeVariant(&dbv); + db_free(&dbv); } if ( db_get_b(NULL,"CList","ShowStatusMsg",0) || db_get_b(ack->hContact,"CList","StatusMsgAuto",0)) - DBWriteContactSettingTString(ack->hContact, "CList", "StatusMsg", (TCHAR *)ack->lParam); + db_set_ts(ack->hContact, "CList", "StatusMsg", (TCHAR *)ack->lParam); } return 0; @@ -136,7 +136,7 @@ int LoadContactListModule(void) } hCListImages = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0); - DefaultImageListColorDepth = DBGetContactSettingDword(NULL,"CList","DefaultImageListColorDepth",ILC_COLOR32); + DefaultImageListColorDepth = db_get_dw(NULL,"CList","DefaultImageListColorDepth",ILC_COLOR32); hProtoAckHook = (HANDLE) HookEvent(ME_PROTO_ACK, ProtocolAck); HookEvent(ME_OPT_INITIALISE,CListOptInit); diff --git a/plugins/Clist_mw/src/clistopts.cpp b/plugins/Clist_mw/src/clistopts.cpp index 2a927efc75..85a79385ae 100644 --- a/plugins/Clist_mw/src/clistopts.cpp +++ b/plugins/Clist_mw/src/clistopts.cpp @@ -137,7 +137,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { int i,count,item; PROTOACCOUNT **accs; DBVARIANT dbv = {DBVT_DELETED}; - DBGetContactSettingString(NULL,"CList","PrimaryStatus",&dbv); + db_get_s(NULL,"CList","PrimaryStatus",&dbv); ProtoEnumAccounts( &count, &accs ); item = SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_ADDSTRING,0,(LPARAM)TranslateT("Global")); SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_SETITEMDATA,item,0); @@ -201,7 +201,7 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP } if ( !(caps & CLUIF_HASAUTOHIDEOPTION)) { db_set_b(NULL,"CList","AutoHide",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); - DBWriteContactSettingWord(NULL,"CList","HideTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_HIDETIMESPIN,UDM_GETPOS,0,0)); + db_set_w(NULL,"CList","HideTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_HIDETIMESPIN,UDM_GETPOS,0,0)); } } db_set_b(NULL,"CList","SortByStatus",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_SORTBYSTATUS)); @@ -215,15 +215,15 @@ static INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP 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",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_DONTCYCLE)?SETTING_TRAYICON_SINGLE:(IsDlgButtonChecked(hwndDlg,IDC_CYCLE)?SETTING_TRAYICON_CYCLE:SETTING_TRAYICON_MULTI))); - DBWriteContactSettingWord(NULL,"CList","CycleTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_CYCLETIMESPIN,UDM_GETPOS,0,0)); - DBWriteContactSettingWord(NULL,"CList","IconFlashTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_BLINKSPIN,UDM_GETPOS,0,0)); + 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)); { int cursel = SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETCURSEL,0,0); PROTOACCOUNT* pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg,IDC_PRIMARYSTATUS,CB_GETITEMDATA,cursel,0); if ( pa == NULL ) - DBDeleteContactSetting(NULL, "CList","PrimaryStatus"); + db_unset(NULL, "CList","PrimaryStatus"); else db_set_s(NULL,"CList","PrimaryStatus", pa->szModuleName); } diff --git a/plugins/Clist_mw/src/clistsettings.cpp b/plugins/Clist_mw/src/clistsettings.cpp index c0dd11b077..28b69254ca 100644 --- a/plugins/Clist_mw/src/clistsettings.cpp +++ b/plugins/Clist_mw/src/clistsettings.cpp @@ -120,7 +120,7 @@ void CheckPDNCE(ClcCacheEntry *_pdnce) { DBVARIANT dbv; - if ( !DBGetContactSettingTString(pdnce->hContact,"CList","Group",&dbv)) + if ( !db_get_ts(pdnce->hContact,"CList","Group",&dbv)) { pdnce->tszGroup = mir_tstrdup(dbv.ptszVal); mir_free(dbv.pszVal); @@ -135,7 +135,7 @@ void CheckPDNCE(ClcCacheEntry *_pdnce) pdnce->noHiddenOffline = db_get_b(pdnce->hContact,"CList","noOffline",0); if ( pdnce->IdleTS == -1 ) - pdnce->IdleTS = DBGetContactSettingDword(pdnce->hContact,pdnce->szProto,"IdleTS",0); + pdnce->IdleTS = db_get_dw(pdnce->hContact,pdnce->szProto,"IdleTS",0); if (pdnce->ApparentMode == -1) pdnce->ApparentMode = db_get_w(pdnce->hContact,pdnce->szProto,"ApparentMode",0); diff --git a/plugins/Clist_mw/src/clui.cpp b/plugins/Clist_mw/src/clui.cpp index 3e63f9ceff..f96a3a0697 100644 --- a/plugins/Clist_mw/src/clui.cpp +++ b/plugins/Clist_mw/src/clui.cpp @@ -419,7 +419,7 @@ int GetStatsuBarProtoRect(HWND hwnd,char *szProto,RECT *rc) { int nParts,nPanel; ProtocolData *PD; - int startoffset = DBGetContactSettingDword(NULL,"StatusBar","FirstIconOffset",0); + int startoffset = db_get_dw(NULL,"StatusBar","FirstIconOffset",0); if ( !UseOwnerDrawStatusBar) startoffset = 0; @@ -514,11 +514,11 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l GetWindowRect(hwnd, &rc); if ( !CallService(MS_CLIST_DOCKINGISDOCKED,0,0)) { //if docked, dont remember pos (except for width) - DBWriteContactSettingDword(NULL,"CList","Height",(DWORD)(rc.bottom - rc.top)); - DBWriteContactSettingDword(NULL,"CList","x",(DWORD)rc.left); - DBWriteContactSettingDword(NULL,"CList","y",(DWORD)rc.top); + 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); } - DBWriteContactSettingDword(NULL,"CList","Width",(DWORD)(rc.right - rc.left)); + db_set_dw(NULL,"CList","Width",(DWORD)(rc.right - rc.left)); } if ( wParam == SIZE_MINIMIZED ) { if ( db_get_b(NULL,"CList","Min2Tray",SETTING_MIN2TRAY_DEFAULT )) { @@ -648,8 +648,8 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l int totcount; ProtocolData *PD; int menuid; - int startoffset = DBGetContactSettingDword(NULL,"StatusBar","FirstIconOffset",0); - int extraspace = DBGetContactSettingDword(NULL,"StatusBar","BkExtraSpace",0); + int startoffset = db_get_dw(NULL,"StatusBar","FirstIconOffset",0); + int extraspace = db_get_dw(NULL,"StatusBar","BkExtraSpace",0); boolean UseOwnerDrawStatusBar = db_get_b(NULL,"CLUI","UseOwnerDrawStatusBar",0); hMenu = (HMENU)CallService(MS_CLIST_MENUGETSTATUS,0,0); @@ -686,7 +686,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l break; } } } - totcount = DBGetContactSettingDword(0,"Protocols","ProtoCount",0); + totcount = db_get_dw(0,"Protocols","ProtoCount",0); PD = (ProtocolData *)SendMessage(pcli->hwndStatus,SB_GETTEXT,(WPARAM)nPanel,0); if (PD == NULL){return 0;} menuid = nPanel; @@ -756,11 +756,11 @@ int LoadCLUIModule(void) CreateServiceFunction("CLUI/GetConnectingIconForProtocol",GetConnectingIconService); - if (DBGetContactSettingTString(NULL,"CList","TitleText",&dbv)) + if (db_get_ts(NULL,"CList","TitleText",&dbv)) lstrcpyn(titleText,_T(MIRANDANAME),SIZEOF(titleText)); else { lstrcpyn(titleText,dbv.ptszVal,SIZEOF(titleText)); - DBFreeVariant(&dbv); + db_free(&dbv); } oldhideoffline = db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT); diff --git a/plugins/Clist_mw/src/cluiopts.cpp b/plugins/Clist_mw/src/cluiopts.cpp index 5a70db69b1..3838380564 100644 --- a/plugins/Clist_mw/src/cluiopts.cpp +++ b/plugins/Clist_mw/src/cluiopts.cpp @@ -95,7 +95,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L char *s; char szUin[20]; - if (DBGetContactSettingString(NULL,"CList","TitleText",&dbv) == 0&&(dbv.pszVal)) + if (db_get_s(NULL,"CList","TitleText",&dbv) == 0&&(dbv.pszVal)) { s = mir_strdup(dbv.pszVal); mir_free(dbv.pszVal); @@ -112,20 +112,20 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L } SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)MIRANDANAME); - wsprintfA(szUin,"%u",DBGetContactSettingDword(NULL,"ICQ","UIN",0)); + wsprintfA(szUin,"%u",db_get_dw(NULL,"ICQ","UIN",0)); SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)szUin); - if ( !DBGetContactSettingString(NULL,"ICQ","Nick",&dbv)) { + if ( !db_get_s(NULL,"ICQ","Nick",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); dbv.pszVal = NULL; } - if ( !DBGetContactSettingString(NULL,"ICQ","FirstName",&dbv)) { + if ( !db_get_s(NULL,"ICQ","FirstName",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); dbv.pszVal = NULL; } - if ( !DBGetContactSettingString(NULL,"ICQ","e-mail",&dbv)) { + if ( !db_get_s(NULL,"ICQ","e-mail",&dbv)) { SendDlgItemMessage(hwndDlg,IDC_TITLETEXT,CB_ADDSTRING,0,(LPARAM)dbv.pszVal); mir_free(dbv.pszVal); dbv.pszVal = NULL; @@ -249,7 +249,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L { TCHAR title[256]; GetDlgItemText(hwndDlg,IDC_TITLETEXT,title,SIZEOF(title)); - DBWriteContactSettingTString(NULL,"CList","TitleText",title); + db_set_ts(NULL,"CList","TitleText",title); SetWindowText(pcli->hwndContactList,title); } db_set_b(NULL,"CLUI","FadeInOut",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_FADEINOUT)); @@ -257,7 +257,7 @@ static INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L db_set_b(NULL,"CLUI","MaxSizeHeight",(BYTE)GetDlgItemInt(hwndDlg,IDC_MAXSIZEHEIGHT,NULL,FALSE)); db_set_b(NULL,"CLUI","AutoSizeUpward",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_AUTOSIZEUPWARD)); db_set_b(NULL,"CList","AutoHide",(BYTE)IsDlgButtonChecked(hwndDlg,IDC_AUTOHIDE)); - DBWriteContactSettingWord(NULL,"CList","HideTime",(WORD)SendDlgItemMessage(hwndDlg,IDC_HIDETIMESPIN,UDM_GETPOS,0,0)); + 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)); @@ -298,7 +298,7 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L CheckDlgButton(hwndDlg, IDC_USEOWNERDRAW, db_get_b(NULL,"CLUI","UseOwnerDrawStatusBar",1) ? BST_CHECKED : BST_UNCHECKED); - SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,DBGetContactSettingDword(NULL,"CLUI","SBarBKColor",CLR_DEFAULT)); + SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_SETCOLOUR,0,db_get_dw(NULL,"CLUI","SBarBKColor",CLR_DEFAULT)); if ( !IsDlgButtonChecked(hwndDlg,IDC_SHOWSBAR)) { EnableWindow(GetDlgItem(hwndDlg,IDC_SHOWICON),FALSE); @@ -341,7 +341,7 @@ static INT_PTR CALLBACK DlgProcSBarOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L case PSN_APPLY: { COLORREF col = SendDlgItemMessage(hwndDlg,IDC_BKGCOLOUR,CPM_GETCOLOUR,0,0); - DBWriteContactSettingDword(NULL,"CLUI","SBarBKColor",col); + db_set_dw(NULL,"CLUI","SBarBKColor",col); 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))); diff --git a/plugins/Clist_mw/src/cluiservices.cpp b/plugins/Clist_mw/src/cluiservices.cpp index d57ae77741..095576878c 100644 --- a/plugins/Clist_mw/src/cluiservices.cpp +++ b/plugins/Clist_mw/src/cluiservices.cpp @@ -53,7 +53,7 @@ void CluiProtocolStatusChanged(int parStatus, const char* szProto) if ( pcli->hwndStatus == 0 ) return; - FirstIconOffset = DBGetContactSettingDword(NULL,"CLUI","FirstIconOffset",0); + FirstIconOffset = db_get_dw(NULL,"CLUI","FirstIconOffset",0); ProtoEnumAccounts( &protoCount, &accs ); if ( protoCount == 0 ) @@ -65,7 +65,7 @@ void CluiProtocolStatusChanged(int parStatus, const char* szProto) SendMessage(pcli->hwndStatus,SB_GETBORDERS,0,(LPARAM)&borders); - SendMessage(pcli->hwndStatus,SB_SETBKCOLOR,0,DBGetContactSettingDword(0,"CLUI","SBarBKColor",CLR_DEFAULT)); + SendMessage(pcli->hwndStatus,SB_SETBKCOLOR,0,db_get_dw(0,"CLUI","SBarBKColor",CLR_DEFAULT)); partWidths = (int*)alloca((protoCount+1)*sizeof(int)); //partWidths[0] = FirstIconOffset; if ( db_get_b(NULL,"CLUI","UseOwnerDrawStatusBar",0)||db_get_b(NULL,"CLUI","EqualSections",1)) @@ -105,8 +105,8 @@ void CluiProtocolStatusChanged(int parStatus, const char* szProto) HDC hdc; SIZE textSize; BYTE showOpts = db_get_b(NULL,"CLUI","SBarShow",5); - DWORD extraspace = DBGetContactSettingDword(NULL,"StatusBar","BkExtraSpace",0); - DWORD startoffset = DBGetContactSettingDword(NULL,"StatusBar","FirstIconOffset",0); + DWORD extraspace = db_get_dw(NULL,"StatusBar","BkExtraSpace",0); + DWORD startoffset = db_get_dw(NULL,"StatusBar","FirstIconOffset",0); int x; hdc = GetDC(pcli->hwndStatus); diff --git a/plugins/Clist_mw/src/commonheaders.h b/plugins/Clist_mw/src/commonheaders.h index 4faf052f07..8b4c9181de 100644 --- a/plugins/Clist_mw/src/commonheaders.h +++ b/plugins/Clist_mw/src/commonheaders.h @@ -63,7 +63,7 @@ extern HINSTANCE g_hInst; all the bad free()'s to good ones, however it's still incorrect code. The reasons for not changing them include: - * DBFreeVariant has a CallService() lookup + * db_free has a CallService() lookup * free() is executed in some large loops to do with clist creation of group data * easy search and replace diff --git a/plugins/Clist_mw/src/contact.cpp b/plugins/Clist_mw/src/contact.cpp index e6c4f31805..bd2ad97052 100644 --- a/plugins/Clist_mw/src/contact.cpp +++ b/plugins/Clist_mw/src/contact.cpp @@ -178,7 +178,7 @@ INT_PTR ContactChangeGroup(WPARAM wParam,LPARAM lParam) { CallService(MS_CLUI_CONTACTDELETED,wParam,0); if ((HANDLE)lParam == NULL) - DBDeleteContactSetting((HANDLE)wParam,"CList","Group"); + db_unset((HANDLE)wParam,"CList","Group"); else db_set_s((HANDLE)wParam,"CList","Group",(char*)CallService(MS_CLIST_GROUPGETNAME2,lParam,(LPARAM)(int*)NULL)); diff --git a/plugins/Clist_nicer/skineditor/src/main.cpp b/plugins/Clist_nicer/skineditor/src/main.cpp index 465071f7f5..e4a31f61df 100644 --- a/plugins/Clist_nicer/skineditor/src/main.cpp +++ b/plugins/Clist_nicer/skineditor/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, DBGetContactSettingDword(NULL, "CLCExt", "3ddark", RGB(224,224,224))); - SendDlgItemMessage(hwndDlg, IDC_3DLIGHTCOLOR, CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, "CLCExt", "3dbright", RGB(224,224,224))); + 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))); return 0; case WM_DRAWITEM: diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp index c63cd319d7..0eb0752233 100644 --- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp +++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp @@ -2477,7 +2477,7 @@ int OnFrameTitleBarBackgroundChange() hBmpBackground = NULL; } if (cfg::getByte("FrameTitleBar", "UseBitmap", CLCDEFAULT_USEBITMAP)) { - if ( !DBGetContactSetting(NULL, "FrameTitleBar", "BkBitmap", &dbv)) { + if ( !db_get(NULL, "FrameTitleBar", "BkBitmap", &dbv)) { hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAP, 0, (LPARAM)dbv.pszVal); mir_free(dbv.pszVal); } diff --git a/plugins/Clist_nicer/src/Include/commonheaders.h b/plugins/Clist_nicer/src/Include/commonheaders.h index d92f07724b..a094b29235 100644 --- a/plugins/Clist_nicer/src/Include/commonheaders.h +++ b/plugins/Clist_nicer/src/Include/commonheaders.h @@ -183,7 +183,7 @@ extern ImageItem *g_glyphItem; all the bad free()'s to good ones, however it's still incorrect code. The reasons for not changing them include: - * DBFreeVariant has a CallService() lookup + * db_free has a CallService() lookup * free() is executed in some large loops to do with clist creation of group data * easy search and replace diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 757fa029f0..6f49e7c97c 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -248,7 +248,7 @@ BYTE GetCachedStatusMsg(TExtraCache *p, char *szProto) szProto = GetContactProto(hContact); if (szProto) { if ( !result ) - DBFreeVariant( &dbv ); + db_free( &dbv ); if ( !( result = cfg::getTString(hContact, szProto, "YMsg", &dbv)) && lstrlen(dbv.ptszVal) > 1) p->bStatusMsgValid = STATUSMSG_YIM; else if ( !(result = cfg::getTString(hContact, szProto, "StatusDescr", &dbv)) && lstrlen(dbv.ptszVal) > 1) @@ -260,7 +260,7 @@ BYTE GetCachedStatusMsg(TExtraCache *p, char *szProto) if (p->bStatusMsgValid == STATUSMSG_NOTFOUND) { // no status msg, consider xstatus name (if available) if ( !result ) - DBFreeVariant( &dbv ); + db_free( &dbv ); result = cfg::getTString(hContact, szProto, "XStatusName", &dbv); if ( !result && lstrlen(dbv.ptszVal) > 1) { int iLen = lstrlen(dbv.ptszVal); @@ -306,7 +306,7 @@ BYTE GetCachedStatusMsg(TExtraCache *p, char *szProto) p->statusMsg[j] = (TCHAR)0; } if ( !result ) - DBFreeVariant( &dbv ); + db_free( &dbv ); if (p->bStatusMsgValid != STATUSMSG_NOTFOUND) { WORD infoTypeC2[12]; diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 49f569fd6c..5f249c17df 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -736,7 +736,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, if ( PathToAbsoluteT(dbv.ptszVal, szPath)) SetDlgItemText(hwndDlg, IDC_FILENAME, szPath); - DBFreeVariant(&dbv); + db_free(&dbv); } WORD bmpUse = cfg::getWord("CLC", "BkBmpUse", CLCDEFAULT_BKBMPUSE); @@ -817,7 +817,7 @@ static INT_PTR CALLBACK DlgProcClcBkgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, COLORREF col; col = SendDlgItemMessage(hwndDlg, IDC_BKGCOLOUR, CPM_GETCOLOUR, 0, 0); if (col == CLCDEFAULT_BKCOLOUR) - DBDeleteContactSetting(NULL, "CLC", "BkColour"); + db_unset(NULL, "CLC", "BkColour"); else cfg::writeDword("CLC", "BkColour", col); cfg::writeByte("CLC", "UseWinColours", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_WINCOLOUR)); diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index a9706be4c1..22f4e4ea75 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -251,12 +251,12 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA if ((iSel = SendDlgItemMessage(hWnd, IDC_SECONDLINEMODE, CB_GETCURSEL, 0, 0)) != CB_ERR) { if (iSel == 0) { - DBDeleteContactSetting(hContact, "CList", "CLN_2ndline"); + db_unset(hContact, "CList", "CLN_2ndline"); if (contact) contact->bSecondLine = cfg::dat.dualRowMode; } else { - DBWriteContactSettingByte(hContact, "CList", "CLN_2ndline", (BYTE)(iSel - 1)); + db_set_b(hContact, "CList", "CLN_2ndline", (BYTE)(iSel - 1)); if (contact) contact->bSecondLine = (BYTE)(iSel - 1); } @@ -332,7 +332,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA else if (IsDlgButtonChecked(hWnd, IDC_IGN_ALWAYSOFFLINE)) wApparentMode = ID_STATUS_OFFLINE; - //DBWriteContactSettingWord(hContact, contact->proto, "ApparentMode", wApparentMode); + //db_set_w(hContact, contact->proto, "ApparentMode", wApparentMode); //if (oldApparentMode != wApparentMode) CallContactService(hContact, PSS_SETAPPARENTMODE, (WPARAM)wApparentMode, 0); SendMessage(hWnd, WM_USER + 120, 0, 0); diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index e5e5ae8baf..ae022a4a7f 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -183,7 +183,7 @@ int GetWindowVisibleState(HWND hWnd, int iStepX, int iStepY) clip = 5; else clip = 0; - //clip = max(clip, DBGetContactSettingByte(NULL, "CLUI", "ignoreframepixels", 2)); + //clip = max(clip, db_get_b(NULL, "CLUI", "ignoreframepixels", 2)); //rgn = CreateRoundRectRgn(rc.left + clip, rc.top + clip, rc.right - clip, rc.bottom - clip, 10 + clip, 10 + clip); //rgn = CreateRectRgn(rc.left, rc.top, rc.right, rc.bottom); //for (i = rc.top + 3 + clip; i < rc.bottom - 3 - clip; i += (height / iStepY)) { diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index a8210472bd..666b9b2ab8 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -106,7 +106,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP DBVARIANT dbv = { DBVT_DELETED }; - DBGetContactSetting(NULL, "CList", "PrimaryStatus", &dbv); + db_get(NULL, "CList", "PrimaryStatus", &dbv); ProtoEnumAccounts( &count, &accs ); item = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_ADDSTRING, 0, (LPARAM) TranslateT("Global")); SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_SETITEMDATA, item, (LPARAM) 0); @@ -191,7 +191,7 @@ INT_PTR CALLBACK DlgProcGenOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP int cursel = SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETCURSEL, 0, 0); PROTOACCOUNT* pa = (PROTOACCOUNT*)SendDlgItemMessage(hwndDlg, IDC_PRIMARYSTATUS, CB_GETITEMDATA, cursel, 0); if ( !pa ) - DBDeleteContactSetting(NULL, "CList", "PrimaryStatus"); + db_unset(NULL, "CList", "PrimaryStatus"); else cfg::writeString(NULL, "CList", "PrimaryStatus", pa->szModuleName ); } diff --git a/plugins/Clist_nicer/src/clisttray.cpp b/plugins/Clist_nicer/src/clisttray.cpp index 24edcfe047..9430ed1f56 100644 --- a/plugins/Clist_nicer/src/clisttray.cpp +++ b/plugins/Clist_nicer/src/clisttray.cpp @@ -108,7 +108,7 @@ void TrayIconUpdateBase(const char *szChangedProto) changed = pcli->pfnTrayIconSetBaseInfo(CopyIcon(hIcon), NULL); else changed = pcli->pfnTrayIconSetBaseInfo(ImageList_GetIcon(hCListImages, iIcon, ILD_NORMAL), NULL); - DBFreeVariant(&dbv); + db_free(&dbv); break; } case SETTING_TRAYICON_CYCLE: diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index c4aa28a52e..843e27cccc 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -177,7 +177,7 @@ static HWND PreCreateCLC(HWND parent) WS_CHILD | CLS_CONTACTLIST | (cfg::getByte(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0) | CLS_HIDEOFFLINE - //|(DBGetContactSettingByte(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CLS_HIDEOFFLINE:0) + //|(db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CLS_HIDEOFFLINE:0) | (cfg::getByte(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? CLS_HIDEEMPTYGROUPS : 0) | CLS_MULTICOLUMN , 0, 0, 0, 0, parent, NULL, g_hInst, (LPVOID)0xff00ff00); @@ -451,7 +451,7 @@ void SetDBButtonStates(HANDLE hPassedContact) if ( !cfg::getString(hFinalContact, szModule, szSetting, &dbv)) { result = !strcmp((char *)buttonItem->bValuePush, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } } else { switch (buttonItem->type) { @@ -884,12 +884,12 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l if (cfg::getByte("CList", "AutoApplyLastViewMode", 0)) { DBVARIANT dbv = {0}; - if ( !DBGetContactSetting(NULL, "CList", "LastViewMode", &dbv)) { + if ( !db_get(NULL, "CList", "LastViewMode", &dbv)) { if (lstrlenA(dbv.pszVal) > 2) { if (cfg::getDword(NULL, CLVM_MODULE, dbv.pszVal, -1) != 0xffffffff) ApplyViewMode((char *)dbv.pszVal); } - DBFreeVariant(&dbv); + db_free(&dbv); } } if ( !cfg::dat.autosize) @@ -1427,7 +1427,7 @@ skipbg: if (fDelete) { //_DebugTraceA("delete value: %s, %s ON %d", szModule, szSetting, finalhContact); - DBDeleteContactSetting(finalhContact, szModule, szSetting); + db_unset(finalhContact, szModule, szSetting); } else { switch (item->type) { case DBVT_BYTE: diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp index 15ad632d14..c2b5ced4d0 100644 --- a/plugins/Clist_nicer/src/cluiopts.cpp +++ b/plugins/Clist_nicer/src/cluiopts.cpp @@ -94,7 +94,7 @@ INT_PTR CALLBACK DlgProcCluiOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l DBVARIANT dbv; if ( !cfg::getTString(NULL, "CList", "TitleText", &dbv)) { SetDlgItemText(hwndDlg, IDC_TITLETEXT, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else SetDlgItemTextA(hwndDlg, IDC_TITLETEXT, MIRANDANAME); } diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp index b21bc4d392..8e373e9138 100644 --- a/plugins/Clist_nicer/src/cluiservices.cpp +++ b/plugins/Clist_nicer/src/cluiservices.cpp @@ -204,7 +204,7 @@ void CluiProtocolStatusChanged( int parStatus, const char* szProto ) } // update the clui button - if ( !DBGetContactSetting(NULL, "CList", "PrimaryStatus", &dbv)) { + if ( !db_get(NULL, "CList", "PrimaryStatus", &dbv)) { if (dbv.type == DBVT_ASCIIZ && lstrlenA(dbv.pszVal) > 1) { wStatus = (WORD) CallProtoService(dbv.pszVal, PS_GETSTATUS, 0, 0); iIcon = IconFromStatusMode(dbv.pszVal, (int) wStatus, 0, &hIcon); diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index e224682e70..c6b85f5468 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -84,7 +84,7 @@ void cfg::init() DWORD cfg::getDword(const HANDLE hContact = 0, const char *szModule = 0, const char *szSetting = 0, DWORD uDefault = 0) { - return((DWORD)DBGetContactSettingDword(hContact, szModule, szSetting, uDefault)); + return((DWORD)db_get_dw(hContact, szModule, szSetting, uDefault)); } /* @@ -93,7 +93,7 @@ DWORD cfg::getDword(const HANDLE hContact = 0, const char *szModule = 0, const c DWORD cfg::getDword(const char *szSetting = 0, DWORD uDefault = 0) { - return((DWORD)DBGetContactSettingDword(0, DEFAULT_MODULE, szSetting, uDefault)); + return((DWORD)db_get_dw(0, DEFAULT_MODULE, szSetting, uDefault)); } /* @@ -102,13 +102,13 @@ DWORD cfg::getDword(const char *szSetting = 0, DWORD uDefault = 0) DWORD cfg::getDword(const char *szModule, const char *szSetting, DWORD uDefault) { - return((DWORD)DBGetContactSettingDword(0, szModule, szSetting, uDefault)); + return((DWORD)db_get_dw(0, szModule, szSetting, uDefault)); } WORD cfg::getWord(const HANDLE hContact = 0, const char *szModule = 0, const char *szSetting = 0, WORD uDefault = 0) { - return((WORD)DBGetContactSettingWord(hContact, szModule, szSetting, uDefault)); + return((WORD)db_get_w(hContact, szModule, szSetting, uDefault)); } /* @@ -117,7 +117,7 @@ WORD cfg::getWord(const HANDLE hContact = 0, const char *szModule = 0, const cha WORD cfg::getWord(const char *szSetting = 0, WORD uDefault = 0) { - return((WORD)DBGetContactSettingWord(0, DEFAULT_MODULE, szSetting, uDefault)); + return((WORD)db_get_w(0, DEFAULT_MODULE, szSetting, uDefault)); } /* @@ -126,7 +126,7 @@ WORD cfg::getWord(const char *szSetting = 0, WORD uDefault = 0) WORD cfg::getWord(const char *szModule, const char *szSetting, WORD uDefault) { - return((WORD)DBGetContactSettingWord(0, szModule, szSetting, uDefault)); + return((WORD)db_get_w(0, szModule, szSetting, uDefault)); } /* @@ -134,27 +134,27 @@ WORD cfg::getWord(const char *szModule, const char *szSetting, WORD uDefault) */ int cfg::getByte(const HANDLE hContact = 0, const char *szModule = 0, const char *szSetting = 0, int uDefault = 0) { - return(DBGetContactSettingByte(hContact, szModule, szSetting, uDefault)); + return(db_get_b(hContact, szModule, szSetting, uDefault)); } int cfg::getByte(const char *szSetting = 0, int uDefault = 0) { - return(DBGetContactSettingByte(0, DEFAULT_MODULE, szSetting, uDefault)); + return(db_get_b(0, DEFAULT_MODULE, szSetting, uDefault)); } int cfg::getByte(const char *szModule, const char *szSetting, int uDefault) { - return(DBGetContactSettingByte(0, szModule, szSetting, uDefault)); + return(db_get_b(0, szModule, szSetting, uDefault)); } INT_PTR cfg::getTString(const HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) { - return(DBGetContactSettingTString(hContact, szModule, szSetting, dbv)); + return(db_get_ts(hContact, szModule, szSetting, dbv)); } INT_PTR cfg::getString(const HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) { - return(DBGetContactSettingString(hContact, szModule, szSetting, dbv)); + return(db_get_s(hContact, szModule, szSetting, dbv)); } /* @@ -163,42 +163,42 @@ INT_PTR cfg::getString(const HANDLE hContact, const char *szModule, const char * INT_PTR cfg::writeDword(const HANDLE hContact = 0, const char *szModule = 0, const char *szSetting = 0, DWORD value = 0) { - return(DBWriteContactSettingDword(hContact, szModule, szSetting, value)); + return(db_set_dw(hContact, szModule, szSetting, value)); } INT_PTR cfg::writeDword(const char *szModule = 0, const char *szSetting = 0, DWORD value = 0) { - return(DBWriteContactSettingDword(0, szModule, szSetting, value)); + return(db_set_dw(0, szModule, szSetting, value)); } INT_PTR cfg::writeWord(const HANDLE hContact = 0, const char *szModule = 0, const char *szSetting = 0, WORD value = 0) { - return(DBWriteContactSettingWord(hContact, szModule, szSetting, value)); + return(db_set_w(hContact, szModule, szSetting, value)); } INT_PTR cfg::writeWord(const char *szModule = 0, const char *szSetting = 0, WORD value = 0) { - return(DBWriteContactSettingWord(0, szModule, szSetting, value)); + return(db_set_w(0, szModule, szSetting, value)); } INT_PTR cfg::writeByte(const HANDLE hContact = 0, const char *szModule = 0, const char *szSetting = 0, BYTE value = 0) { - return(DBWriteContactSettingByte(hContact, szModule, szSetting, value)); + return(db_set_b(hContact, szModule, szSetting, value)); } INT_PTR cfg::writeByte(const char *szModule = 0, const char *szSetting = 0, BYTE value = 0) { - return(DBWriteContactSettingByte(0, szModule, szSetting, value)); + return(db_set_b(0, szModule, szSetting, value)); } INT_PTR cfg::writeTString(const HANDLE hContact, const char *szModule = 0, const char *szSetting = 0, const TCHAR *str = 0) { - return(DBWriteContactSettingTString(hContact, szModule, szSetting, str)); + return(db_set_ts(hContact, szModule, szSetting, str)); } INT_PTR cfg::writeString(const HANDLE hContact, const char *szModule = 0, const char *szSetting = 0, const char *str = 0) { - return(DBWriteContactSettingString(hContact, szModule, szSetting, str)); + return(db_set_s(hContact, szModule, szSetting, str)); } TExtraCache* cfg::getCache(const HANDLE hContact, const char *szProto) @@ -211,7 +211,7 @@ TExtraCache* cfg::getCache(const HANDLE hContact, const char *szProto) TExtraCache *p = (TExtraCache*)calloc(sizeof(TExtraCache), 1); p->hContact = hContact; LoadSkinItemToCache(p, szProto); - p->dwDFlags = DBGetContactSettingDword(hContact, "CList", "CLN_Flags", 0); + p->dwDFlags = db_get_dw(hContact, "CList", "CLN_Flags", 0); GetCachedStatusMsg(p, const_cast(szProto)); p->dwLastMsgTime = INTSORT_GetLastMsgTime(hContact); cfg::arCache.insert(p); diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp index b6f3de75a3..b96be53a52 100644 --- a/plugins/Clist_nicer/src/contact.cpp +++ b/plugins/Clist_nicer/src/contact.cpp @@ -158,9 +158,9 @@ void LoadContactTree(void) pcli->pfnChangeContactIcon(hContact, IconFromStatusMode(GetContactProto(hContact), status, hContact, NULL), 1); if (mc_disablehgh && !mc_hgh_removed) { - if ( !DBGetContactSetting(hContact, "CList", "Group", &dbv)) { + if ( !db_get(hContact, "CList", "Group", &dbv)) { if ( !strcmp(dbv.pszVal, "MetaContacts Hidden Group")) - DBDeleteContactSetting(hContact, "CList", "Group"); + db_unset(hContact, "CList", "Group"); mir_free(dbv.pszVal); } } diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index 771e36bba0..a41f0f5ff6 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -522,7 +522,7 @@ void extbk_export(char *file) if ( !cfg::getString(NULL, "CLC", "BkBitmap", &dbv)) { WritePrivateProfileStringA("Global", "BkBitmap", dbv.pszVal, file); - DBFreeVariant(&dbv); + db_free(&dbv); } } @@ -1177,7 +1177,7 @@ void IMG_LoadItems() WideCharToMultiByte(CP_ACP, 0, tszFileName, MAX_PATH, szFileName, MAX_PATH, 0, 0); - DBFreeVariant(&dbv); + db_free(&dbv); if ( !PathFileExists(tszFileName)) return; @@ -1273,14 +1273,14 @@ void LoadPerContactSkins(TCHAR *tszFileName) if ((INT_PTR) uid != CALLSERVICE_NOTFOUND && uid != NULL) { DBVARIANT dbv = {0}; - DBGetContactSetting(hContact, szProto, uid, &dbv); + db_get(hContact, szProto, uid, &dbv); switch(dbv.type) { case DBVT_DWORD: mir_snprintf(UIN, 40, "%d", dbv.dVal); break; case DBVT_ASCIIZ: mir_snprintf(UIN, 40, "%s", dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); break; default: UIN[0] = 0; @@ -1451,7 +1451,7 @@ static void ApplyCLUISkin() SetWindowPos(pcli->hwndContactList, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED); SendMessage(pcli->hwndContactList, WM_SIZE, 0, 0); RedrawWindow(pcli->hwndContactList, NULL, NULL, RDW_FRAME | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ALLCHILDREN | RDW_ERASE); - DBFreeVariant(&dbv); + db_free(&dbv); } } @@ -1484,7 +1484,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L if ( !cfg::getString(NULL, "CLC", "ContactSkins", &dbv)) { SetDlgItemTextA(hwndDlg, IDC_SKINFILE, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); Utils::enableDlgControl(hwndDlg, IDC_RELOAD, TRUE); } else @@ -1492,7 +1492,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L CheckDlgButton(hwndDlg, IDC_USESKIN, cfg::getByte("CLUI", "useskin", 0) ? BST_CHECKED : BST_UNCHECKED); if ( !cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { SetDlgItemText(hwndDlg, IDC_SKINFILENAME, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else SetDlgItemText(hwndDlg, IDC_SKINFILENAME, _T("")); @@ -1537,7 +1537,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L if ( !cfg::getTString(NULL, "CLC", "AdvancedSkin", &dbv)) { if (_tcscmp(dbv.ptszVal, final_path)) skinChanged = TRUE; - DBFreeVariant(&dbv); + db_free(&dbv); } else skinChanged = TRUE; diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 2e6809b847..d574c00e11 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -223,7 +223,7 @@ static int FillDialog(HWND hwnd) item.pszText = &dbv.ptszVal[1]; newItem = SendMessage(hwndList, LVM_INSERTITEM, 0, (LPARAM)&item); - DBFreeVariant(&dbv); + db_free(&dbv); } ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE); ListView_Arrange(hwndList, LVA_ALIGNLEFT | LVA_ALIGNTOP); @@ -484,7 +484,7 @@ void UpdateFilters() mir_snprintf(szTemp, 100, Translate("Current view mode: %s"), g_szModename); SetDlgItemTextA(clvmHwnd, IDC_CURVIEWMODE2, szTemp); mir_snprintf(szSetting, 128, "%c%s_PF", 246, szBuf); - if (DBGetContactSetting(NULL, CLVM_MODULE, szSetting, &dbv_pf)) + if (db_get(NULL, CLVM_MODULE, szSetting, &dbv_pf)) goto cleanup; mir_snprintf(szSetting, 128, "%c%s_GF", 246, szBuf); if (cfg::getTString(NULL, CLVM_MODULE, szSetting, &dbv_gf)) @@ -580,8 +580,8 @@ void UpdateFilters() ShowPage(clvmHwnd, 0); cleanup: - DBFreeVariant(&dbv_pf); - DBFreeVariant(&dbv_gf); + db_free(&dbv_pf); + db_free(&dbv_gf); free(szBuf); } @@ -685,16 +685,16 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP SendDlgItemMessageA(hwndDlg, IDC_VIEWMODES, LB_GETTEXT, SendDlgItemMessage(hwndDlg, IDC_VIEWMODES, LB_GETCURSEL, 0, 0), (LPARAM)szBuf); mir_snprintf(szSetting, 256, "%c%s_PF", 246, szBuf); - DBDeleteContactSetting(NULL, CLVM_MODULE, szSetting); + db_unset(NULL, CLVM_MODULE, szSetting); mir_snprintf(szSetting, 256, "%c%s_GF", 246, szBuf); - DBDeleteContactSetting(NULL, CLVM_MODULE, szSetting); + db_unset(NULL, CLVM_MODULE, szSetting); mir_snprintf(szSetting, 256, "%c%s_SM", 246, szBuf); - DBDeleteContactSetting(NULL, CLVM_MODULE, szSetting); + db_unset(NULL, CLVM_MODULE, szSetting); mir_snprintf(szSetting, 256, "%c%s_VA", 246, szBuf); - DBDeleteContactSetting(NULL, CLVM_MODULE, szSetting); + db_unset(NULL, CLVM_MODULE, szSetting); mir_snprintf(szSetting, 256, "%c%s_SSM", 246, szBuf); - DBDeleteContactSetting(NULL, CLVM_MODULE, szSetting); - DBDeleteContactSetting(NULL, CLVM_MODULE, szBuf); + db_unset(NULL, CLVM_MODULE, szSetting); + db_unset(NULL, CLVM_MODULE, szBuf); if ( !strcmp(cfg::dat.current_viewmode, szBuf) && lstrlenA(szBuf) == lstrlenA(cfg::dat.current_viewmode)) { cfg::dat.bFilterEffective = 0; pcli->pfnClcBroadcast(CLM_AUTOREBUILD, 0, 0); diff --git a/plugins/CmdLine/src/mimcmd_handlers.cpp b/plugins/CmdLine/src/mimcmd_handlers.cpp index 13a73e109f..12d3dc78b7 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.cpp +++ b/plugins/CmdLine/src/mimcmd_handlers.cpp @@ -804,7 +804,7 @@ void HandleSoundsCommand(PCommand command, TArgument *argv, int argc, PReply rep case STATE_ON: { failure = 0; - DBWriteContactSettingByte(NULL, "Skin", "UseSound", 1); + db_set_b(NULL, "Skin", "UseSound", 1); state = TRUE; break; @@ -813,7 +813,7 @@ void HandleSoundsCommand(PCommand command, TArgument *argv, int argc, PReply rep case STATE_OFF: { failure = 0; - DBWriteContactSettingByte(NULL, "Skin", "UseSound", 0); + db_set_b(NULL, "Skin", "UseSound", 0); state = FALSE; break; @@ -821,11 +821,11 @@ void HandleSoundsCommand(PCommand command, TArgument *argv, int argc, PReply rep case STATE_TOGGLE: { - state = DBGetContactSettingByte(NULL, "Skin", "UseSound", 1); + state = db_get_b(NULL, "Skin", "UseSound", 1); failure = 0; state = 1 - state; - DBWriteContactSettingByte(NULL, "Skin", "UseSound", state); + db_set_b(NULL, "Skin", "UseSound", state); break; } @@ -1302,7 +1302,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r char *module = argv[3]; char *key = argv[4]; - DBDeleteContactSetting(NULL, module, key); + db_unset(NULL, module, key); reply->code = MIMRES_SUCCESS; mir_snprintf(reply->message, reply->cMessage, Translate("Setting '%s/%s' deleted."), module, key); @@ -1330,7 +1330,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r { case VALUE_STRING: { - DBWriteContactSettingString(NULL, module, key, (char *) value); + db_set_s(NULL, module, key, (char *) value); wrote = "string"; break; @@ -1338,7 +1338,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r case VALUE_BYTE: { - DBWriteContactSettingByte(NULL, module, key, (* (char *) value)); + db_set_b(NULL, module, key, (* (char *) value)); wrote = "byte"; break; @@ -1346,7 +1346,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r case VALUE_WORD: { - DBWriteContactSettingWord(NULL, module, key, (* (WORD *) value)); + db_set_w(NULL, module, key, (* (WORD *) value)); wrote = "word"; break; @@ -1354,7 +1354,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r case VALUE_DWORD: { - DBWriteContactSettingDword(NULL, module, key, (* (DWORD *) value)); + db_set_dw(NULL, module, key, (* (DWORD *) value)); wrote = "dword"; break; @@ -1362,7 +1362,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r case VALUE_WIDE: { - DBWriteContactSettingWString(NULL, module, key, (WCHAR *) value); + db_set_ws(NULL, module, key, (WCHAR *) value); wrote = "wide string"; break; @@ -1402,7 +1402,7 @@ void HandleDatabaseCommand(PCommand command, TArgument *argv, int argc, PReply r DBVARIANT var = {0}; - int res = DBGetContactSetting(NULL, module, key, &var); + int res = db_get(NULL, module, key, &var); if (!res) { char buffer[1024]; @@ -1537,7 +1537,7 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe { case 4: { - int value = DBGetContactSettingByte(NULL, module, "NLUseProxy", 0); + int value = db_get_b(NULL, module, "NLUseProxy", 0); reply->code = MIMRES_SUCCESS; mir_snprintf(buffer, sizeof(buffer), "%s proxy status is %s", protocol, (value) ? "enabled" : "disabled"); @@ -1552,7 +1552,7 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe { case STATE_OFF: { - DBWriteContactSettingByte(NULL, module, "NLUseProxy", 0); + db_set_b(NULL, module, "NLUseProxy", 0); reply->code = MIMRES_SUCCESS; mir_snprintf(buffer, sizeof(buffer), Translate("'%s' proxy was disabled."), protocol); @@ -1562,7 +1562,7 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe case STATE_ON: { - DBWriteContactSettingByte(NULL, module, "NLUseProxy", 1); + db_set_b(NULL, module, "NLUseProxy", 1); reply->code = MIMRES_SUCCESS; mir_snprintf(buffer, sizeof(buffer), Translate("'%s' proxy was enabled."), protocol); @@ -1572,9 +1572,9 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe case STATE_TOGGLE: { - int value = DBGetContactSettingByte(NULL, module, "NLUseProxy", 0); + int value = db_get_b(NULL, module, "NLUseProxy", 0); value = 1 - value; - DBWriteContactSettingByte(NULL, module, "NLUseProxy", value); + db_set_b(NULL, module, "NLUseProxy", value); reply->code = MIMRES_SUCCESS; mir_snprintf(buffer, sizeof(buffer), (value) ? Translate("'%s' proxy was enabled.") : Translate("'%s' proxy was disabled.")); @@ -1613,8 +1613,8 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe int port; char type[256]; GetStringFromDatabase(NULL, module, "NLProxyServer", "", host, sizeof(host)); - port = DBGetContactSettingWord(NULL, module, "NLProxyPort", 0); - PrettyProxyType(DBGetContactSettingByte(NULL, module, "NLProxyType", 0), type, sizeof(type)); + port = db_get_w(NULL, module, "NLProxyPort", 0); + PrettyProxyType(db_get_b(NULL, module, "NLProxyType", 0), type, sizeof(type)); reply->code = MIMRES_SUCCESS; mir_snprintf(buffer, sizeof(buffer), Translate("%s proxy server: %s %s:%d."), protocol, type, host, port); @@ -1632,9 +1632,9 @@ void HandleProtocolProxyCommand(PCommand command, TArgument *argv, int argc, PRe if ((*stop == 0) && (type > 0)) { - DBWriteContactSettingString(NULL, module, "NLProxyServer", host); - DBWriteContactSettingWord(NULL, module, "NLProxyPort", port); - DBWriteContactSettingByte(NULL, module, "NLProxyType", type); + db_set_s(NULL, module, "NLProxyServer", host); + db_set_w(NULL, module, "NLProxyPort", port); + db_set_b(NULL, module, "NLProxyType", type); reply->code = MIMRES_SUCCESS; mir_snprintf(buffer, sizeof(buffer), Translate("%s proxy set to %s %s:%d."), protocol, argv[4], host, port); @@ -1774,7 +1774,7 @@ int ContactMatchSearch(HANDLE hContact, char *contact, char *id, char *account, char protocol[128]; AccountName2Protocol(account, protocol, sizeof(protocol)); - WORD contactStatus = DBGetContactSettingWord(hContact, protocol, "Status", ID_STATUS_ONLINE); + WORD contactStatus = db_get_w(hContact, protocol, "Status", ID_STATUS_ONLINE); if (searchStatus != contactStatus) { diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp index f85fb74e43..626141e68f 100644 --- a/plugins/CmdLine/src/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp @@ -138,7 +138,7 @@ int GetStringFromDatabase(HANDLE hContact, char *szModule, char *szSettingName, int res = 1; size_t len; dbv.type = DBVT_ASCIIZ; - if (DBGetContactSetting(hContact, szModule, szSettingName, &dbv) == 0) + if (db_get(hContact, szModule, szSettingName, &dbv) == 0) { res = 0; size_t tmp = strlen(dbv.pszVal); @@ -169,7 +169,7 @@ int GetStringFromDatabase(HANDLE hContact, char *szModule, char *szSettingName, int res = 1; size_t len; dbv.type = DBVT_WCHAR; - if (DBGetContactSettingWString(hContact, szModule, szSettingName, &dbv) == 0) + if (db_get_ws(hContact, szModule, szSettingName, &dbv) == 0) { res = 0; if (dbv.type != DBVT_WCHAR) diff --git a/plugins/CommonLibs/CString.cpp b/plugins/CommonLibs/CString.cpp index fb8760dc74..fde5e4dc2a 100644 --- a/plugins/CommonLibs/CString.cpp +++ b/plugins/CommonLibs/CString.cpp @@ -286,7 +286,7 @@ template class TString; template class TString; -CString DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue) +CString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue) { DBVARIANT dbv = {0}; DBCONTACTGETSETTING dbcgs; @@ -311,7 +311,7 @@ CString DBGetContactSettingString(HANDLE hContact, const char *szModule, const c -TCString DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue) +TCString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue) { DBVARIANT dbv = {0}; DBCONTACTGETSETTING dbcgs; @@ -337,7 +337,7 @@ TCString DBGetContactSettingString(HANDLE hContact, const char *szModule, const -int DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) +int db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv) { return db_get_s(hContact, szModule, szSetting, dbv, DBVT_ASCIIZ); } diff --git a/plugins/CommonLibs/CString.h b/plugins/CommonLibs/CString.h index fb956f6e4e..c9a4a9538e 100644 --- a/plugins/CommonLibs/CString.h +++ b/plugins/CommonLibs/CString.h @@ -231,10 +231,10 @@ __inline CHARARRAY WCHAR2UTF8(WCString Str) #endif // CHARARRAY_CONVERT -#undef DBGetContactSettingString -CString DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue); -TCString DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); -int DBGetContactSettingString(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); +#undef db_get_s +CString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const char *szDefaultValue); +TCString db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); +int db_get_s(HANDLE hContact, const char *szModule, const char *szSetting, DBVARIANT *dbv); TCString DBGetContactSettingAsString(HANDLE hContact, const char *szModule, const char *szSetting, const TCHAR *szDefaultValue); // also converts numeric values to a string // various string helpers. their return values are valid only while the class is visible diff --git a/plugins/CommonLibs/Options.cpp b/plugins/CommonLibs/Options.cpp index 4583cae0b5..36226b0f11 100644 --- a/plugins/CommonLibs/Options.cpp +++ b/plugins/CommonLibs/Options.cpp @@ -182,7 +182,7 @@ void COptItem::SetIntDBVal(CString &sModule, int Value, CString *sDBSettingPrefi cws.value.type = nValueSize; cws.value.dVal = Value; -// DBWriteContactSettingByte(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, Value[I].Flags); +// db_set_b(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, Value[I].Flags); //itoa(Value[I].ID, StrID.GetBuffer(64), 10); //StrID.ReleaseBuffer(); @@ -197,7 +197,7 @@ TCString COptItem::GetStrDBVal(CString &sModule, CString *sDBSettingPrefix) if (sDBSetting != NULL) { _ASSERT(GetDefValue()); - return DBGetContactSettingString(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, *(TCString*)GetDefValue()); + return db_get_s(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, *(TCString*)GetDefValue()); } return *(TCString*)GetDefValue(); } @@ -206,7 +206,7 @@ void COptItem::SetStrDBVal(CString &sModule, TCString &Str, CString *sDBSettingP { if (sDBSetting != NULL && !ReadOnly) { - DBWriteContactSettingTString(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str); + db_set_ts(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting, Str); } } @@ -355,11 +355,11 @@ int TreeReadEnum(const char *szSetting, LPARAM lParam) if (!strncmp(szSetting, TreeReadEnumData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_TITLE, Len) && isdigit(szSetting[Len])) { int ID = atol(szSetting + Len); - short ParentID = (TreeReadEnumData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) ? 0 : DBGetContactSettingWord(NULL, *TreeReadEnumData->sModule, + short ParentID = (TreeReadEnumData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) ? 0 : db_get_w(NULL, *TreeReadEnumData->sModule, *TreeReadEnumData->sDBSettingPrefix + TreeReadEnumData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_PARENT + (szSetting + Len), -1); - short Order = DBGetContactSettingWord(NULL, *TreeReadEnumData->sModule, + short Order = db_get_w(NULL, *TreeReadEnumData->sModule, *TreeReadEnumData->sDBSettingPrefix + TreeReadEnumData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_ORDER + (szSetting + Len), -1); - char Flags = (TreeReadEnumData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL && !(TreeReadEnumData->TreeCtrl->TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES)) ? 0 : DBGetContactSettingByte(NULL, *TreeReadEnumData->sModule, + char Flags = (TreeReadEnumData->TreeCtrl->TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL && !(TreeReadEnumData->TreeCtrl->TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES)) ? 0 : db_get_b(NULL, *TreeReadEnumData->sModule, *TreeReadEnumData->sDBSettingPrefix + TreeReadEnumData->TreeCtrl->sDBSetting + TREEITEM_DBSTR_FLAGS + (szSetting + Len), 0); if (ParentID >= 0 && Order >= 0) { @@ -367,9 +367,9 @@ int TreeReadEnum(const char *szSetting, LPARAM lParam) TreeReadEnumData->TreeCtrl->Value.SetAtGrow(Order).ParentID = ParentID; TreeReadEnumData->TreeCtrl->Value.SetAtGrow(Order).Flags = Flags; TreeReadEnumData->TreeCtrl->Value.SetAtGrow(Order).hItem = NULL; - TreeReadEnumData->TreeCtrl->Value.SetAtGrow(Order).Title = DBGetContactSettingString(NULL, *TreeReadEnumData->sModule, *TreeReadEnumData->sDBSettingPrefix + szSetting, _T("")); + TreeReadEnumData->TreeCtrl->Value.SetAtGrow(Order).Title = db_get_s(NULL, *TreeReadEnumData->sModule, *TreeReadEnumData->sDBSettingPrefix + szSetting, _T("")); TreeReadEnumData->TreeCtrl->Value.SetAtGrow(Order).User_Str1 = (TreeReadEnumData->TreeCtrl->User_Str1_DBName == NULL) ? NULL : - DBGetContactSettingString(NULL, *TreeReadEnumData->sModule, + db_get_s(NULL, *TreeReadEnumData->sModule, *TreeReadEnumData->sDBSettingPrefix + TreeReadEnumData->TreeCtrl->sDBSetting + TreeReadEnumData->TreeCtrl->User_Str1_DBName + (szSetting + Len), (TCHAR*)NULL); } } @@ -426,20 +426,16 @@ void COptItem_TreeCtrl::MemToDB(CString &sModule, CString *sDBSettingPrefix) CString StrID; _itoa(Value[I].ID, StrID.GetBuffer(64), 10); StrID.ReleaseBuffer(); - DBWriteContactSettingTString(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, Value[I].Title); + db_set_ts(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_TITLE + StrID, Value[I].Title); if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL)) - { - DBWriteContactSettingWord(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_PARENT + StrID, Value[I].ParentID); - } - DBWriteContactSettingWord(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_ORDER + StrID, I); + db_set_w(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_PARENT + StrID, Value[I].ParentID); + + db_set_w(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_ORDER + StrID, I); if (!(TreeFlags & TREECTRL_FLAG_IS_SINGLE_LEVEL) || TreeFlags & TREECTRL_FLAG_HAS_CHECKBOXES) - { - DBWriteContactSettingByte(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, Value[I].Flags); - } + db_set_b(NULL, sModule, *sDBSettingPrefix + sDBSetting + TREEITEM_DBSTR_FLAGS + StrID, Value[I].Flags); + if (User_Str1_DBName != NULL && Value[I].User_Str1 != NULL) - { - DBWriteContactSettingTString(NULL, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, Value[I].User_Str1); - } + db_set_ts(NULL, sModule, *sDBSettingPrefix + sDBSetting + User_Str1_DBName + StrID, Value[I].User_Str1); } COptItem::MemToDB(sModule, sDBSettingPrefix); } @@ -614,7 +610,7 @@ void COptItem_TreeCtrl::CleanDBSettings(CString &sModule, CString *sDBSettingPre int I; for (I = 0; I < TreeDeleteEnumData.TreeSettings.GetSize(); I++) { - DBDeleteContactSetting(NULL, sModule, TreeDeleteEnumData.TreeSettings[I]); + db_unset(NULL, sModule, TreeDeleteEnumData.TreeSettings[I]); } } @@ -809,7 +805,7 @@ int ListReadEnum(const char *szSetting, LPARAM lParam) if (!strncmp(szSetting, *ListReadEnumData->sDBSettingPrefix + ListReadEnumData->ListCtrl->sDBSetting + LISTITEM_DBSTR_TEXT, Len) && isdigit(szSetting[Len])) { int ID = atol(szSetting + Len); - ListReadEnumData->ListCtrl->Value.SetAtGrow(ID).Text = DBGetContactSettingString(NULL, *ListReadEnumData->sModule, *ListReadEnumData->sDBSettingPrefix + szSetting, _T("")); + ListReadEnumData->ListCtrl->Value.SetAtGrow(ID).Text = db_get_s(NULL, *ListReadEnumData->sModule, *ListReadEnumData->sDBSettingPrefix + szSetting, _T("")); } return 0; } @@ -864,7 +860,7 @@ void COptItem_ListCtrl::MemToDB(CString &sModule, CString *sDBSettingPrefix) CString StrID; _itoa(I, StrID.GetBuffer(64), 10); StrID.ReleaseBuffer(); - DBWriteContactSettingTString(NULL, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, Value[I].Text); + db_set_ts(NULL, sModule, *sDBSettingPrefix + sDBSetting + LISTITEM_DBSTR_TEXT + StrID, Value[I].Text); } COptItem::MemToDB(sModule, sDBSettingPrefix); } @@ -927,7 +923,7 @@ void COptItem_ListCtrl::CleanDBSettings(CString &sModule, CString *sDBSettingPre int I; for (I = 0; I < ListDeleteEnumData.ListSettings.GetSize(); I++) { - DBDeleteContactSetting(NULL, sModule, ListDeleteEnumData.ListSettings[I]); + db_unset(NULL, sModule, ListDeleteEnumData.ListSettings[I]); } } diff --git a/plugins/CommonLibs/Options.h b/plugins/CommonLibs/Options.h index 1b3bb0a284..666162c50a 100644 --- a/plugins/CommonLibs/Options.h +++ b/plugins/CommonLibs/Options.h @@ -43,7 +43,7 @@ public: virtual void MemToWnd(HWND hWnd) {EnableWindow(GetDlgItem(hWnd, DlgItemID), Enabled);} void DBToMemToWnd(CString &sModule, HWND hWnd, CString *sDBSettingPrefix = NULL) {DBToMem(sModule, sDBSettingPrefix); MemToWnd(hWnd);} void WndToMemToDB(HWND hWnd, CString &sModule, CString *sDBSettingPrefix = NULL) {WndToMem(hWnd); MemToDB(sModule, sDBSettingPrefix);} - virtual void CleanDBSettings(CString &sModule, CString *sDBSettingPrefix = NULL) {DBDeleteContactSetting(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting);}; // TODO: also set Value to DefValue? + virtual void CleanDBSettings(CString &sModule, CString *sDBSettingPrefix = NULL) {db_unset(NULL, sModule, sDBSettingPrefix ? (*sDBSettingPrefix + sDBSetting) : sDBSetting);}; // TODO: also set Value to DefValue? virtual void SetValue(int Value) {Modified = true;} virtual void SetDefValue(int DefValue) {} diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index c53c5039db..50373a214f 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -161,7 +161,7 @@ static void ShowConsole(int show) ScrollDown( pActive ); } ShowWindow(hwndConsole, (show)?SW_SHOW:SW_HIDE); - DBWriteContactSettingByte(NULL,"Console","Show",(BYTE)((show)?1:0)); + db_set_b(NULL,"Console","Show",(BYTE)((show)?1:0)); if (hwnd) SetForegroundWindow(hwnd); @@ -1005,14 +1005,14 @@ static int OnFastDump(WPARAM wParam,LPARAM lParam) static void LoadSettings() { - gIcons = DBGetContactSettingByte(NULL, "Console", "ShowIcons", 1); - gSeparator = DBGetContactSettingByte(NULL, "Console", "Separator", 1); - gSingleMode = DBGetContactSettingByte(NULL, "Console", "SingleMode", 0); + gIcons = db_get_b(NULL, "Console", "ShowIcons", 1); + gSeparator = db_get_b(NULL, "Console", "Separator", 1); + gSingleMode = db_get_b(NULL, "Console", "SingleMode", 0); - gWrapLen = DBGetContactSettingByte(NULL, "Console", "Wrap", DEFAULT_WRAPLEN); + gWrapLen = db_get_b(NULL, "Console", "Wrap", DEFAULT_WRAPLEN); if ( gWrapLen < MIN_WRAPLEN ) gWrapLen = DEFAULT_WRAPLEN; - gLimit = DBGetContactSettingDword(NULL, "Console", "Limit", MAX_LIMIT); + gLimit = db_get_dw(NULL, "Console", "Limit", MAX_LIMIT); if (gLimit > MAX_LIMIT) gLimit = MAX_LIMIT; if (gLimit < MIN_LIMIT) gLimit = MIN_LIMIT; } @@ -1029,7 +1029,7 @@ static void SaveSettings(HWND hwndDlg) gWrapLen = len; SetDlgItemInt(hwndDlg, IDC_WRAP, gWrapLen, FALSE); - DBWriteContactSettingByte(NULL, "Console", "Wrap", (BYTE)len); + db_set_b(NULL, "Console", "Wrap", (BYTE)len); len = GetDlgItemInt(hwndDlg, IDC_LIMIT, NULL, FALSE); if (len < MIN_LIMIT ) @@ -1040,13 +1040,13 @@ static void SaveSettings(HWND hwndDlg) gLimit = len; SetDlgItemInt(hwndDlg, IDC_LIMIT, gLimit, FALSE); - DBWriteContactSettingDword(NULL, "Console", "Limit", len); + db_set_dw(NULL, "Console", "Limit", len); - DBWriteContactSettingByte(NULL, "Console", "SingleMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SINGLE)); - DBWriteContactSettingByte(NULL, "Console", "Separator", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SEPARATOR)); - DBWriteContactSettingByte(NULL, "Console", "ShowIcons", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SHOWICONS)); + 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)); - DBWriteContactSettingByte(NULL, "Console", "ShowAtStart", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_START)); + db_set_b(NULL, "Console", "ShowAtStart", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_START)); } @@ -1055,7 +1055,7 @@ static INT_PTR CALLBACK OptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM switch(msg) { case WM_INITDIALOG: TranslateDialogDefault(hwndDlg); - CheckDlgButton(hwndDlg, IDC_START, DBGetContactSettingByte(NULL, "Console", "ShowAtStart", 0)); + CheckDlgButton(hwndDlg, IDC_START, db_get_b(NULL, "Console", "ShowAtStart", 0)); CheckDlgButton(hwndDlg, IDC_SINGLE, gSingleMode); CheckDlgButton(hwndDlg, IDC_SHOWICONS, gIcons); CheckDlgButton(hwndDlg, IDC_SEPARATOR, gSeparator); @@ -1230,7 +1230,7 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam) OnFontChange(0,0); OnColourChange(0,0); - if (DBGetContactSettingByte(NULL,"Console","ShowAtStart",0) || DBGetContactSettingByte(NULL,"Console","Show",1)) + if (db_get_b(NULL,"Console","ShowAtStart",0) || db_get_b(NULL,"Console","Show",1)) ShowConsole(1); else ShowConsole(0); diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index 32534bea8f..2406d660e6 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -34,7 +34,7 @@ HANDLE ghSendWindowList; HANDLE ghRecvWindowList; gAckList gaAckData; -HANDLE hContactMenuItem = NULL; +HGENMENU hContactMenuItem; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), @@ -122,7 +122,7 @@ static bool CheckContactsServiceSupport(const char* szProto) static int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam) { HANDLE hContact = (HANDLE)wParam; - char* szProto =GetContactProto(hContact); + char *szProto = GetContactProto(hContact); int bVisible = FALSE; if (szProto && CheckContactsServiceSupport(szProto)) { @@ -133,13 +133,7 @@ static int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam) } // update contact menu item's visibility - CLISTMENUITEM mi = { sizeof(mi) }; - if (bVisible) - mi.flags = CMIM_FLAGS; - else - mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hContactMenuItem, (LPARAM)&mi); + Menu_ShowItem(hContactMenuItem, bVisible); return 0; } diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp index 7b1c876a3e..dbb19d3330 100644 --- a/plugins/ContactsPlus/src/receive.cpp +++ b/plugins/ContactsPlus/src/receive.cpp @@ -95,7 +95,7 @@ static void RebuildGroupCombo(HWND hwndDlg) int bHasGroups = !DBGetContactSettingT(NULL, "CListGroups", "0", &dbv); HWND hGroupsCombo = GetDlgItem(hwndDlg, IDC_GROUPS); - DBFreeVariant(&dbv); + db_free(&dbv); if (bHasGroups) { int curs = SendMessageT(hGroupsCombo, CB_GETCURSEL, 0, 0); diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index 03d9356062..454bd33b2d 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -227,7 +227,7 @@ static void SetAllContactChecks(HWND hwndList, HANDLE hReceiver) // doubtful nam char* szProto =GetContactProto(hReceiver); if (szProto == NULL) return; - if (CallService(MS_CLUI_GETCAPS, 0, 0) & CLUIF_HIDEEMPTYGROUPS && DBGetContactSettingByte(NULL, "CList", "HideEmptyGroups", SETTING_USEGROUPS_DEFAULT)) + if (CallService(MS_CLUI_GETCAPS, 0, 0) & CLUIF_HIDEEMPTYGROUPS && db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_USEGROUPS_DEFAULT)) SendMessageT(hwndList, CLM_SETHIDEEMPTYGROUPS, (WPARAM) TRUE, 0); else SendMessageT(hwndList, CLM_SETHIDEEMPTYGROUPS, (WPARAM) FALSE, 0); @@ -385,7 +385,7 @@ INT_PTR CALLBACK SendDlgProc( HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar if (!wndData->SendContacts(hwndDlg)) break; - SetTimer(hwndDlg,TIMERID_MSGSEND,DBGetContactSettingDword(NULL,"SRMsg","MessageTimeout",TIMEOUT_MSGSEND),NULL); + SetTimer(hwndDlg,TIMERID_MSGSEND,db_get_dw(NULL,"SRMsg","MessageTimeout",TIMEOUT_MSGSEND),NULL); break; } diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp index 5ff85344b8..78f5fa52e6 100644 --- a/plugins/ContactsPlus/src/utils.cpp +++ b/plugins/ContactsPlus/src/utils.cpp @@ -100,7 +100,7 @@ char *GetContactUID(HANDLE hContact, int bTchar) SAFE_FREE((void**)&szAnsi); } } - DBFreeVariant(&vrUid); + db_free(&vrUid); } } if (bTchar) @@ -120,7 +120,7 @@ int DBGetContactSettingT(HANDLE hContact, const char *szModule, const char* szSe if (ServiceExists(MS_DB_CONTACT_GETSETTING_STR)) return DBGetContactSettingW(hContact, szModule, szSetting, dbv); else - return DBGetContactSetting(hContact, szModule, szSetting, dbv); + return db_get(hContact, szModule, szSetting, dbv); } @@ -129,18 +129,18 @@ TCHAR* DBGetContactSettingStringT(HANDLE hContact, const char *szModule, const c DBVARIANT dbv = {DBVT_DELETED}; TCHAR* szRes; - if (DBGetContactSettingWString(hContact, szModule, szSetting, &dbv)) + if (db_get_ws(hContact, szModule, szSetting, &dbv)) return strdupT(szDef); szRes = strdupT(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); return szRes; } int DBWriteContactSettingStringT(HANDLE hContact, const char *szModule, const char* szSetting, TCHAR* szValue) { - return DBWriteContactSettingWString(hContact, szModule, szSetting, (WCHAR*)szValue); + return db_set_ws(hContact, szModule, szSetting, (WCHAR*)szValue); } @@ -193,7 +193,7 @@ void UpdateDialogTitle(HWND hwndDlg, HANDLE hContact, char* pszTitleStart) if (strcmpT(uid?uid:contactName, oldTitle)) SetDlgItemTextT(hwndDlg, IDC_NAME, uid?uid:contactName); - szStatus = MirandaStatusToStringT(szProto==NULL ? ID_STATUS_OFFLINE:DBGetContactSettingWord(hContact,szProto,"Status",ID_STATUS_OFFLINE)); + szStatus = MirandaStatusToStringT(szProto==NULL ? ID_STATUS_OFFLINE:db_get_w(hContact,szProto,"Status",ID_STATUS_OFFLINE)); _snprintfT(newtitle, 256, "%s %s (%s)", SRCTranslateT(pszTitleStart, str), contactName, szStatus); SAFE_FREE((void**)&uid); @@ -216,7 +216,7 @@ void UpdateDialogTitle(HWND hwndDlg, HANDLE hContact, char* pszTitleStart) void UpdateDialogAddButton(HWND hwndDlg, HANDLE hContact) { - int bVisible = DBGetContactSettingByte(hContact,"CList","NotOnList",0); + int bVisible = db_get_b(hContact,"CList","NotOnList",0); ShowWindow(GetDlgItem(hwndDlg, IDC_ADD), bVisible?SW_SHOW:SW_HIDE); } diff --git a/plugins/CountryFlags/src/extraimg.cpp b/plugins/CountryFlags/src/extraimg.cpp index 3301c27249..ab109230ce 100644 --- a/plugins/CountryFlags/src/extraimg.cpp +++ b/plugins/CountryFlags/src/extraimg.cpp @@ -35,12 +35,12 @@ static INT_PTR ServiceDetectContactOriginCountry(WPARAM wParam,LPARAM lParam) char *pszProto = GetContactProto((HANDLE)wParam); /* ip detect */ if ( db_get_b(NULL,"Flags","UseIpToCountry",SETTING_USEIPTOCOUNTRY_DEFAULT)) - countryNumber=ServiceIpToCountry(DBGetContactSettingDword((HANDLE)wParam,pszProto,"RealIP",0),0); + countryNumber=ServiceIpToCountry(db_get_dw((HANDLE)wParam,pszProto,"RealIP",0),0); /* fallback */ if (countryNumber == 0xFFFF) - countryNumber=DBGetContactSettingWord((HANDLE)wParam,pszProto,"Country",0); + countryNumber=db_get_w((HANDLE)wParam,pszProto,"Country",0); if (countryNumber == 0 || countryNumber == 0xFFFF) - countryNumber=DBGetContactSettingWord((HANDLE)wParam,pszProto,"CompanyCountry",0); + countryNumber=db_get_w((HANDLE)wParam,pszProto,"CompanyCountry",0); return (countryNumber == 0) ? 0xFFFF : countryNumber; } @@ -250,14 +250,14 @@ static INT_PTR CALLBACK ExtraImgOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,L case WM_NOTIFY: switch(((NMHDR*)lParam)->code) { case PSN_APPLY: /* setting change hook will pick these up */ - DBWriteContactSettingByte(NULL,"Flags","UseUnknownFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEUNKNOWNFLAG) != 0)); - DBWriteContactSettingByte(NULL,"Flags","UseIpToCountry",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEIPTOCOUNTRY) != 0)); + db_set_b(NULL,"Flags","UseUnknownFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEUNKNOWNFLAG) != 0)); + db_set_b(NULL,"Flags","UseIpToCountry",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_USEIPTOCOUNTRY) != 0)); /* Status Icon */ if (IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG))) - DBWriteContactSettingByte(NULL,"Flags","ShowStatusIconFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG) != 0)); + db_set_b(NULL,"Flags","ShowStatusIconFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWSTATUSICONFLAG) != 0)); /* Extra Image */ if (IsWindowEnabled(GetDlgItem(hwndDlg,IDC_CHECK_SHOWEXTRAIMGFLAG))) - DBWriteContactSettingByte(NULL,"Flags","ShowExtraImgFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWEXTRAIMGFLAG) != 0)); + db_set_b(NULL,"Flags","ShowExtraImgFlag",(BYTE)(IsDlgButtonChecked(hwndDlg,IDC_CHECK_SHOWEXTRAIMGFLAG) != 0)); return TRUE; } break; diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index d01e364ee3..8b58bddd20 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -328,7 +328,7 @@ static int ModulesLoaded(WPARAM, LPARAM) if (servicemode) ViewVersionInfo(0, 0); - else if (DBGetContactSettingByte(NULL, PluginName, "UploadChanged", 0) && !ProcessVIHash(false)) + else if (db_get_b(NULL, PluginName, "UploadChanged", 0) && !ProcessVIHash(false)) UploadVersionInfo(0, 0xa1); CheckForOtherCrashReportingPlugins(); @@ -344,9 +344,9 @@ static int PreShutdown(WPARAM, LPARAM) extern "C" int __declspec(dllexport) Load(void) { - clsdates = DBGetContactSettingByte(NULL, PluginName, "ClassicDates", 1) != 0; + clsdates = db_get_b(NULL, PluginName, "ClassicDates", 1) != 0; - dtsubfldr = DBGetContactSettingByte(NULL, PluginName, "SubFolders", 1) != 0; + dtsubfldr = db_get_b(NULL, PluginName, "SubFolders", 1) != 0; mir_getLP(&pluginInfoEx); HookEvent(ME_SYSTEM_MODULESLOADED, ModulesLoaded); diff --git a/plugins/CrashDumper/src/ui.cpp b/plugins/CrashDumper/src/ui.cpp index 21eea4fb13..d7366d24b9 100644 --- a/plugins/CrashDumper/src/ui.cpp +++ b/plugins/CrashDumper/src/ui.cpp @@ -215,18 +215,18 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP TranslateDialogDefault(hwndDlg); DBVARIANT dbv; - if (DBGetContactSettingString(NULL, PluginName, "Username", &dbv) == 0) + if (db_get_s(NULL, PluginName, "Username", &dbv) == 0) { SetDlgItemTextA(hwndDlg, IDC_USERNAME, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } - if (DBGetContactSettingString(NULL, PluginName, "Password", &dbv) == 0) + if (db_get_s(NULL, PluginName, "Password", &dbv) == 0) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal)+1, (LPARAM)dbv.pszVal); SetDlgItemTextA(hwndDlg, IDC_PASSWORD, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } - CheckDlgButton(hwndDlg, IDC_UPLOADCHN, DBGetContactSettingByte(NULL, PluginName, "UploadChanged", 0)); + CheckDlgButton(hwndDlg, IDC_UPLOADCHN, db_get_b(NULL, PluginName, "UploadChanged", 0)); CheckDlgButton(hwndDlg, IDC_CLASSICDATES, clsdates); CheckDlgButton(hwndDlg, IDC_DATESUBFOLDER, dtsubfldr); } @@ -242,25 +242,25 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP { char szSetting[100]; GetDlgItemTextA(hwndDlg, IDC_USERNAME, szSetting, SIZEOF(szSetting)); - DBWriteContactSettingString(NULL, PluginName, "Username", szSetting); + db_set_s(NULL, PluginName, "Username", szSetting); GetDlgItemTextA(hwndDlg, IDC_PASSWORD, szSetting, SIZEOF(szSetting)); CallService(MS_DB_CRYPT_ENCODESTRING, SIZEOF(szSetting), (LPARAM)szSetting); - DBWriteContactSettingString(NULL, PluginName, "Password", szSetting); + db_set_s(NULL, PluginName, "Password", szSetting); - DBWriteContactSettingByte(NULL, PluginName, "UploadChanged", + db_set_b(NULL, PluginName, "UploadChanged", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UPLOADCHN)); clsdates = IsDlgButtonChecked(hwndDlg, IDC_CLASSICDATES) == BST_CHECKED; if (clsdates) - DBWriteContactSettingByte(NULL, PluginName, "ClassicDates", 1); + db_set_b(NULL, PluginName, "ClassicDates", 1); else - DBDeleteContactSetting(NULL, PluginName, "ClassicDates"); + db_unset(NULL, PluginName, "ClassicDates"); dtsubfldr = IsDlgButtonChecked(hwndDlg, IDC_DATESUBFOLDER) == BST_CHECKED; if (dtsubfldr) - DBWriteContactSettingByte(NULL, PluginName, "SubFolders", 1); + db_set_b(NULL, PluginName, "SubFolders", 1); else - DBDeleteContactSetting(NULL, PluginName, "SubFolders"); + db_unset(NULL, PluginName, "SubFolders"); } break; } diff --git a/plugins/CrashDumper/src/upload.cpp b/plugins/CrashDumper/src/upload.cpp index 7b50d9f866..7dd74d65c4 100644 --- a/plugins/CrashDumper/src/upload.cpp +++ b/plugins/CrashDumper/src/upload.cpp @@ -40,15 +40,15 @@ void GetLoginStr(char* user, size_t szuser, char* pass) { DBVARIANT dbv; - if (DBGetContactSettingString(NULL, PluginName, "Username", &dbv) == 0) + if (db_get_s(NULL, PluginName, "Username", &dbv) == 0) { mir_snprintf(user, szuser, "%s", dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else user[0] = 0; - if (DBGetContactSettingString(NULL, PluginName, "Password", &dbv) == 0) + if (db_get_s(NULL, PluginName, "Password", &dbv) == 0) { CallService(MS_DB_CRYPT_DECODESTRING, strlen(dbv.pszVal)+1, (LPARAM)dbv.pszVal); @@ -61,7 +61,7 @@ void GetLoginStr(char* user, size_t szuser, char* pass) arrayToHex(hash, sizeof(hash), pass); - DBFreeVariant(&dbv); + db_free(&dbv); } else pass[0] = 0; @@ -142,7 +142,7 @@ bool InternetDownloadFile(const char *szUrl, VerTrnsfr* szReq) switch(nlhrReply->resultCode) { case 200: - if (DBGetContactSettingByte(NULL, PluginName, "UploadChanged", 0)) + if (db_get_b(NULL, PluginName, "UploadChanged", 0)) ProcessVIHash(true); for (i=nlhrReply->headersCount; i--; ) @@ -267,16 +267,16 @@ bool ProcessVIHash(bool store) bool result; if (store) { - DBWriteContactSettingString(NULL, PluginName, "VIHash", hashstr); + db_set_s(NULL, PluginName, "VIHash", hashstr); result = true; } else { DBVARIANT dbv; - if (DBGetContactSettingString(NULL, PluginName, "VIHash", &dbv) == 0) + if (db_get_s(NULL, PluginName, "VIHash", &dbv) == 0) { result = strcmp(hashstr, dbv.pszVal) == 0; - DBFreeVariant(&dbv); + db_free(&dbv); } else result = false; diff --git a/plugins/CrashDumper/src/utils.cpp b/plugins/CrashDumper/src/utils.cpp index 625ca46ae5..1bb3b770aa 100644 --- a/plugins/CrashDumper/src/utils.cpp +++ b/plugins/CrashDumper/src/utils.cpp @@ -830,6 +830,6 @@ bool IsPluginEnabled(TCHAR* filename) char* fname; crsi_t2a(fname, filename); char* ext = strstr(_strlwr(fname), ".dll"); - bool res = ext && ext[4] == '\0' && DBGetContactSettingByte(NULL, "PluginDisable", fname, 0) == 0; + bool res = ext && ext[4] == '\0' && db_get_b(NULL, "PluginDisable", fname, 0) == 0; return res; } diff --git a/plugins/Db3x/src/dbintf3x.cpp b/plugins/Db3x/src/dbintf3x.cpp index fcbfc8ce67..5bca636e1a 100644 --- a/plugins/Db3x/src/dbintf3x.cpp +++ b/plugins/Db3x/src/dbintf3x.cpp @@ -47,7 +47,7 @@ DWORD CDb3x::GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc,DWORD ofsContact, DWORD ofsThis; for ( int i=0; i < SETTINGSGROUPOFSCOUNT; i++) - if(settingsGroupOfsCache[i].ofsContact == ofsContact && settingsGroupOfsCache[i].ofsModuleName == ofsModuleName) + if (settingsGroupOfsCache[i].ofsContact == ofsContact && settingsGroupOfsCache[i].ofsModuleName == ofsModuleName) return settingsGroupOfsCache[i].ofsSettingsGroup; ofsThis = dbc->ofsFirstSettings; @@ -58,7 +58,7 @@ DWORD CDb3x::GetSettingsGroupOfsByModuleNameOfs(DBContact *dbc,DWORD ofsContact, settingsGroupOfsCache[nextSGOCacheEntry].ofsContact = ofsContact; settingsGroupOfsCache[nextSGOCacheEntry].ofsModuleName = ofsModuleName; settingsGroupOfsCache[nextSGOCacheEntry].ofsSettingsGroup = ofsThis; - if(++nextSGOCacheEntry==SETTINGSGROUPOFSCOUNT) nextSGOCacheEntry = 0; + if (++nextSGOCacheEntry==SETTINGSGROUPOFSCOUNT) nextSGOCacheEntry = 0; return ofsThis; } ofsThis = dbcs->ofsNext; diff --git a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp index 968ee92bc0..1c0b10a32d 100644 --- a/plugins/DbEditorPP/src/addeditsettingsdlg.cpp +++ b/plugins/DbEditorPP/src/addeditsettingsdlg.cpp @@ -11,20 +11,20 @@ static BOOL Convert(HANDLE hContact, char* module, char* setting, int value, int if (value > 0xFF) Result = 0; else - DBWriteContactSettingByte(hContact, module, setting, (BYTE)value); + db_set_b(hContact, module, setting, (BYTE)value); break; case 1: if (value > 0xFFFF) Result = 0; else - DBWriteContactSettingWord(hContact, module, setting, (WORD)value); + db_set_w(hContact, module, setting, (WORD)value); break; case 2: - DBWriteContactSettingDword(hContact, module, setting, (DWORD)value); + db_set_dw(hContact, module, setting, (DWORD)value); break; case 3: - DBDeleteContactSetting(hContact, module, setting); - DBWriteContactSettingString(hContact, module, setting, itoa(value,temp,10)); + db_unset(hContact, module, setting); + db_set_s(hContact, module, setting, itoa(value,temp,10)); break; } return Result; @@ -56,7 +56,7 @@ BOOL convertSetting(HANDLE hContact, char* module, char* setting, int toType) // int len = (int)strlen(dbv.pszVal) + 1; WCHAR *wc = (WCHAR*)_alloca(len*sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, dbv.pszVal, -1, wc, len); - Result = !DBWriteContactSettingWString(hContact, module, setting, wc); + Result = !db_set_ws(hContact, module, setting, wc); } else if (strlen(dbv.pszVal) < 11 && toType != 3) { int val = atoi(dbv.pszVal); @@ -74,7 +74,7 @@ BOOL convertSetting(HANDLE hContact, char* module, char* setting, int toType) // WCHAR *wc = (WCHAR*)_alloca(len*sizeof(WCHAR)); MultiByteToWideChar(CP_UTF8, 0, dbv.pszVal, -1, wc, len); WideCharToMultiByte(CP_ACP, 0, wc, -1, sz, len, NULL, NULL); - Result = !DBWriteContactSettingString(hContact, module, setting, sz); + Result = !db_set_s(hContact, module, setting, sz); } break; } @@ -82,7 +82,7 @@ BOOL convertSetting(HANDLE hContact, char* module, char* setting, int toType) // if (!Result) msg(Translate("Cannot Convert!"), modFullname); - DBFreeVariant(&dbv); + db_free(&dbv); } return Result; @@ -357,22 +357,22 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l // delete the old setting if (mir_strcmp(setting, dbsetting->setting) && dbsetting->setting && (dbsetting->setting)[0] != 0) - DBDeleteContactSetting(dbsetting->hContact, dbsetting->module, dbsetting->setting); + db_unset(dbsetting->hContact, dbsetting->module, dbsetting->setting); // delete the setting if we are saving as a different type switch (dbsetting->dbv.type) { case DBVT_BYTE: - if (saveAsType(hwnd) != 0) DBDeleteContactSetting(dbsetting->hContact, dbsetting->module, setting); + if (saveAsType(hwnd) != 0) db_unset(dbsetting->hContact, dbsetting->module, setting); break; case DBVT_WORD: - if (saveAsType(hwnd) != 1) DBDeleteContactSetting(dbsetting->hContact, dbsetting->module, setting); + if (saveAsType(hwnd) != 1) db_unset(dbsetting->hContact, dbsetting->module, setting); break; case DBVT_DWORD: - if (saveAsType(hwnd) != 2) DBDeleteContactSetting(dbsetting->hContact, dbsetting->module, setting); + if (saveAsType(hwnd) != 2) db_unset(dbsetting->hContact, dbsetting->module, setting); break; //case DBVT_ASCIIZ: - //DBWriteContactSettingString(dbsetting->hContact, dbsetting->module, setting, value); + //db_set_s(dbsetting->hContact, dbsetting->module, setting, value); //break; } // write the setting @@ -381,25 +381,25 @@ INT_PTR CALLBACK EditSettingDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l case 0: if (IsDlgButtonChecked(hwnd, CHK_HEX)) sscanf(value, "%x", &settingValue); else sscanf(value, "%d", &settingValue); - DBWriteContactSettingByte(dbsetting->hContact, dbsetting->module, setting, (BYTE)settingValue); + db_set_b(dbsetting->hContact, dbsetting->module, setting, (BYTE)settingValue); break; case 1: if (IsDlgButtonChecked(hwnd, CHK_HEX)) sscanf(value, "%x", &settingValue); else sscanf(value, "%d", &settingValue); - DBWriteContactSettingWord(dbsetting->hContact, dbsetting->module, setting, (WORD)settingValue); + db_set_w(dbsetting->hContact, dbsetting->module, setting, (WORD)settingValue); break; case 2: if (IsDlgButtonChecked(hwnd, CHK_HEX)) sscanf(value, "%x", &settingValue); else sscanf(value, "%d", &settingValue); - DBWriteContactSettingDword(dbsetting->hContact, dbsetting->module, setting, (DWORD)settingValue); + db_set_dw(dbsetting->hContact, dbsetting->module, setting, (DWORD)settingValue); break; case 3: if (dbsetting->dbv.type == DBVT_UTF8) - DBWriteContactSettingWString(dbsetting->hContact, dbsetting->module, setting, (WCHAR*)value); + db_set_ws(dbsetting->hContact, dbsetting->module, setting, (WCHAR*)value); else if (dbsetting->dbv.type == DBVT_BLOB) WriteBlobFromString(dbsetting->hContact,dbsetting->module,setting,value,valueLength); else if (dbsetting->dbv.type == DBVT_ASCIIZ) - DBWriteContactSettingString(dbsetting->hContact, dbsetting->module, setting, value); + db_set_s(dbsetting->hContact, dbsetting->module, setting, value); break; } diff --git a/plugins/DbEditorPP/src/copymodule.cpp b/plugins/DbEditorPP/src/copymodule.cpp index 28ee01a696..50077160a8 100644 --- a/plugins/DbEditorPP/src/copymodule.cpp +++ b/plugins/DbEditorPP/src/copymodule.cpp @@ -16,26 +16,26 @@ void copyModule(char* module, HANDLE hContactFrom, HANDLE hContactTo) switch (dbv.type) { case DBVT_BYTE: - DBWriteContactSettingByte(hContactTo, module, setting->name, dbv.bVal); + db_set_b(hContactTo, module, setting->name, dbv.bVal); break; case DBVT_WORD: - DBWriteContactSettingWord(hContactTo, module, setting->name, dbv.wVal); + db_set_w(hContactTo, module, setting->name, dbv.wVal); break; case DBVT_DWORD: - DBWriteContactSettingDword(hContactTo, module, setting->name, dbv.dVal); + db_set_dw(hContactTo, module, setting->name, dbv.dVal); break; case DBVT_ASCIIZ: - DBWriteContactSettingString(hContactTo, module, setting->name, dbv.pszVal); + db_set_s(hContactTo, module, setting->name, dbv.pszVal); break; case DBVT_UTF8: - DBWriteContactSettingStringUtf(hContactTo, module, setting->name, dbv.pszVal); + db_set_utf(hContactTo, module, setting->name, dbv.pszVal); break; case DBVT_BLOB: DBWriteContactSettingBlob(hContactTo, module, setting->name, dbv.pbVal, dbv.cpbVal); break; } } - DBFreeVariant(&dbv); + db_free(&dbv); setting = (struct ModSetLinkLinkItem *)setting->next; } FreeModuleSettingLL(&msll); diff --git a/plugins/DbEditorPP/src/deletemodule.cpp b/plugins/DbEditorPP/src/deletemodule.cpp index e55845d7bb..15998e74ad 100644 --- a/plugins/DbEditorPP/src/deletemodule.cpp +++ b/plugins/DbEditorPP/src/deletemodule.cpp @@ -11,14 +11,11 @@ int deleteModule(char* module, HANDLE hContact, int fromMenu) if (!module) return 0; - if (!fromMenu) - { + if (!fromMenu) { mir_snprintf(msg, SIZEOF(msg), Translate("Are you sure you want to delete module \"%s\"?"), module); - if (DBGetContactSettingByte(NULL,modname, "WarnOnDelete",1)) - { + if (db_get_b(NULL,modname, "WarnOnDelete",1)) if (MessageBox(0,msg, Translate("Confirm Module Deletion"), MB_YESNO|MB_ICONEXCLAMATION) == IDNO) return 0; - } } if (!EnumSettings(hContact,module,&settinglist)) return 0; @@ -26,7 +23,7 @@ int deleteModule(char* module, HANDLE hContact, int fromMenu) setting = settinglist.first; while (setting) { - DBDeleteContactSetting(hContact, module, setting->name); + db_unset(hContact, module, setting->name); setting = (struct ModSetLinkLinkItem *)setting->next; } FreeModuleSettingLL(&settinglist); diff --git a/plugins/DbEditorPP/src/exportimport.cpp b/plugins/DbEditorPP/src/exportimport.cpp index 5f8006e9ec..4c978e28f2 100644 --- a/plugins/DbEditorPP/src/exportimport.cpp +++ b/plugins/DbEditorPP/src/exportimport.cpp @@ -101,15 +101,15 @@ void exportModule(HANDLE hContact, char* module, FILE* file) { case DBVT_BYTE: fprintf(file, "\n%s=b%s", setting->name, itoa(dbv.bVal,tmp,10)); - DBFreeVariant(&dbv); + db_free(&dbv); break; case DBVT_WORD: fprintf(file, "\n%s=w%s", setting->name, itoa(dbv.wVal,tmp,10)); - DBFreeVariant(&dbv); + db_free(&dbv); break; case DBVT_DWORD: fprintf(file, "\n%s=d%s", setting->name, itoa(dbv.dVal,tmp,10)); - DBFreeVariant(&dbv); + db_free(&dbv); break; case DBVT_ASCIIZ: case DBVT_UTF8: @@ -125,7 +125,7 @@ void exportModule(HANDLE hContact, char* module, FILE* file) fprintf(file, "\n%s=u%s", setting->name, dbv.pszVal); else fprintf(file, "\n%s=s%s", setting->name, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); break; case DBVT_BLOB: { @@ -143,7 +143,7 @@ void exportModule(HANDLE hContact, char* module, FILE* file) fprintf(file,"\n%s=n%s",setting->name , data); mir_free(data); } - DBFreeVariant(&dbv); + db_free(&dbv); break; } } @@ -372,10 +372,10 @@ HANDLE Clist_GroupExists(WCHAR *tszGroup) do { _itoa(i, str, 10); - result = DBGetContactSettingTString(0, "CListGroups", str, &dbv); + result = db_get_ts(0, "CListGroups", str, &dbv); if (!result) { match = (!lstrcmpW(tszGroup, (LPCWSTR)&dbv.ptszVal[1]) && (lstrlenW(tszGroup) == lstrlenW((LPCWSTR)&dbv.ptszVal[1]))); - DBFreeVariant(&dbv); + db_free(&dbv); if(match) return((HANDLE)(i + 1)); } @@ -501,21 +501,21 @@ void importSettings(HANDLE hContact, char *importstring ) case 'b': case 'B': if (sscanf((end+2), "%d", &value) == 1) - DBWriteContactSettingByte(hContact, module, setting, (BYTE)value); + db_set_b(hContact, module, setting, (BYTE)value); break; case 'w': case 'W': if (sscanf((end+2), "%d", &value) == 1) - DBWriteContactSettingWord(hContact, module, setting, (WORD)value); + db_set_w(hContact, module, setting, (WORD)value); break; case 'd': case 'D': if (sscanf((end+2), "%d", &value) == 1) - DBWriteContactSettingDword(hContact, module, setting, (DWORD)value); + db_set_dw(hContact, module, setting, (DWORD)value); break; case 's': case 'S': - DBWriteContactSettingString(hContact,module, setting, (end+2)); + db_set_s(hContact,module, setting, (end+2)); break; case 'g': case 'G': @@ -532,11 +532,11 @@ void importSettings(HANDLE hContact, char *importstring ) } } } case 'u': case 'U': - DBWriteContactSettingStringUtf(hContact,module, setting, (end+2)); + db_set_utf(hContact,module, setting, (end+2)); break; case 'l': case 'L': - DBDeleteContactSetting(hContact, module, setting); + db_unset(hContact, module, setting); break; case 'n': case 'N': diff --git a/plugins/DbEditorPP/src/findwindow.cpp b/plugins/DbEditorPP/src/findwindow.cpp index e8fd22aa70..08a9a3e5c4 100644 --- a/plugins/DbEditorPP/src/findwindow.cpp +++ b/plugins/DbEditorPP/src/findwindow.cpp @@ -353,7 +353,7 @@ int replaceValue(HWND hwnd, HANDLE hContact, const char *module, const char *set if ((!cws.value.pszVal && !replace[0]) || (cws.value.pszVal && !cws.value.pszVal[0])) { ItemFound(hwnd,hContact,module,setting,NULL,FW_SETTINGNAME|FW_DELETED); - DBDeleteContactSetting(hContact,module,setting); + db_unset(hContact,module,setting); mir_free(myreplace); return 1; } @@ -390,7 +390,7 @@ int replaceSetting(HWND hwnd, HANDLE hContact, const char *module, const char *s if (cws.szSetting[0]==0) { ItemFound(hwnd,hContact,module,setting,NULL,FW_SETTINGNAME|FW_DELETED); - DBDeleteContactSetting(hContact,module,setting); + db_unset(hContact,module,setting); mir_free(myreplace); return 1; } @@ -410,12 +410,12 @@ int replaceSetting(HWND hwnd, HANDLE hContact, const char *module, const char *s if (!CallService(MS_DB_CONTACT_WRITESETTING,(WPARAM)hContact,(LPARAM)&cws)) { count++; - DBDeleteContactSetting(hContact,module,setting); + db_unset(hContact,module,setting); ItemFound(hwnd,hContact,module,cws.szSetting,NULL,FW_SETTINGNAME|FW_REPLACED); } } else - DBFreeVariant(&dbv2); + db_free(&dbv2); mir_free(myreplace); @@ -465,27 +465,27 @@ int replaceModule(HWND hwnd, HANDLE hContact, const char *module, const char *fi switch (dbv.type) { case DBVT_BYTE: - DBWriteContactSettingByte(hContact, newModule, setting->name, dbv.bVal); + db_set_b(hContact, newModule, setting->name, dbv.bVal); break; case DBVT_WORD: - DBWriteContactSettingWord(hContact, newModule, setting->name, dbv.wVal); + db_set_w(hContact, newModule, setting->name, dbv.wVal); break; case DBVT_DWORD: - DBWriteContactSettingDword(hContact, newModule, setting->name, dbv.dVal); + db_set_dw(hContact, newModule, setting->name, dbv.dVal); break; case DBVT_ASCIIZ: - DBWriteContactSettingString(hContact, newModule, setting->name, dbv.pszVal); + db_set_s(hContact, newModule, setting->name, dbv.pszVal); break; case DBVT_UTF8: - DBWriteContactSettingStringUtf(hContact, newModule, setting->name, dbv.pszVal); + db_set_utf(hContact, newModule, setting->name, dbv.pszVal); break; case DBVT_BLOB: DBWriteContactSettingBlob(hContact, newModule, setting->name, dbv.pbVal, dbv.cpbVal); break; } - DBFreeVariant(&dbv); - DBDeleteContactSetting(hContact, module, setting->name); + db_free(&dbv); + db_unset(hContact, module, setting->name); } setting = (struct ModSetLinkLinkItem *)setting->next; @@ -645,7 +645,7 @@ void __cdecl FindSettings(LPVOID di) break; } - DBFreeVariant(&dbv); + db_free(&dbv); } } @@ -659,7 +659,7 @@ void __cdecl FindSettings(LPVOID di) if (!GetSetting(hContact,module->name,setting->name,&dbv)) { replaceCount += replaceSetting(hwnd, hContact, module->name, setting->name, &dbv, text, replace, mode); - DBFreeVariant(&dbv); + db_free(&dbv); } } else diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h index 2e8688d5b9..3789be8e32 100644 --- a/plugins/DbEditorPP/src/headers.h +++ b/plugins/DbEditorPP/src/headers.h @@ -61,7 +61,7 @@ int AddIconToList(HIMAGELIST hil, HICON hIcon); void AddProtoIconsToList(HIMAGELIST hil, int newshift); int GetProtoIcon(char *szProto); extern HANDLE hRestore; -extern HANDLE hUserMenu; +extern HGENMENU hUserMenu; ///////////////////// #ifndef NDEBUG diff --git a/plugins/DbEditorPP/src/knownmodules.cpp b/plugins/DbEditorPP/src/knownmodules.cpp index 13c4379f6b..4e44aa740c 100644 --- a/plugins/DbEditorPP/src/knownmodules.cpp +++ b/plugins/DbEditorPP/src/knownmodules.cpp @@ -60,7 +60,7 @@ void doOldKnownModulesList() setting = msll.first; while(setting) { - if (!DBGetContactSetting(NULL,"KnownModules",setting->name,&dbv) && dbv.type == DBVT_ASCIIZ) + if (!db_get(NULL,"KnownModules",setting->name,&dbv) && dbv.type == DBVT_ASCIIZ) { temp = (char*)mir_alloc((strlen(dbv.pszVal)+5)*sizeof(char)); if (!temp) break; @@ -75,10 +75,10 @@ void doOldKnownModulesList() } mir_free(temp); } - DBFreeVariant(&dbv); + db_free(&dbv); setting = (struct ModSetLinkLinkItem *)setting->next; } FreeModuleSettingLL(&msll); - UseKnownModList = DBGetContactSettingByte(NULL,modname,"UseKnownModList",0); + UseKnownModList = db_get_b(NULL,modname,"UseKnownModList",0); } diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index 7bc8b290fa..3c36401da3 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -8,9 +8,9 @@ BOOL usePopUps; HWND hwnd2watchedVarsWindow; int hLangpack; BYTE nameOrder[NAMEORDERCOUNT]; -HANDLE hUserMenu; -HANDLE hRestore; +HGENMENU hUserMenu; WatchListArrayStruct WatchListArray; +HANDLE hRestore; HANDLE sMenuCommand, sRegisterModule, sRegisterSingleModule, sImport, sServicemodeLaunch; HANDLE hModulesLoadedHook = NULL, hSettingsChangedHook=NULL, hOptInitHook=NULL, hPreShutdownHook=NULL; @@ -166,7 +166,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) ZeroMemory(&mi, sizeof(mi)); mi.cbSize = sizeof(mi); mi.position = 1900000001; - mi.flags = DBGetContactSettingByte(NULL,modname,"UserMenuItem",0)?0:CMIF_HIDDEN; + mi.flags = db_get_b(NULL,modname,"UserMenuItem",0) ? 0 : CMIF_HIDDEN; mi.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(ICO_REGUSER)); mi.pszName = LPGEN("Open user tree in DBE++"); mi.pszService = "DBEditorpp/MenuCommand"; @@ -187,10 +187,10 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) char mod[64] = ""; TCHAR szModuleFileName[MAX_PATH]; int i=0, len; - if (!DBGetContactSetting(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) + if (!db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) mods = dbv.pszVal; else { - DBWriteContactSettingString(NULL,modname,"CoreModules",coreMods); + db_set_s(NULL,modname,"CoreModules",coreMods); mods = coreMods; } @@ -218,18 +218,18 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) if (GetModuleFileName(hInst, szModuleFileName, MAX_PATH)) addIcons(szModuleFileName); - DBFreeVariant(&dbv); + db_free(&dbv); UnhookEvent(hModulesLoadedHook); - usePopUps = DBGetContactSettingByte(NULL,modname,"UsePopUps",0); + usePopUps = db_get_b(NULL,modname,"UsePopUps",0); // Load the name order for(i=0; i < NAMEORDERCOUNT; i++) nameOrder[i] = i; - if (!DBGetContactSetting(NULL,"Contact","NameOrder",&dbv)) { + if (!db_get(NULL,"Contact","NameOrder",&dbv)) { CopyMemory(nameOrder,dbv.pbVal,dbv.cpbVal); - DBFreeVariant(&dbv); + db_free(&dbv); } HookEvent(ME_TTB_MODULELOADED, OnTTBLoaded); @@ -311,21 +311,21 @@ extern "C" __declspec(dllexport) int Unload(void) //======================================================= -//DBGetContactSettingString (prob shouldnt use this unless u know how big the string is gonna be..) +//db_get_s (prob shouldnt use this unless u know how big the string is gonna be..) //======================================================= int DBGetContactSettingStringStatic(HANDLE hContact, char* szModule, char* szSetting, char* value, int maxLength) { DBVARIANT dbv; - if (!DBGetContactSetting(hContact, szModule, szSetting, &dbv)) + if (!db_get(hContact, szModule, szSetting, &dbv)) { strncpy(value, dbv.pszVal, maxLength); - DBFreeVariant(&dbv); + db_free(&dbv); return 1; } else { - DBFreeVariant(&dbv); + db_free(&dbv); return 0; } @@ -407,7 +407,7 @@ int GetValue(HANDLE hContact, const char* szModule, const char* szSetting, char* break; } - DBFreeVariant(&dbv); + db_free(&dbv); Value[length-1] = 0; return 1; @@ -457,7 +457,7 @@ int GetValueW(HANDLE hContact, const char* szModule, const char* szSetting, WCHA break; } - DBFreeVariant(&dbv); + db_free(&dbv); Value[length-1] = 0; return 1; diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp index 814361037d..64b2534f94 100644 --- a/plugins/DbEditorPP/src/main_window.cpp +++ b/plugins/DbEditorPP/src/main_window.cpp @@ -122,7 +122,7 @@ LRESULT CALLBACK ModuleTreeSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM } } else if ((mtis->type == CONTACT) && hContact) { - if (DBGetContactSettingByte(NULL,"CList", "ConfirmDelete",1)) { + if (db_get_b(NULL,"CList", "ConfirmDelete",1)) { char msg[1024]; mir_snprintf(msg, SIZEOF(msg), Translate("Are you sure you want to delete contact \"%s\"?"), module); if (MessageBox(0,msg, Translate("Confirm Contact Delete"), MB_YESNO|MB_ICONEXCLAMATION) == IDNO) @@ -199,7 +199,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,(LPARAM)DBGetContactSettingWord(NULL, modname, "Splitter", 300)); + SetWindowLongPtr(GetDlgItem(hwnd,IDC_SPLITTER),GWLP_USERDATA,(LPARAM)db_get_w(NULL, modname, "Splitter", 300)); SendMessage(hwnd, GC_SPLITTERMOVED, 0,0); mir_subclassWindow(GetDlgItem(hwnd,IDC_SPLITTER), SplitterSubclassProc); // module tree @@ -215,8 +215,8 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) TranslateMenu(GetSubMenu(hMenu,i)); // move the dialog to the users position - MoveWindow(hwnd,DBGetContactSettingDword(NULL,modname,"x",0),DBGetContactSettingDword(NULL,modname,"y",0),DBGetContactSettingDword(NULL,modname,"width",500),DBGetContactSettingDword(NULL,modname,"height",250),0); - if (DBGetContactSettingByte(NULL,modname,"Maximised",0)) { + MoveWindow(hwnd,db_get_dw(NULL,modname,"x",0),db_get_dw(NULL,modname,"y",0),db_get_dw(NULL,modname,"width",500),db_get_dw(NULL,modname,"height",250),0); + if (db_get_b(NULL,modname,"Maximised",0)) { WINDOWPLACEMENT wp; wp.length = sizeof(WINDOWPLACEMENT); wp.flags = WPF_RESTORETOMAXIMIZED; @@ -229,14 +229,14 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) Mode = MODE_ALL; CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_ALL,MF_BYCOMMAND|MF_CHECKED); - Hex = DBGetContactSettingByte(NULL,modname,"HexMode",0); + Hex = db_get_b(NULL,modname,"HexMode",0); CheckMenuItem(GetSubMenu(hMenu,5),MENU_BYTE_HEX,MF_BYCOMMAND|((Hex & HEX_BYTE)?MF_CHECKED:MF_UNCHECKED)); CheckMenuItem(GetSubMenu(hMenu,5),MENU_WORD_HEX,MF_BYCOMMAND|((Hex & HEX_WORD)?MF_CHECKED:MF_UNCHECKED)); CheckMenuItem(GetSubMenu(hMenu,5),MENU_DWORD_HEX,MF_BYCOMMAND|((Hex & HEX_DWORD)?MF_CHECKED:MF_UNCHECKED)); - CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SAVE_POSITION,MF_BYCOMMAND|(DBGetContactSettingByte(NULL,modname,"RestoreOnOpen",1)?MF_CHECKED:MF_UNCHECKED)); + CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SAVE_POSITION,MF_BYCOMMAND|(db_get_b(NULL,modname,"RestoreOnOpen",1)?MF_CHECKED:MF_UNCHECKED)); - Order = DBGetContactSettingByte(NULL,modname,"SortMode",1); + Order = db_get_b(NULL,modname,"SortMode",1); CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SORT_ORDER,MF_BYCOMMAND|(Order?MF_CHECKED:MF_UNCHECKED)); // image list @@ -298,7 +298,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) int restore; if (hRestore) restore = 3; - else if (DBGetContactSettingByte(NULL,modname,"RestoreOnOpen",1)) + else if (db_get_b(NULL,modname,"RestoreOnOpen",1)) restore = 2; else restore = 0; @@ -327,7 +327,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (splitterPos<65) splitterPos=65; if (splitterPos > rc2.right-rc2.left-65) splitterPos=rc2.right-rc2.left-65; SetWindowLongPtr(GetDlgItem(hwnd,IDC_SPLITTER),GWLP_USERDATA, splitterPos); - DBWriteContactSettingWord(NULL, modname, "Splitter",(WORD)splitterPos); + db_set_w(NULL, modname, "Splitter",(WORD)splitterPos); } PostMessage(hwnd,WM_SIZE,0,0); } @@ -359,14 +359,14 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) CallService(MS_UTILS_RESIZEDIALOG,0,(LPARAM)&urd); if (msg == WM_SIZE && wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED) - DBWriteContactSettingByte(NULL,modname,"Maximised",1); + db_set_b(NULL,modname,"Maximised",1); else if (msg == WM_SIZE && wParam == SIZE_RESTORED) - DBWriteContactSettingByte(NULL,modname,"Maximised",0); + db_set_b(NULL,modname,"Maximised",0); } break; case WM_DESTROY: // free our shit! - if (DBGetContactSettingByte(NULL,modname,"RestoreOnOpen",1)) { + if (db_get_b(NULL,modname,"RestoreOnOpen",1)) { HTREEITEM item; HWND hwnd2Tree = GetDlgItem(hwnd,IDC_MODULES); char module[256] = {0}; @@ -385,16 +385,16 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) type = mtis->type; } - DBWriteContactSettingDword(NULL,modname,"LastContact",(DWORD)hContact); + db_set_dw(NULL,modname,"LastContact",(DWORD)hContact); if (type == CONTACT) - DBWriteContactSettingString(NULL,modname,"LastModule",""); + db_set_s(NULL,modname,"LastModule",""); else - DBWriteContactSettingString(NULL,modname,"LastModule",module); + db_set_s(NULL,modname,"LastModule",module); } else { - DBDeleteContactSetting(NULL,modname,"LastContact"); - DBDeleteContactSetting(NULL,modname,"LastModule"); + db_unset(NULL,modname,"LastContact"); + db_unset(NULL,modname,"LastModule"); } HWND hwnd2Settings = GetDlgItem(hwnd, IDC_SETTINGS); @@ -403,13 +403,13 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (pos != -1) { char text[256]; ListView_GetItemText(hwnd2Settings, pos, 0, text, SIZEOF(text)); - DBWriteContactSettingString(NULL,modname,"LastSetting",text); + db_set_s(NULL,modname,"LastSetting",text); } - else DBDeleteContactSetting(NULL,modname,"LastSetting"); + else db_unset(NULL,modname,"LastSetting"); } } - DBWriteContactSettingByte(NULL,modname,"HexMode",(byte)Hex); - DBWriteContactSettingByte(NULL,modname,"SortMode",(byte)Order); + db_set_b(NULL,modname,"HexMode",(byte)Hex); + db_set_b(NULL,modname,"SortMode",(byte)Order); saveListSettings(GetDlgItem(hwnd,IDC_SETTINGS)); hwnd2mainWindow = 0; ClearListview(GetDlgItem(hwnd,IDC_SETTINGS)); @@ -419,13 +419,13 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if (himl2) ImageList_Destroy(himl2); - if (!DBGetContactSettingByte(NULL,modname,"Maximised",0)) { + if (!db_get_b(NULL,modname,"Maximised",0)) { RECT rc; GetWindowRect(hwnd,&rc); - DBWriteContactSettingDword(NULL,modname,"x",rc.left); - DBWriteContactSettingDword(NULL,modname,"y",rc.top); - DBWriteContactSettingDword(NULL,modname,"width",rc.right-rc.left); - DBWriteContactSettingDword(NULL,modname,"height",rc.bottom-rc.top); + db_set_dw(NULL,modname,"x",rc.left); + db_set_dw(NULL,modname,"y",rc.top); + db_set_dw(NULL,modname,"width",rc.right-rc.left); + db_set_dw(NULL,modname,"height",rc.bottom-rc.top); } if (hwnd2importWindow) { @@ -543,9 +543,9 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) break; case MENU_SAVE_POSITION: { - BOOL save = !DBGetContactSettingByte(NULL,modname,"RestoreOnOpen",1); + BOOL save = !db_get_b(NULL,modname,"RestoreOnOpen",1); CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SAVE_POSITION,MF_BYCOMMAND|(save?MF_CHECKED:MF_UNCHECKED)); - DBWriteContactSettingByte(NULL,modname,"RestoreOnOpen", (byte)save); + db_set_b(NULL,modname,"RestoreOnOpen", (byte)save); } break; case MENU_SORT_ORDER: diff --git a/plugins/DbEditorPP/src/modules.cpp b/plugins/DbEditorPP/src/modules.cpp index 2e650b2fe4..faeae05035 100644 --- a/plugins/DbEditorPP/src/modules.cpp +++ b/plugins/DbEditorPP/src/modules.cpp @@ -17,28 +17,28 @@ void renameModule(char* oldName, char* newName, HANDLE hContact) switch (dbv.type) { case DBVT_BYTE: - DBWriteContactSettingByte(hContact, newName, setting->name, dbv.bVal); + db_set_b(hContact, newName, setting->name, dbv.bVal); break; case DBVT_WORD: - DBWriteContactSettingWord(hContact, newName, setting->name, dbv.wVal); + db_set_w(hContact, newName, setting->name, dbv.wVal); break; case DBVT_DWORD: - DBWriteContactSettingDword(hContact, newName, setting->name, dbv.dVal); + db_set_dw(hContact, newName, setting->name, dbv.dVal); break; case DBVT_ASCIIZ: - DBWriteContactSettingString(hContact, newName, setting->name, dbv.pszVal); + db_set_s(hContact, newName, setting->name, dbv.pszVal); break; case DBVT_UTF8: - DBWriteContactSettingStringUtf(hContact, newName, setting->name, dbv.pszVal); + db_set_utf(hContact, newName, setting->name, dbv.pszVal); break; case DBVT_BLOB: DBWriteContactSettingBlob(hContact, newName, setting->name, dbv.pbVal, dbv.cpbVal); break; } - DBDeleteContactSetting(hContact, oldName, setting->name); + db_unset(hContact, oldName, setting->name); } - DBFreeVariant(&dbv); + db_free(&dbv); setting = (struct ModSetLinkLinkItem *)setting->next; } FreeModuleSettingLL(&settinglist); @@ -65,16 +65,16 @@ INT_PTR CALLBACK AddModDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam { HANDLE hContact = db_find_first(); // null contact - DBWriteContactSettingByte(NULL, modulename, "(Default)", 0); + db_set_b(NULL, modulename, "(Default)", 0); while (hContact) { - DBWriteContactSettingByte(hContact, modulename, "(Default)", 0); + db_set_b(hContact, modulename, "(Default)", 0); hContact = db_find_next(hContact); } } else { - DBWriteContactSettingByte((HANDLE)GetWindowLongPtr(hwnd,GWLP_USERDATA), modulename, "(Default)", 0); + db_set_b((HANDLE)GetWindowLongPtr(hwnd,GWLP_USERDATA), modulename, "(Default)", 0); } refreshTree(1); } diff --git a/plugins/DbEditorPP/src/moduletree.cpp b/plugins/DbEditorPP/src/moduletree.cpp index ea520eacc2..4c6d4a0e47 100644 --- a/plugins/DbEditorPP/src/moduletree.cpp +++ b/plugins/DbEditorPP/src/moduletree.cpp @@ -379,7 +379,7 @@ void replaceTreeItem(HWND hwnd, HANDLE hContact, const char *module, const char void refreshTree(int restore) { - UseKnownModList = DBGetContactSettingByte(NULL,modname,"UseKnownModList",0); + UseKnownModList = db_get_b(NULL,modname,"UseKnownModList",0); if (populating) return; populating = 1; forkthread(PopulateModuleTreeThreadFunc,0,(HWND)restore); @@ -433,7 +433,7 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di) } case 2: // restore saved if (GetValue(NULL,modname,"LastModule",SelectedModule,SIZEOF(SelectedModule))) { - hSelectedContact = (HANDLE)DBGetContactSettingDword(NULL,modname,"LastContact",(DWORD)INVALID_HANDLE_VALUE); + hSelectedContact = (HANDLE)db_get_dw(NULL,modname,"LastContact",(DWORD)INVALID_HANDLE_VALUE); if (hSelectedContact != INVALID_HANDLE_VALUE) Select = 1; GetValue(NULL,modname,"LastSetting",SelectedSetting,SIZEOF(SelectedSetting)); @@ -527,7 +527,7 @@ void __cdecl PopulateModuleTreeThreadFunc(LPVOID di) module = (struct ModSetLinkLinkItem *)module->next; } - if (DBGetContactSettingByte(NULL,modname,"ExpandSettingsOnOpen",0)) + if (db_get_b(NULL,modname,"ExpandSettingsOnOpen",0)) TreeView_Expand(hwnd2Tree,contact,TVE_EXPAND); if (Select && hSelectedContact == NULL) @@ -902,14 +902,14 @@ void moduleListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here i else strncat(moduletemp,&module[i],1); } - if ( !DBGetContactSetting(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) { + if ( !db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) { int len = (int)strlen(dbv.pszVal) + 10 + (int)strlen(moduletemp); char* temp = (char*)_alloca(len); mir_snprintf(temp, len, "%s, %s", dbv.pszVal, moduletemp); - DBWriteContactSettingString(NULL,modname,"CoreModules",temp); - DBFreeVariant(&dbv); + db_set_s(NULL,modname,"CoreModules",temp); + db_free(&dbv); } - else DBWriteContactSettingString(NULL,modname,"CoreModules",moduletemp); + else db_set_s(NULL,modname,"CoreModules",moduletemp); RegisterSingleModule((WPARAM)module,0); } break; @@ -925,7 +925,7 @@ void moduleListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here i break; case MENU_DELETE_CONTACT: - if (DBGetContactSettingByte(NULL,"CList", "ConfirmDelete",1)) { + if (db_get_b(NULL,"CList", "ConfirmDelete",1)) { char msg[1024]; mir_snprintf(msg, SIZEOF(msg), Translate("Are you sure you want to delete contact \"%s\"?"), module); if (MessageBox(0,msg, Translate("Confirm Contact Delete"), MB_YESNO|MB_ICONEXCLAMATION) == IDYES) { diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp index ba822c7321..17d69981d6 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -9,17 +9,17 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { bInitDone = false; DBVARIANT dbv; - CheckDlgButton(hwnd,IDC_EXPANDSETTINGS,DBGetContactSettingByte(NULL,modname,"ExpandSettingsOnOpen",0)); - CheckDlgButton(hwnd,IDC_RESTORESETTINGS,DBGetContactSettingByte(NULL,modname,"RestoreOnOpen",1)); - CheckDlgButton(hwnd,IDC_USEKNOWNMODS,DBGetContactSettingByte(NULL,modname,"UseKnownModList",0)); - CheckDlgButton(hwnd,IDC_WARNONDEL,DBGetContactSettingByte(NULL,modname,"WarnOnDelete",1)); - CheckDlgButton(hwnd,IDC_MENU,DBGetContactSettingByte(NULL,modname,"UserMenuItem",0)); + CheckDlgButton(hwnd,IDC_EXPANDSETTINGS,db_get_b(NULL,modname,"ExpandSettingsOnOpen",0)); + CheckDlgButton(hwnd,IDC_RESTORESETTINGS,db_get_b(NULL,modname,"RestoreOnOpen",1)); + CheckDlgButton(hwnd,IDC_USEKNOWNMODS,db_get_b(NULL,modname,"UseKnownModList",0)); + CheckDlgButton(hwnd,IDC_WARNONDEL,db_get_b(NULL,modname,"WarnOnDelete",1)); + CheckDlgButton(hwnd,IDC_MENU,db_get_b(NULL,modname,"UserMenuItem",0)); CheckDlgButton(hwnd,IDC_POPUPS,usePopUps); - if (!DBGetContactSetting(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) + if (!db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) SetDlgItemText(hwnd,IDC_MODULES,dbv.pszVal); - DBFreeVariant(&dbv); - SetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,DBGetContactSettingWord(NULL,modname,"PopupDelay",4),0); - SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_SETCOLOUR, 0, (LPARAM)DBGetContactSettingDword(NULL,modname,"PopupColour",RGB(255,0,0))); + db_free(&dbv); + SetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,db_get_w(NULL,modname,"PopupDelay",4),0); + SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_SETCOLOUR, 0, (LPARAM)db_get_dw(NULL,modname,"PopupColour",RGB(255,0,0))); TranslateDialogDefault(hwnd); bInitDone = true; } @@ -52,25 +52,19 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case PSN_APPLY: { char mods[4096]; - DBWriteContactSettingByte(NULL,modname,"ExpandSettingsOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_EXPANDSETTINGS)); - DBWriteContactSettingByte(NULL,modname,"RestoreOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_RESTORESETTINGS)); - DBWriteContactSettingByte(NULL,modname,"WarnOnDelete",(BYTE)IsDlgButtonChecked(hwnd,IDC_WARNONDEL)); - DBWriteContactSettingByte(NULL,modname,"UserMenuItem",(BYTE)IsDlgButtonChecked(hwnd,IDC_MENU)); - DBWriteContactSettingByte(NULL,modname,"UseKnownModList",(BYTE)IsDlgButtonChecked(hwnd,IDC_USEKNOWNMODS)); + db_set_b(NULL,modname,"ExpandSettingsOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_EXPANDSETTINGS)); + db_set_b(NULL,modname,"RestoreOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_RESTORESETTINGS)); + db_set_b(NULL,modname,"WarnOnDelete",(BYTE)IsDlgButtonChecked(hwnd,IDC_WARNONDEL)); + db_set_b(NULL,modname,"UserMenuItem",(BYTE)IsDlgButtonChecked(hwnd,IDC_MENU)); + db_set_b(NULL,modname,"UseKnownModList",(BYTE)IsDlgButtonChecked(hwnd,IDC_USEKNOWNMODS)); usePopUps = IsDlgButtonChecked(hwnd,IDC_POPUPS); - DBWriteContactSettingByte(NULL,modname,"UsePopUps",(BYTE)usePopUps); + db_set_b(NULL,modname,"UsePopUps",(BYTE)usePopUps); if (GetDlgItemText(hwnd,IDC_MODULES,mods,4096)) - DBWriteContactSettingString(NULL,modname,"CoreModules",mods); - DBWriteContactSettingWord(NULL,modname,"PopupDelay",(WORD)GetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,NULL,0)); - DBWriteContactSettingDword(NULL,modname,"PopupColour",(DWORD)SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_GETCOLOUR, 0, 0)); + db_set_s(NULL,modname,"CoreModules",mods); + db_set_w(NULL,modname,"PopupDelay",(WORD)GetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,NULL,0)); + db_set_dw(NULL,modname,"PopupColour",(DWORD)SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_GETCOLOUR, 0, 0)); - CLISTMENUITEM mi = { sizeof(mi) }; - if (!IsDlgButtonChecked(hwnd,IDC_MENU)) - mi.flags = CMIM_FLAGS | CMIF_HIDDEN; - else - mi.flags = CMIM_FLAGS; - - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM) hUserMenu, (LPARAM) & mi); + Menu_ShowItem(hUserMenu, IsDlgButtonChecked(hwnd,IDC_MENU)); } return TRUE; } diff --git a/plugins/DbEditorPP/src/settinglist.cpp b/plugins/DbEditorPP/src/settinglist.cpp index 3afbc56629..816244d8ec 100644 --- a/plugins/DbEditorPP/src/settinglist.cpp +++ b/plugins/DbEditorPP/src/settinglist.cpp @@ -11,16 +11,16 @@ void setupSettingsList(HWND hwnd2List) sLC.mask = LVCF_FMT | LVCF_TEXT | LVCF_SUBITEM | LVCF_WIDTH; sLC.pszText = Translate("Name"); - sLC.cx = DBGetContactSettingWord(NULL, modname, "Column0width", 145); + sLC.cx = db_get_w(NULL, modname, "Column0width", 145); ListView_InsertColumn(hwnd2List,0,&sLC); sLC.pszText = Translate("Data"); - sLC.cx = DBGetContactSettingWord(NULL, modname, "Column1width", 145); + sLC.cx = db_get_w(NULL, modname, "Column1width", 145); ListView_InsertColumn(hwnd2List,1,&sLC); sLC.pszText = Translate("Type"); - sLC.cx = DBGetContactSettingWord(NULL, modname, "Column2width", 60); + sLC.cx = db_get_w(NULL, modname, "Column2width", 60); ListView_InsertColumn(hwnd2List,2,&sLC); sLC.pszText = Translate("Size"); - sLC.cx = DBGetContactSettingWord(NULL, modname, "Column3width", 80); + sLC.cx = db_get_w(NULL, modname, "Column3width", 80); ListView_InsertColumn(hwnd2List,3,&sLC); } @@ -37,7 +37,7 @@ void saveListSettings(HWND hwnd2List) if (ListView_GetColumn(hwnd2List,i,&sLC)) { mir_snprintf(tmp, SIZEOF(tmp), "Column%dwidth", i); - DBWriteContactSettingWord(NULL, modname, tmp, (WORD)sLC.cx); + db_set_w(NULL, modname, tmp, (WORD)sLC.cx); } } @@ -68,7 +68,7 @@ void DeleteSettingsFromList(HWND hSettings, HANDLE hContact, char *module, char else if (count == 1) { - DBDeleteContactSetting(hContact,module,setting); + db_unset(hContact,module,setting); } else { @@ -81,7 +81,7 @@ void DeleteSettingsFromList(HWND hSettings, HANDLE hContact, char *module, char if (ListView_GetItemState(hSettings,i,LVIS_SELECTED)) { ListView_GetItemText(hSettings, i, 0, text, SIZEOF(text)); - DBDeleteContactSetting(hContact,module,text); + db_unset(hContact,module,text); items--; } else @@ -224,7 +224,7 @@ void additem(HWND hwnd2Settings,HANDLE hContact, char* module, char* setting, in else ListView_DeleteItem(hwnd2Settings,index); - DBFreeVariant(&dbv); + db_free(&dbv); mir_free(data); } @@ -322,14 +322,14 @@ typedef struct { void writeStandardTextfromLabel(EditLabelInfoStruct* info, char* value, WCHAR *wc, int type) { if (type != DBVT_ASCIIZ && type != DBVT_UTF8) - DBDeleteContactSetting(info->hContact,info->module,info->setting); + db_unset(info->hContact,info->module,info->setting); if (type == DBVT_UTF8 && wc) { - DBWriteContactSettingWString(info->hContact,info->module,info->setting,wc); + db_set_ws(info->hContact,info->module,info->setting,wc); mir_free(wc); } else - DBWriteContactSettingString(info->hContact,info->module,info->setting,value); + db_set_s(info->hContact,info->module,info->setting,value); } @@ -389,32 +389,32 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w case 0:// setting name if (!mir_strcmp(info->setting,value) || mir_strlen(value)>255) { - DBFreeVariant(&dbv); + db_free(&dbv); SendMessage(hwnd,WM_COMMAND,MAKEWPARAM(IDCANCEL,0),0); return 0; } switch (dbv.type) { case DBVT_UTF8: - DBWriteContactSettingStringUtf(info->hContact,info->module,value,dbv.pszVal); + db_set_utf(info->hContact,info->module,value,dbv.pszVal); break; case DBVT_ASCIIZ: - DBWriteContactSettingString(info->hContact,info->module,value,dbv.pszVal); + db_set_s(info->hContact,info->module,value,dbv.pszVal); break; case DBVT_BYTE: - DBWriteContactSettingByte(info->hContact,info->module,value,dbv.bVal); + db_set_b(info->hContact,info->module,value,dbv.bVal); break; case DBVT_WORD: - DBWriteContactSettingWord(info->hContact,info->module,value,dbv.wVal); + db_set_w(info->hContact,info->module,value,dbv.wVal); break; case DBVT_DWORD: - DBWriteContactSettingDword(info->hContact,info->module,value,dbv.dVal); + db_set_dw(info->hContact,info->module,value,dbv.dVal); break; case DBVT_BLOB: DBWriteContactSettingBlob(info->hContact,info->module,value,dbv.pbVal,dbv.cpbVal); break; } - DBDeleteContactSetting(info->hContact,info->module,info->setting); + db_unset(info->hContact,info->module,info->setting); { LVFINDINFO lvfi; int item; @@ -448,9 +448,9 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w { val = atoi(&value[1]); if (dbv.type == DBVT_ASCIIZ || dbv.type == DBVT_UTF8) - DBDeleteContactSetting(info->hContact,info->module,info->setting); + db_unset(info->hContact,info->module,info->setting); - DBWriteContactSettingByte(info->hContact,info->module,info->setting,(BYTE)val); + db_set_b(info->hContact,info->module,info->setting,(BYTE)val); } else writeStandardTextfromLabel(info, value, wc, dbv.type); @@ -463,8 +463,8 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w { val = atoi(&value[1]); if (dbv.type == DBVT_ASCIIZ || dbv.type == DBVT_UTF8) - DBDeleteContactSetting(info->hContact,info->module,info->setting); - DBWriteContactSettingWord(info->hContact,info->module,info->setting,(WORD)val); + db_unset(info->hContact,info->module,info->setting); + db_set_w(info->hContact,info->module,info->setting,(WORD)val); } else writeStandardTextfromLabel(info, value, wc, dbv.type); @@ -477,8 +477,8 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w { val = atoi(&value[1]); if (dbv.type == DBVT_ASCIIZ || dbv.type == DBVT_UTF8) - DBDeleteContactSetting(info->hContact,info->module,info->setting); - DBWriteContactSettingDword(info->hContact,info->module,info->setting,val); + db_unset(info->hContact,info->module,info->setting); + db_set_dw(info->hContact,info->module,info->setting,val); } else writeStandardTextfromLabel(info, value, wc, dbv.type); @@ -498,13 +498,13 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w writeStandardTextfromLabel(info, value, wc, dbv.type); break; case DBVT_BYTE: - DBWriteContactSettingByte(info->hContact,info->module,info->setting,(BYTE)val); + db_set_b(info->hContact,info->module,info->setting,(BYTE)val); break; case DBVT_WORD: - DBWriteContactSettingWord(info->hContact,info->module,info->setting,(WORD)val); + db_set_w(info->hContact,info->module,info->setting,(WORD)val); break; case DBVT_DWORD: - DBWriteContactSettingDword(info->hContact,info->module,info->setting,(DWORD)val); + db_set_dw(info->hContact,info->module,info->setting,(DWORD)val); break; } } @@ -518,13 +518,13 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w writeStandardTextfromLabel(info, value, wc, dbv.type); break; case DBVT_BYTE: - DBWriteContactSettingByte(info->hContact,info->module,info->setting,(BYTE)val); + db_set_b(info->hContact,info->module,info->setting,(BYTE)val); break; case DBVT_WORD: - DBWriteContactSettingWord(info->hContact,info->module,info->setting,(WORD)val); + db_set_w(info->hContact,info->module,info->setting,(WORD)val); break; case DBVT_DWORD: - DBWriteContactSettingDword(info->hContact,info->module,info->setting,(DWORD)val); + db_set_dw(info->hContact,info->module,info->setting,(DWORD)val); break; } } @@ -563,13 +563,13 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w writeStandardTextfromLabel(info, value, wc, dbv.type); break; case DBVT_BYTE: - DBWriteContactSettingByte(info->hContact,info->module,info->setting,(BYTE)val); + db_set_b(info->hContact,info->module,info->setting,(BYTE)val); break; case DBVT_WORD: - DBWriteContactSettingWord(info->hContact,info->module,info->setting,(WORD)val); + db_set_w(info->hContact,info->module,info->setting,(WORD)val); break; case DBVT_DWORD: - DBWriteContactSettingDword(info->hContact,info->module,info->setting,(DWORD)val); + db_set_dw(info->hContact,info->module,info->setting,(DWORD)val); break; } break; @@ -580,7 +580,7 @@ static LRESULT CALLBACK SettingLabelEditSubClassProc(HWND hwnd,UINT msg,WPARAM w } break; // case 1: } - DBFreeVariant(&dbv); + db_free(&dbv); } // fall through case IDCANCEL: { @@ -706,7 +706,7 @@ void EditLabel(HWND hwnd2List, int item, int subitem) default: return; } - DBFreeVariant(&dbv); + db_free(&dbv); SettingLabelEditSubClass=(WNDPROC)SetWindowLongPtrW(info->hwnd2Edit,GWLP_WNDPROC,(LONG)SettingLabelEditSubClassProc); @@ -746,7 +746,7 @@ void SettingsListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam) LVHITTESTINFO hti; hti.pt=((NMLISTVIEW*)lParam)->ptAction; - if (DBGetContactSettingByte(NULL,modname,"DontAllowInLineEdit",0) || !IsWinVer2000Plus()) /* fix for TioDuke and win98 */ + if (db_get_b(NULL,modname,"DontAllowInLineEdit",0) || !IsWinVer2000Plus()) /* fix for TioDuke and win98 */ break; if (info && ListView_SubItemHitTest(GetDlgItem(hwnd,IDC_SETTINGS),&hti) >-1) { @@ -790,7 +790,7 @@ void SettingsListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam) hti.pt=((NMLISTVIEW*)lParam)->ptAction; if (info && ListView_SubItemHitTest(GetDlgItem(hwnd,IDC_SETTINGS),&hti) >-1) { - if ((hti.iSubItem > 1 || hti.flags == LVHT_ONITEMICON) || (DBGetContactSettingByte(NULL,modname,"DontAllowInLineEdit",0) || !IsWinVer2000Plus()/* fix for TioDuke and win98 */ )) + if ((hti.iSubItem > 1 || hti.flags == LVHT_ONITEMICON) || (db_get_b(NULL,modname,"DontAllowInLineEdit",0) || !IsWinVer2000Plus()/* fix for TioDuke and win98 */ )) { char setting[256]; SendMessage(info->hwnd2Edit,WM_COMMAND,MAKEWPARAM(IDOK,0),0); @@ -1093,7 +1093,7 @@ void SettingsListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here ///////////////////////// convert to submenu case MENU_VIEWDECRYPT: - if (!DBGetContactSetting(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { + if (!db_get(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { if (lstrcmpA(setting, "LoginPassword")) { char *text = mir_strdup(dbv.pszVal); CallService(MS_DB_CRYPT_DECODESTRING, (WPARAM)lstrlenA(dbv.pszVal)+1, (LPARAM)text); @@ -1113,38 +1113,38 @@ void SettingsListRightClick(HWND hwnd, WPARAM wParam,LPARAM lParam) // hwnd here mir_free(res); mir_free(str); } - DBFreeVariant(&dbv); + db_free(&dbv); } break; case MENU_VIEWENCRYPT: - if (!DBGetContactSetting(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { + if (!db_get(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { char *text = mir_tstrdup(dbv.pszVal); CallService(MS_DB_CRYPT_ENCODESTRING, (WPARAM)strlen(dbv.pszVal)+1, (LPARAM)text); msg(text, Translate("Encoded string..")); mir_free(text); } - DBFreeVariant(&dbv); + db_free(&dbv); break; case MENU_DECRYPT: - if (!DBGetContactSetting(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { + if (!db_get(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { char *text = mir_tstrdup(dbv.pszVal); CallService(MS_DB_CRYPT_DECODESTRING, (WPARAM)strlen(dbv.pszVal)+1, (LPARAM)text); - DBWriteContactSettingString(hContact,module,setting,text); + db_set_s(hContact,module,setting,text); mir_free(text); } - DBFreeVariant(&dbv); + db_free(&dbv); break; case MENU_ENCRYPT: - if (!DBGetContactSetting(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { + if (!db_get(hContact,module,setting,&dbv) && dbv.type == DBVT_ASCIIZ) { char *text = mir_tstrdup(dbv.pszVal); CallService(MS_DB_CRYPT_ENCODESTRING, (WPARAM)strlen(dbv.pszVal)+1, (LPARAM)text); - DBWriteContactSettingString(hContact,module,setting,text); + db_set_s(hContact,module,setting,text); mir_free(text); } - DBFreeVariant(&dbv); + db_free(&dbv); break; ///////////////////////// divider diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp index 66aef8654e..865029c358 100644 --- a/plugins/DbEditorPP/src/watchedvars.cpp +++ b/plugins/DbEditorPP/src/watchedvars.cpp @@ -8,7 +8,7 @@ int addSettingToWatchList(HANDLE hContact, char* module, char* setting) WatchListArray.item = (struct DBsetting*)mir_realloc(WatchListArray.item, sizeof(struct DBsetting)*WatchListArray.size); } if (!WatchListArray.item) return 0; - if (setting && DBGetContactSetting(hContact,module, setting, &(WatchListArray.item[WatchListArray.count].dbv))) return 0; + if (setting && db_get(hContact,module, setting, &(WatchListArray.item[WatchListArray.count].dbv))) return 0; WatchListArray.item[WatchListArray.count].hContact = hContact; WatchListArray.item[WatchListArray.count].module = mir_tstrdup(module); if (setting) WatchListArray.item[WatchListArray.count].setting = mir_tstrdup(setting); @@ -25,7 +25,7 @@ void freeWatchListItem(int item) WatchListArray.item[item].module = 0; if (WatchListArray.item[item].setting) mir_free(WatchListArray.item[item].setting); WatchListArray.item[item].setting = 0; - DBFreeVariant(&(WatchListArray.item[item].dbv)); + db_free(&(WatchListArray.item[item].dbv)); WatchListArray.item[item].hContact = 0; } @@ -64,7 +64,7 @@ void addwatchtolist(HWND hwnd2list, struct DBsetting *lParam) FreeModuleSettingLL(&settinglist); return; } - DBFreeVariant(&(lParam->dbv)); + db_free(&(lParam->dbv)); if (GetSetting(hContact, module, setting, &(lParam->dbv))) return; if (!hContact) @@ -287,9 +287,9 @@ void popupWatchedVar(HANDLE hContact,const char* module,const char* setting) HICON hIcon = LoadIcon(hInst, MAKEINTRESOURCE(ICO_REGEDIT)); char lpzContactName[MAX_CONTACTNAME]; char lpzText[MAX_SECONDLINE]; - COLORREF colorBack = DBGetContactSettingDword(NULL,modname,"PopupColour",RGB(255,0,0)); + COLORREF colorBack = db_get_dw(NULL,modname,"PopupColour",RGB(255,0,0)); COLORREF colorText = RGB(0,0,0); - int timeout = DBGetContactSettingByte(NULL,modname,"PopupDelay",3); + int timeout = db_get_b(NULL,modname,"PopupDelay",3); if (hContact) { // contacts nick @@ -326,7 +326,7 @@ void popupWatchedVar(HANDLE hContact,const char* module,const char* setting) return; } - DBFreeVariant(&dbv); + db_free(&dbv); POPUPDATA ppd = { 0 }; ppd.lchContact = (HANDLE)hContact; diff --git a/plugins/Db_autobackups/src/backup.cpp b/plugins/Db_autobackups/src/backup.cpp index 1922212386..2a2495b62b 100644 --- a/plugins/Db_autobackups/src/backup.cpp +++ b/plugins/Db_autobackups/src/backup.cpp @@ -171,7 +171,7 @@ int Backup(TCHAR* backup_filename) { SendMessage(progress_dialog, PBM_SETPOS, (WPARAM)(int)(100), 0); UpdateWindow(progress_dialog); - DBWriteContactSettingDword(0, "AutoBackups", "LastBackupTimestamp", (DWORD)time(0)); + db_set_dw(0, "AutoBackups", "LastBackupTimestamp", (DWORD)time(0)); if (!options.disable_popups) { size_t dest_file_len = lstrlen(dest_file); @@ -204,7 +204,7 @@ int Backup(TCHAR* backup_filename) VOID CALLBACK TimerProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) { time_t t = time(NULL); - time_t diff = t - (time_t)DBGetContactSettingDword(0, "AutoBackups", "LastBackupTimestamp", (DWORD)t); + time_t diff = t - (time_t)db_get_dw(0, "AutoBackups", "LastBackupTimestamp", (DWORD)t); if(diff > (time_t)(options.period * (options.period_type == PT_MINUTES ? 60 : (options.period_type == PT_HOURS ? 60 * 60 : 60 * 60 * 24 )))) mir_forkthread(BackupThread, NULL); } diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp index da944bc205..839aacc582 100644 --- a/plugins/Db_autobackups/src/options.cpp +++ b/plugins/Db_autobackups/src/options.cpp @@ -4,14 +4,14 @@ Options options; int LoadOptions(void) { - options.backup_types = (BackupType)DBGetContactSettingByte(0, "AutoBackups", "BackupType", (BYTE)(BT_PERIODIC)); - options.period = (unsigned int)DBGetContactSettingWord(0, "AutoBackups", "Period", 1); - options.period_type = (PeriodType)DBGetContactSettingByte(0, "AutoBackups", "PeriodType", (BYTE)PT_DAYS); + options.backup_types = (BackupType)db_get_b(0, "AutoBackups", "BackupType", (BYTE)(BT_PERIODIC)); + options.period = (unsigned int)db_get_w(0, "AutoBackups", "Period", 1); + options.period_type = (PeriodType)db_get_b(0, "AutoBackups", "PeriodType", (BYTE)PT_DAYS); if (!ServiceExists(MS_FOLDERS_GET_PATH)) { DBVARIANT dbv; - if (!DBGetContactSettingTString(0, "AutoBackups", "Folder", &dbv)) { + if (!db_get_ts(0, "AutoBackups", "Folder", &dbv)) { TCHAR *tmp = Utils_ReplaceVarsT(dbv.ptszVal); if(_tcslen(tmp) >= 2 && tmp[1] == ':') @@ -19,15 +19,15 @@ int LoadOptions(void) else mir_sntprintf(options.folder, MAX_PATH, _T("%s\\%s"), profilePath, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); mir_free(tmp); } else mir_sntprintf(options.folder, MAX_PATH, _T("%s%s"), DIR, SUB_DIR); } - options.num_backups = (unsigned int)DBGetContactSettingWord(0, "AutoBackups", "NumBackups", 3); + options.num_backups = (unsigned int)db_get_w(0, "AutoBackups", "NumBackups", 3); - options.disable_progress = (BOOL)DBGetContactSettingByte(0, "AutoBackups", "NoProgress", 0); - options.disable_popups = (BOOL)DBGetContactSettingByte(0, "AutoBackups", "NoPopups", 0); + options.disable_progress = (BOOL)db_get_b(0, "AutoBackups", "NoProgress", 0); + options.disable_popups = (BOOL)db_get_b(0, "AutoBackups", "NoPopups", 0); SetBackupTimer(); return 0; @@ -37,19 +37,19 @@ int SaveOptions(void) { TCHAR prof_dir[MAX_PATH]; - DBWriteContactSettingByte(0, "AutoBackups", "BackupType", (BYTE)options.backup_types); + db_set_b(0, "AutoBackups", "BackupType", (BYTE)options.backup_types); if (options.period < 1) options.period = 1; - DBWriteContactSettingWord(0, "AutoBackups", "Period", (WORD)options.period); - DBWriteContactSettingByte(0, "AutoBackups", "PeriodType", (BYTE)options.period_type); + db_set_w(0, "AutoBackups", "Period", (WORD)options.period); + db_set_b(0, "AutoBackups", "PeriodType", (BYTE)options.period_type); mir_sntprintf(prof_dir, MAX_PATH, _T("%s\\"), profilePath); size_t prof_len = _tcslen(prof_dir); size_t opt_len = _tcslen(options.folder); if(opt_len > prof_len && _tcsncmp(options.folder, prof_dir, prof_len) == 0) { - DBWriteContactSettingTString(0, "AutoBackups", "Folder", (options.folder + prof_len)); + db_set_ts(0, "AutoBackups", "Folder", (options.folder + prof_len)); } else - DBWriteContactSettingTString(0, "AutoBackups", "Folder", options.folder); + db_set_ts(0, "AutoBackups", "Folder", options.folder); TCHAR *tmp = Utils_ReplaceVarsT(options.folder); if(_tcslen(tmp) < 2 || tmp[1] != ':') @@ -59,9 +59,9 @@ int SaveOptions(void) mir_free(buf); } mir_free(tmp); - DBWriteContactSettingWord(0, "AutoBackups", "NumBackups", (WORD)options.num_backups); - DBWriteContactSettingByte(0, "AutoBackups", "NoProgress", (BYTE)options.disable_progress); - DBWriteContactSettingByte(0, "AutoBackups", "NoPopups", (BYTE)options.disable_popups); + db_set_w(0, "AutoBackups", "NumBackups", (WORD)options.num_backups); + db_set_b(0, "AutoBackups", "NoProgress", (BYTE)options.disable_progress); + db_set_b(0, "AutoBackups", "NoPopups", (BYTE)options.disable_popups); SetBackupTimer(); return 0; diff --git a/plugins/FTPFileYM/src/ftpfile.cpp b/plugins/FTPFileYM/src/ftpfile.cpp index 55e8022a39..d0747f234b 100644 --- a/plugins/FTPFileYM/src/ftpfile.cpp +++ b/plugins/FTPFileYM/src/ftpfile.cpp @@ -216,49 +216,21 @@ int PrebuildContactMenu(WPARAM wParam, LPARAM lParam) bool bHideRoot = opt.bHideInactive; for (int i = 0; i < ServerList::FTP_COUNT; i++) - { if (ftpList[i]->bEnabled) bHideRoot = false; - } - - CLISTMENUITEM mi = { sizeof(mi) }; - mi.flags = CMIM_FLAGS; if (opt.bUseSubmenu) - { - if (!bIsContact || bHideRoot) mi.flags |= CMIF_HIDDEN; - else mi.flags &= ~CMIF_HIDDEN; - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenu, (LPARAM)&mi); - } + Menu_ShowItem(hMenu, bIsContact && !bHideRoot); for (int i = 0; i < ServerList::FTP_COUNT; i++) - { - mi.flags = CMIM_FLAGS; - if (!bIsContact) - { - mi.flags |= CMIF_HIDDEN; - } - else if (!ftpList[i]->bEnabled) - { - mi.flags |= opt.bHideInactive ? CMIF_HIDDEN : CMIF_GRAYED; - } - - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hSubMenu[i], (LPARAM)&mi); - } - + Menu_ShowItem(hSubMenu[i], bIsContact && ftpList[i]->bEnabled); return 0; } void PrebuildMainMenu() { - CLISTMENUITEM mi = { sizeof(mi) }; - for (int i=0; i < ServerList::FTP_COUNT; i++) { - mi.flags = CMIM_FLAGS; - if (!ftpList[i]->bEnabled) - mi.flags |= opt.bHideInactive ? CMIF_HIDDEN : CMIF_GRAYED; - - CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hMainSubMenu[i], (LPARAM)&mi); - } + for (int i=0; i < ServerList::FTP_COUNT; i++) + Menu_ShowItem(hMainSubMenu[i], ftpList[i]->bEnabled); } int TabsrmmButtonPressed(WPARAM wParam, LPARAM lParam) diff --git a/plugins/FTPFileYM/src/mir_db.cpp b/plugins/FTPFileYM/src/mir_db.cpp index 254734c8db..63e85cc056 100644 --- a/plugins/FTPFileYM/src/mir_db.cpp +++ b/plugins/FTPFileYM/src/mir_db.cpp @@ -85,10 +85,10 @@ int DB::getDwordF(HANDLE hContact, char *szModule, char *szSetting, int id, int int DB::getAString(HANDLE hContact, char *szModule, char *szSetting, char *buff) { DBVARIANT dbv; - if (!DBGetContactSettingString(hContact, szModule, szSetting, &dbv)) + if (!db_get_s(hContact, szModule, szSetting, &dbv)) { strcpy(buff, dbv.pszVal); - DBFreeVariant(&dbv); + db_free(&dbv); return 0; } @@ -106,10 +106,10 @@ int DB::getAStringF(HANDLE hContact, char *szModule, char *szSetting, int id, ch int DB::getString(HANDLE hContact, char *szModule, char *szSetting, TCHAR *buff) { DBVARIANT dbv; - if (!DBGetContactSettingTString(hContact, szModule, szSetting, &dbv)) + if (!db_get_ts(hContact, szModule, szSetting, &dbv)) { _tcscpy(buff, dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); return 0; } diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h index dc2dd610e9..40f44b6e6d 100644 --- a/plugins/FavContacts/src/favlist.h +++ b/plugins/FavContacts/src/favlist.h @@ -20,10 +20,10 @@ public: this->bManual = bManual; this->fRate = fRate; name = mir_tstrdup((TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR)); - if (g_Options.bUseGroups && !DBGetContactSettingTString(hContact, "CList", "Group", &dbv)) + if (g_Options.bUseGroups && !db_get_ts(hContact, "CList", "Group", &dbv)) { group = mir_tstrdup(dbv.ptszVal); - DBFreeVariant(&dbv); + db_free(&dbv); } else if (g_Options.bUseGroups) { @@ -32,7 +32,7 @@ public: { group = mir_tstrdup(TranslateT("Favourite Contacts")); } - status = DBGetContactSettingWord(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); + status = db_get_w(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); } ~TContactInfo() @@ -105,7 +105,7 @@ public: HANDLE hContact = db_find_first(); for ( ; hContact; hContact = db_find_next(hContact)) - if (DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)) + if (db_get_b(hContact, "FavContacts", "IsFavourite", 0)) { TCHAR *group = addContact(hContact, true)->getGroup(); if (prevGroup && lstrcmp(prevGroup, group)) @@ -118,7 +118,7 @@ public: { hContact = g_contactCache->get(i); if (!hContact) break; - if (!DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)) + if (!db_get_b(hContact, "FavContacts", "IsFavourite", 0)) { TCHAR *group = addContact(hContact, false)->getGroup(); if (prevGroup && lstrcmp(prevGroup, group)) diff --git a/plugins/FavContacts/src/http_api.cpp b/plugins/FavContacts/src/http_api.cpp index c4929e6c3c..0806cddcd9 100644 --- a/plugins/FavContacts/src/http_api.cpp +++ b/plugins/FavContacts/src/http_api.cpp @@ -70,7 +70,7 @@ public: HANDLE hContact = favList[i]->getHandle(); TCHAR *name = (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, GCDNF_TCHAR); AVATARCACHEENTRY *avatar = (AVATARCACHEENTRY *)CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0); - int status = DBGetContactSettingWord(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); + int status = db_get_w(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE); Send("SetContact("); Send(i); diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp index 878b7d01bd..7e065d60fd 100644 --- a/plugins/FavContacts/src/main.cpp +++ b/plugins/FavContacts/src/main.cpp @@ -233,7 +233,7 @@ int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam) if (ServiceExists(MS_AV_GETAVATARBITMAP)) { HANDLE hContact = db_find_first(); for ( ; hContact; hContact = db_find_next(hContact)) - if (DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)) + if (db_get_b(hContact, "FavContacts", "IsFavourite", 0)) CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0); } @@ -322,36 +322,36 @@ extern "C" __declspec(dllexport) int Unload(void) static void sttLoadOptions() { - g_Options.bSecondLine = DBGetContactSettingByte(NULL, "FavContacts", "SecondLine", 1); - g_Options.bAvatars = DBGetContactSettingByte(NULL, "FavContacts", "Avatars", 1); - g_Options.bAvatarBorder = DBGetContactSettingByte(NULL, "FavContacts", "AvatarBorder", 0); - g_Options.wAvatarRadius = DBGetContactSettingWord(NULL, "FavContacts", "AvatarRadius", 3); - g_Options.bNoTransparentBorder = DBGetContactSettingByte(NULL, "FavContacts", "NoTransparentBorder", - !DBGetContactSettingByte(NULL, "FavContacts", "AvatarBorderTransparent", 1)); - g_Options.bSysColors = DBGetContactSettingByte(NULL, "FavContacts", "SysColors", 0); - g_Options.bCenterHotkey = DBGetContactSettingByte(NULL, "FavContacts", "CenterHotkey", 1); - g_Options.bUseGroups = DBGetContactSettingByte(NULL, "FavContacts", "UseGroups", 0); - g_Options.bUseColumns = DBGetContactSettingByte(NULL, "FavContacts", "UseColumns", 1); - g_Options.bRightAvatars = DBGetContactSettingByte(NULL, "FavContacts", "RightAvatars", 0); - g_Options.bDimIdle = DBGetContactSettingByte(NULL, "FavContacts", "DimIdle", 1); - - g_Options.wMaxRecent = DBGetContactSettingByte(NULL, "FavContacts", "MaxRecent", 10); + 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); } static void sttSaveOptions() { - DBWriteContactSettingByte(NULL, "FavContacts", "SecondLine", g_Options.bSecondLine); - DBWriteContactSettingByte(NULL, "FavContacts", "Avatars", g_Options.bAvatars); - DBWriteContactSettingByte(NULL, "FavContacts", "AvatarBorder", g_Options.bAvatarBorder); - DBWriteContactSettingWord(NULL, "FavContacts", "AvatarRadius", g_Options.wAvatarRadius); - DBWriteContactSettingByte(NULL, "FavContacts", "NoTransparentBorder", g_Options.bNoTransparentBorder); - DBWriteContactSettingByte(NULL, "FavContacts", "SysColors", g_Options.bSysColors); - DBWriteContactSettingByte(NULL, "FavContacts", "CenterHotkey", g_Options.bCenterHotkey); - DBWriteContactSettingByte(NULL, "FavContacts", "UseGroups", g_Options.bUseGroups); - DBWriteContactSettingByte(NULL, "FavContacts", "UseColumns", g_Options.bUseColumns); - DBWriteContactSettingByte(NULL, "FavContacts", "RightAvatars", g_Options.bRightAvatars); - DBWriteContactSettingByte(NULL, "FavContacts", "DimIdle", g_Options.bDimIdle); - DBWriteContactSettingWord(NULL, "FavContacts", "MaxRecent", g_Options.wMaxRecent); + 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); } static bool sttIsGroup(int id) @@ -361,9 +361,9 @@ static bool sttIsGroup(int id) DBVARIANT dbv = {0}; char buf[32]; wsprintfA(buf, "%d", (int)(id-2)); - if (!DBGetContactSettingTString(NULL, "CListGroups", buf, &dbv)) + if (!db_get_ts(NULL, "CListGroups", buf, &dbv)) { - DBFreeVariant(&dbv); + db_free(&dbv); return true; } return false; @@ -381,10 +381,10 @@ static TCHAR *sttGetGroupName(int id) DBVARIANT dbv = {0}; char buf[32]; wsprintfA(buf, "%d", (int)(id-2)); - if (!DBGetContactSettingTString(NULL, "CListGroups", buf, &dbv)) + if (!db_get_ts(NULL, "CListGroups", buf, &dbv)) { TCHAR *res = mir_tstrdup(dbv.ptszVal+1); - DBFreeVariant(&dbv); + db_free(&dbv); return res; } return NULL; @@ -397,15 +397,15 @@ static int sttGetGroupId(TCHAR *name) DBVARIANT dbv = {0}; char buf[32]; wsprintfA(buf, "%d", (int)i); - if (!DBGetContactSettingTString(NULL, "CListGroups", buf, &dbv)) + if (!db_get_ts(NULL, "CListGroups", buf, &dbv)) { if (!lstrcmp(dbv.ptszVal+1, name)) { - DBFreeVariant(&dbv); + db_free(&dbv); return i+2; } - DBFreeVariant(&dbv); + db_free(&dbv); } else { // default is root @@ -459,10 +459,10 @@ static BOOL sttMeasureItem_Contact(LPMEASUREITEMSTRUCT lpmis, Options *options) DBVARIANT dbv; TCHAR *title; bool bFree = false; - if (DBGetContactSettingTString(hContact, "CList", "StatusMsg", &dbv) || !*dbv.ptszVal) + if (db_get_ts(hContact, "CList", "StatusMsg", &dbv) || !*dbv.ptszVal) { char *proto = GetContactProto(hContact); - int status = DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE); + int status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE); title = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, GSMDF_TCHAR); } else { @@ -472,7 +472,7 @@ static BOOL sttMeasureItem_Contact(LPMEASUREITEMSTRUCT lpmis, Options *options) if (!options->bSysColors) SelectObject(hdc, g_Options.hfntSecond); GetTextExtentPoint32(hdc, title, lstrlen(title), &sz); - if (bFree) DBFreeVariant(&dbv); + if (bFree) db_free(&dbv); textWidth = sz.cx; lpmis->itemHeight += sz.cy + 3; } @@ -667,7 +667,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL) HIMAGELIST hIml = (HIMAGELIST)CallService(MS_CLIST_GETICONSIMAGELIST, 0, 0); int iIcon = CallService(MS_CLIST_GETCONTACTICON, (WPARAM)hContact, 0); - if (DBGetContactSettingDword(hContact, proto, "IdleTS", 0)) + if (db_get_dw(hContact, proto, "IdleTS", 0)) { ImageList_DrawDimmed(hIml, iIcon, hdcTemp, lpdis->rcItem.left, (lpdis->rcItem.top + lpdis->rcItem.bottom - 16) / 2, @@ -682,7 +682,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL) lpdis->rcItem.left += 20; } - if (options->wMaxRecent && DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)) + if (options->wMaxRecent && db_get_b(hContact, "FavContacts", "IsFavourite", 0)) { DrawIconEx(hdcTemp, lpdis->rcItem.right - 18, (lpdis->rcItem.top + lpdis->rcItem.bottom - 16) / 2, Skin_GetIconByHandle(iconList[0].hIcolib), 16, 16, 0, NULL, DI_NORMAL); @@ -747,9 +747,9 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL) DBVARIANT dbv; TCHAR *title; bool bFree = false; - if (DBGetContactSettingTString(hContact, "CList", "StatusMsg", &dbv) || !*dbv.ptszVal) + if (db_get_ts(hContact, "CList", "StatusMsg", &dbv) || !*dbv.ptszVal) { - int status = DBGetContactSettingWord(hContact, proto, "Status", ID_STATUS_OFFLINE); + int status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE); title = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, GSMDF_TCHAR); } else { @@ -761,7 +761,7 @@ static BOOL sttDrawItem_Contact(LPDRAWITEMSTRUCT lpdis, Options *options = NULL) SetTextColor(hdcTemp, clLine2); DrawText(hdcTemp, title, lstrlen(title), &lpdis->rcItem, DT_NOPREFIX|DT_SINGLELINE|DT_TOP|DT_LEFT); - if (bFree) DBFreeVariant(&dbv); + if (bFree) db_free(&dbv); } SelectObject(hdcTemp, hfntSave); @@ -946,7 +946,7 @@ int sttShowMenu(bool centered) szMenu.cy = max(szMenu.cy, szColumn.cy); szColumn.cx = szColumn.cy = 0; - unsigned maxWidth = GetSystemMetrics(SM_CXSCREEN) * DBGetContactSettingByte(NULL, "FavContacts", "MenuWidth", 66) / 100; + unsigned maxWidth = GetSystemMetrics(SM_CXSCREEN) * db_get_b(NULL, "FavContacts", "MenuWidth", 66) / 100; if (szMenu.cx > maxWidth) { g_widthMultiplier = (float)maxWidth / szMenu.cx; szMenu.cx *= g_widthMultiplier; @@ -1019,7 +1019,7 @@ int ProcessSrmmEvent( WPARAM wParam, LPARAM lParam ) hDialogsList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); WindowList_Add(hDialogsList, event->hwndWindow, event->hContact); - BYTE fav = DBGetContactSettingByte(event->hContact, "FavContacts", "IsFavourite", 0); + BYTE fav = db_get_b(event->hContact, "FavContacts", "IsFavourite", 0); StatusIconData sid = {0}; sid.cbSize = sizeof(sid); sid.szModule = "FavContacts"; @@ -1060,8 +1060,8 @@ int ProcessSrmmIconClick( WPARAM wParam, LPARAM lParam ) if (sicd->flags & MBCF_RIGHTBUTTON) { - BYTE fav = !DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0); - DBWriteContactSettingByte(hContact, "FavContacts", "IsFavourite", fav); + BYTE fav = !db_get_b(hContact, "FavContacts", "IsFavourite", 0); + db_set_b(hContact, "FavContacts", "IsFavourite", fav); if (fav) CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0); StatusIconData sid = {0}; @@ -1131,7 +1131,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA { SendDlgItemMessage(hwnd, IDC_CLIST, CLM_SETCHECKMARK, SendDlgItemMessage(hwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0), - DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)); + db_get_b(hContact, "FavContacts", "IsFavourite", 0)); } bInitialized = true; @@ -1268,8 +1268,8 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA { BYTE fav = SendDlgItemMessage(hwnd, IDC_CLIST, CLM_GETCHECKMARK, SendDlgItemMessage(hwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0), 0); - if (fav != DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)) - DBWriteContactSettingByte(hContact, "FavContacts", "IsFavourite", fav); + if (fav != db_get_b(hContact, "FavContacts", "IsFavourite", 0)) + db_set_b(hContact, "FavContacts", "IsFavourite", fav); if (fav) CallService(MS_AV_GETAVATARBITMAP, (WPARAM)hContact, 0); } } else @@ -1291,7 +1291,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA if (SendDlgItemMessage(hwnd, IDC_CLIST, CLM_FINDCONTACT, (WPARAM)hContact, 0) == iSelection) { SendDlgItemMessage(hwnd, IDC_CLIST, CLM_SETCHECKMARK, iSelection, - DBGetContactSettingByte(hContact, "FavContacts", "IsFavourite", 0)); + db_get_b(hContact, "FavContacts", "IsFavourite", 0)); break; } break; diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 6d5069ab5f..466525ce88 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -264,18 +264,18 @@ int RetrieveFileSize(char *filename) FILEECHO::FILEECHO(HANDLE Contact) { hContact = Contact; - dwSendInterval = DBGetContactSettingDword(NULL, SERVICE_NAME, "SendDelay", 6000); - //dwChunkSize = DBGetContactSettingDword(NULL, SERVICE_NAME, "ChunkSize", 5000); + dwSendInterval = db_get_dw(NULL, SERVICE_NAME, "SendDelay", 6000); + //dwChunkSize = db_get_dw(NULL, SERVICE_NAME, "ChunkSize", 5000); - chunkMaxLen = DBGetContactSettingDword(NULL, SERVICE_NAME, "ChunkSize", 5000); + chunkMaxLen = db_get_dw(NULL, SERVICE_NAME, "ChunkSize", 5000); chunkCount = 0; filename = NULL; - rgbRecv = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorRecv", RGB(64,255,64)); - rgbSent = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorSent", RGB(255,255,64)); - rgbUnSent = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorUnsent", RGB(128,128,128)); - rgbToSend = DBGetContactSettingDword(NULL, SERVICE_NAME, "colorTosend", RGB(192,192,192)); - asBinary = DBGetContactSettingDword(NULL, SERVICE_NAME, "base64", 1) == 0; + rgbRecv = db_get_dw(NULL, SERVICE_NAME, "colorRecv", RGB(64,255,64)); + rgbSent = db_get_dw(NULL, SERVICE_NAME, "colorSent", RGB(255,255,64)); + rgbUnSent = db_get_dw(NULL, SERVICE_NAME, "colorUnsent", RGB(128,128,128)); + rgbToSend = db_get_dw(NULL, SERVICE_NAME, "colorTosend", RGB(192,192,192)); + asBinary = db_get_dw(NULL, SERVICE_NAME, "base64", 1) == 0; } uint controlEnabled[][2] = @@ -573,8 +573,8 @@ void FILEECHO::incomeRequest(char *param) inSend = FALSE; SkinPlaySound("RecvFile"); - int AutoMin = DBGetContactSettingByte(NULL,"SRFile","AutoMin",0); - if(DBGetContactSettingByte(NULL,"SRFile","AutoAccept",0) && !DBGetContactSettingByte((HANDLE)hContact,"CList","NotOnList",0)) + int AutoMin = db_get_b(NULL,"SRFile","AutoMin",0); + if(db_get_b(NULL,"SRFile","AutoAccept",0) && !db_get_b((HANDLE)hContact,"CList","NotOnList",0)) { PostMessage(hDlg, WM_COMMAND, IDC_PLAY, 0); if(AutoMin) @@ -667,7 +667,7 @@ void FILEECHO::onRecvTimer() SetDlgItemText(hDlg, IDC_STATUS, msg); MakePopupMsg(hDlg, hContact, msg); setState(STATE_FINISHED); - if(DBGetContactSettingByte(NULL,"SRFile","AutoClose",0)) + if(db_get_b(NULL,"SRFile","AutoClose",0)) { PostMessage(hDlg, WM_CLOSE, 0,0); CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, 0); @@ -1184,7 +1184,7 @@ INT_PTR CALLBACK DialogProc( HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam if (szProto) { int dwStatus; - dwStatus = DBGetContactSettingWord(dat->hContact,szProto,"Status",ID_STATUS_OFFLINE); + dwStatus = db_get_w(dat->hContact,szProto,"Status",ID_STATUS_OFFLINE); if(dat->inSend && dwStatus != dat->contactStatus) { if(dat->contactStatus == ID_STATUS_OFFLINE) diff --git a/plugins/FileAsMessage/src/optionsdlg.cpp b/plugins/FileAsMessage/src/optionsdlg.cpp index 748a118db5..d1b402c5c8 100644 --- a/plugins/FileAsMessage/src/optionsdlg.cpp +++ b/plugins/FileAsMessage/src/optionsdlg.cpp @@ -45,11 +45,11 @@ INT_PTR CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM for(int indx = 0; indx < SIZEOF(settingId); indx++) if(settingId[indx] > 0) - SendDlgItemMessage(hwndDlg, settingId[indx], CPM_SETCOLOUR, 0, DBGetContactSettingDword(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx])); + SendDlgItemMessage(hwndDlg, settingId[indx], CPM_SETCOLOUR, 0, db_get_dw(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx])); else - SetDlgItemInt(hwndDlg, -settingId[indx], DBGetContactSettingDword(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx]), FALSE); + SetDlgItemInt(hwndDlg, -settingId[indx], db_get_dw(NULL, SERVICE_NAME, settingName[indx], settingDefault[indx]), FALSE); - CheckDlgButton(hwndDlg, IDC_ALPHANUM, DBGetContactSettingDword(NULL, SERVICE_NAME, "base64", 1)?BST_CHECKED:BST_UNCHECKED); + CheckDlgButton(hwndDlg, IDC_ALPHANUM, db_get_dw(NULL, SERVICE_NAME, "base64", 1)?BST_CHECKED:BST_UNCHECKED); return TRUE; @@ -97,9 +97,9 @@ INT_PTR CALLBACK OptionsDlgProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM value = GetDlgItemInt(hwndDlg, -settingId[indx], &succ, FALSE); if(!succ) value = settingDefault[indx]; } - DBWriteContactSettingDword(NULL,SERVICE_NAME,settingName[indx], value); + db_set_dw(NULL,SERVICE_NAME,settingName[indx], value); } - DBWriteContactSettingDword(NULL,SERVICE_NAME, "base64", (IsDlgButtonChecked(hwndDlg, IDC_ALPHANUM) == BST_CHECKED)?1:0); + db_set_dw(NULL,SERVICE_NAME, "base64", (IsDlgButtonChecked(hwndDlg, IDC_ALPHANUM) == BST_CHECKED)?1:0); return TRUE; } diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index b67d2e8b58..6c502acfca 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -213,7 +213,7 @@ int OnExtraImageApply(WPARAM wParam, LPARAM lParam) DBVARIANT dbvMirVer; if ( !db_get_ts(hContact, szProto, "MirVer", &dbvMirVer)) { ApplyFingerprintImage(hContact, dbvMirVer.ptszVal); - DBFreeVariant(&dbvMirVer); + db_free(&dbvMirVer); } else ApplyFingerprintImage(hContact, NULL); } diff --git a/plugins/FlashAvatars/src/cflash.cpp b/plugins/FlashAvatars/src/cflash.cpp index 711a3b2f1c..7153d41c9f 100644 --- a/plugins/FlashAvatars/src/cflash.cpp +++ b/plugins/FlashAvatars/src/cflash.cpp @@ -199,7 +199,7 @@ static void __cdecl loadFlash_Thread(void *p) { // change flash frame according user's status int status; if (fai->hFA.hContact) - status = DBGetContactSettingWord(fai->hFA.hContact, fai->getProto(), "Status", ID_STATUS_OFFLINE); + status = db_get_w(fai->hFA.hContact, fai->getProto(), "Status", ID_STATUS_OFFLINE); else status = CallProtoService(fai->getProto(), PS_GETSTATUS, 0, 0); diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index ba94e8fd69..ceb9c2d971 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -66,15 +66,14 @@ BOOL bVersionOK = FALSE; BOOL bDockHorz = TRUE; //UINT nStatus = 0; HMENU hContactMenu = NULL; -HANDLE hMenuItemRemove = NULL; -HANDLE hMenuItemHideAll = NULL; -HANDLE hMainMenuItemHideAll = NULL; RECT rcScreen; DWORD dwOfflineModes = 0; BOOL bEnableTip = FALSE; UINT_PTR ToTopTimerID = 0; BOOL bIsCListShow = TRUE; +HGENMENU hMenuItemRemove, hMenuItemHideAll, hMainMenuItemHideAll; + int hLangpack; pfnSHAutoComplete fnSHAutoComplete = NULL; @@ -226,16 +225,15 @@ static int OnContactDrop( WPARAM wParam, LPARAM lParam ) static int OnContactDragStop( WPARAM wParam, LPARAM lParam ) { - HANDLE hContact = ( HANDLE )wParam; + HANDLE hContact = ( HANDLE )wParam; ThumbInfo *pThumb = thumbList.FindThumbByContact( hContact ); - if ( ( pThumb != NULL ) && ( hNewContact == hContact )) - { + if (pThumb != NULL && hNewContact == hContact ) { thumbList.RemoveThumb( pThumb ); hNewContact = NULL; } - return( 0 ); + return 0; } @@ -248,7 +246,7 @@ static int OnSkinIconsChanged( WPARAM wParam, LPARAM lParam ) for (int i = 0; i < thumbList.getCount(); ++i) thumbList[i]->UpdateContent(); - return( 0 ); + return 0; } @@ -269,10 +267,10 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) ApplyOptionsChanges(); } - return( 0 ); + return 0; } - if ( pThumb == NULL ) return( 0 ); + if ( pThumb == NULL ) return 0; // Only on these 2 events we need to refresh if ( 0 == _stricmp( pdbcws->szSetting, "Status" )) @@ -302,7 +300,7 @@ static int OnContactSettingChanged( WPARAM wParam, LPARAM lParam ) PostMessage( pThumb->hwnd, WM_REFRESH_CONTACT, 0, idStatus ); } - return( 0 ); + return 0; } @@ -322,7 +320,7 @@ static int OnStatusModeChange( WPARAM wParam, LPARAM lParam ) // Floating status window will use this } - return( 0 ); + return 0; } @@ -331,14 +329,9 @@ static int OnPrebuildContactMenu( WPARAM wParam, LPARAM lParam ) { ThumbInfo *pThumb = thumbList.FindThumbByContact( (HANDLE) wParam ); - CLISTMENUITEM clmi = { sizeof(clmi) }; - clmi.flags = ( pThumb == NULL ) ? CMIM_FLAGS | CMIF_HIDDEN : CMIM_FLAGS &~CMIF_HIDDEN; - CallService( MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuItemRemove, (LPARAM)&clmi ); - - clmi.flags = fcOpt.bHideAll ? CMIM_FLAGS | CMIF_HIDDEN : CMIM_FLAGS &~CMIF_HIDDEN; - CallService( MS_CLIST_MODIFYMENUITEM, (WPARAM)hMenuItemHideAll, (LPARAM)&clmi ); - - return( 0 ); + Menu_ShowItem(hMenuItemRemove, pThumb != NULL); + Menu_ShowItem(hMenuItemHideAll, !fcOpt.bHideAll); + return 0; } @@ -680,7 +673,7 @@ static void CreateBackgroundBrush() if (db_get_b(NULL, MODULE, "BkUseBitmap", FLT_DEFAULT_BKGNDUSEBITMAP)) { DBVARIANT dbv; - if ( !DBGetContactSettingTString(NULL, MODULE, "BkBitmap", &dbv)) { + if ( !db_get_ts(NULL, MODULE, "BkBitmap", &dbv)) { hBmpBackground = (HBITMAP)CallService(MS_UTILS_LOADBITMAPT, 0, (LPARAM)dbv.ptszVal); db_free(&dbv); } @@ -736,7 +729,7 @@ void RegHotkey( HANDLE hContact, HWND hwnd ) char szBuf[ MAX_PATH ] = {0}; DBVARIANT dbv; - if (DBGetContactSettingString(hContact, MODULE, "Hotkey", &dbv)) return; + if (db_get_s(hContact, MODULE, "Hotkey", &dbv)) return; strncpy(szBuf, dbv.pszVal, MAX_PATH - 1); db_free( &dbv ); @@ -1021,7 +1014,7 @@ static int OnModulesLoded( WPARAM wParam, LPARAM lParam ) fcOpt.ToTopTime = (fcOpt.ToTopTime>TOTOPTIME_MAX)?TOTOPTIME_MAX:fcOpt.ToTopTime; ToTopTimerID = SetTimer(NULL, 0, fcOpt.ToTopTime*TOTOPTIME_P, ToTopTimerProc); } - return( 0 ); + return 0; } extern "C" int __declspec(dllexport) Load() diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index 4eb3cf3fd1..0ec7c56a44 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -180,7 +180,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP SendMessage(hwndDlg, M_REFRESHBKGBOXES, 0, 0); { DBVARIANT dbv; - if ( !DBGetContactSettingTString(NULL, MODULE, "BkBitmap", &dbv)) { + if ( !db_get_ts(NULL, MODULE, "BkBitmap", &dbv)) { SetDlgItemText(hwndDlg, IDC_FILENAME, dbv.ptszVal); db_free(&dbv); } @@ -196,7 +196,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP fnSHAutoComplete(GetDlgItem(hwndDlg, IDC_FILENAME), 1); // Windows 2K/XP - BYTE btOpacity = (BYTE)DBGetContactSettingByte(NULL, MODULE, "Opacity", 100); + BYTE btOpacity = (BYTE)db_get_b(NULL, MODULE, "Opacity", 100); SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_SETRANGE, TRUE, MAKELONG(0, 100)); SendDlgItemMessage(hwndDlg, IDC_SLIDER_OPACITY, TBM_SETPOS, TRUE, btOpacity); @@ -306,7 +306,7 @@ static INT_PTR APIENTRY OptSknWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP TCHAR str[MAX_PATH]; GetDlgItemText(hwndDlg, IDC_FILENAME, str, SIZEOF(str)); - DBWriteContactSettingTString(NULL, MODULE, "BkBitmap", str); + db_set_ts(NULL, MODULE, "BkBitmap", str); WORD flags = 0; if (IsDlgButtonChecked(hwndDlg, IDC_STRETCHH)) diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index 407bf18220..c56bff0840 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -407,7 +407,7 @@ void ThumbInfo::RefreshContactStatus(int idStatus) void ThumbInfo::DeleteContactPos() { - DBDeleteContactSetting( hContact, MODULE, "ThumbsPos" ); + db_unset( hContact, MODULE, "ThumbsPos" ); } void ThumbInfo::OnLButtonDown(int nX, int nY) diff --git a/plugins/Folders/src/utils.cpp b/plugins/Folders/src/utils.cpp index 69d571990f..93d572cf78 100644 --- a/plugins/Folders/src/utils.cpp +++ b/plugins/Folders/src/utils.cpp @@ -183,7 +183,7 @@ int GetStringFromDatabase(char *szSettingName, const wchar_t *szError, TCHAR *sz { size_t len; DBVARIANT dbv; - if ( DBGetContactSettingWString(NULL, ModuleName, szSettingName, &dbv) == 0) { + if ( db_get_ws(NULL, ModuleName, szSettingName, &dbv) == 0) { size_t tmp = _tcslen(dbv.ptszVal); len = (tmp < size - 1) ? tmp : size - 1; _tcsncpy(szResult, dbv.ptszVal, len); diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 1e159b146f..19193efdd4 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -104,7 +104,7 @@ string DBGetString(HANDLE hContact, const char *szModule, const char *szSetting, } } else ret = pszError; - DBFreeVariant(&dbv); + db_free(&dbv); return ret; } @@ -955,16 +955,16 @@ 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); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx1", (WORD)ListView_GetColumnWidth(hShareList, 0)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx2", (WORD)ListView_GetColumnWidth(hShareList, 1)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx3", (WORD)ListView_GetColumnWidth(hShareList, 2)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx4", (WORD)ListView_GetColumnWidth(hShareList, 3)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx5", (WORD)ListView_GetColumnWidth(hShareList, 4)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx6", (WORD)ListView_GetColumnWidth(hUserList, 0)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx7", (WORD)ListView_GetColumnWidth(hUserList, 1)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx8", (WORD)ListView_GetColumnWidth(hUserList, 2)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx9", (WORD)ListView_GetColumnWidth(hUserList, 3)); - DBWriteContactSettingWord(NULL, MODULE, "StatWnd_cx10", (WORD)ListView_GetColumnWidth(hUserList, 4)); + db_set_w(NULL, MODULE, "StatWnd_cx1", (WORD)ListView_GetColumnWidth(hShareList, 0)); + db_set_w(NULL, MODULE, "StatWnd_cx2", (WORD)ListView_GetColumnWidth(hShareList, 1)); + db_set_w(NULL, MODULE, "StatWnd_cx3", (WORD)ListView_GetColumnWidth(hShareList, 2)); + db_set_w(NULL, MODULE, "StatWnd_cx4", (WORD)ListView_GetColumnWidth(hShareList, 3)); + db_set_w(NULL, MODULE, "StatWnd_cx5", (WORD)ListView_GetColumnWidth(hShareList, 4)); + db_set_w(NULL, MODULE, "StatWnd_cx6", (WORD)ListView_GetColumnWidth(hUserList, 0)); + db_set_w(NULL, MODULE, "StatWnd_cx7", (WORD)ListView_GetColumnWidth(hUserList, 1)); + db_set_w(NULL, MODULE, "StatWnd_cx8", (WORD)ListView_GetColumnWidth(hUserList, 2)); + db_set_w(NULL, MODULE, "StatWnd_cx9", (WORD)ListView_GetColumnWidth(hUserList, 3)); + db_set_w(NULL, MODULE, "StatWnd_cx10", (WORD)ListView_GetColumnWidth(hUserList, 4)); bool b = IsDlgButtonChecked(hwndDlg, IDC_SHOWHIDDENSHARES) == BST_CHECKED; db_set_b(NULL, MODULE, "StatWnd_ShowHidden", b); @@ -1032,7 +1032,7 @@ static INT_PTR nShareNewFile(WPARAM wParam, LPARAM lParam) { if (hContact) { // Try to locate an IP address. DBVARIANT dbv = {0}; - if (! DBGetContactSetting(hContact, "Protocol", "p", &dbv)) { + if (! db_get(hContact, "Protocol", "p", &dbv)) { if (dbv.type == DBVT_ASCIIZ) { stNewShare.dwAllowedIP = db_get_dw(hContact, dbv.pszVal, "IP", 0); if (! stNewShare.dwAllowedIP) @@ -1041,7 +1041,7 @@ static INT_PTR nShareNewFile(WPARAM wParam, LPARAM lParam) { stNewShare.dwAllowedIP = db_get_dw(hContact, MODULE, "LastUsedIP", 0); } } - DBFreeVariant(&dbv); + db_free(&dbv); stNewShare.dwAllowedMask = db_get_dw(hContact, MODULE, "LastUsedMask", 0); } diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp index bde839a30c..17ebfa7af0 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp @@ -49,23 +49,23 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam ) TranslateDialogDefault(hDlg); TranslateMenu(listMenu); - if ( DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 ) + if ( db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 ) hContact = NULL; else hContact = DlgParam->hContact; - if ( DBGetContactSettingByte(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 0) == 0 ) + if ( db_get_b(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 0) == 0 ) { // First use of this plugin! Set default size! - DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistWidth", 400); - DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistHeight", 450); - DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistX", 0); - DBWriteContactSettingDword(hContact, LINKLIST_MODULE, "LinklistY", 0); + db_set_dw(hContact, LINKLIST_MODULE, "LinklistWidth", 400); + db_set_dw(hContact, LINKLIST_MODULE, "LinklistHeight", 450); + db_set_dw(hContact, LINKLIST_MODULE, "LinklistX", 0); + db_set_dw(hContact, LINKLIST_MODULE, "LinklistY", 0); - DBWriteContactSettingByte(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 1); + db_set_b(hContact, LINKLIST_MODULE, LINKLIST_FIRST, 1); } - DlgParam->splitterPosNew = (int)DBGetContactSettingDword(hContact, LINKLIST_MODULE, LINKLIST_SPLITPOS, -1); + DlgParam->splitterPosNew = (int)db_get_dw(hContact, LINKLIST_MODULE, LINKLIST_SPLITPOS, -1); GetWindowRect(GetDlgItem(hDlg, IDC_MAIN), &rc); DlgParam->minSize.cx = rc.right - rc.left; @@ -122,7 +122,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam ) pENLink = (ENLINK*)lpNmhdr; - mouseEvent = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); if ( pENLink->msg == WM_MOUSEMOVE && mouseEvent == 0x01 ) { @@ -140,7 +140,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam ) ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL); else { - openNewWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); + openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); if ( openNewWindow == 0xFF ) openNewWindow = 0; @@ -156,7 +156,7 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam ) hSubMenu = GetSubMenu(hPopup, 0); // Disable Menuoption if "mouse over" events are active - mouseEvent = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); if (mouseEvent == 0x01 ) EnableMenuItem(hSubMenu, IDM_SHOWMESSAGE, MF_BYCOMMAND | MF_DISABLED | MF_GRAYED); @@ -442,12 +442,12 @@ INT_PTR WINAPI MainDlgProc( HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam ) case WM_DESTROY: { HANDLE hContact; - if ( DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 ) + if ( db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00) == 0x00 ) hContact = NULL; else hContact = DlgParam->hContact; Utils_SaveWindowPosition(hDlg, hContact, LINKLIST_MODULE, "Linklist"); - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_SPLITPOS, DlgParam->splitterPosNew); + db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_SPLITPOS, DlgParam->splitterPosNew); RemoveList(DlgParam->listStart); free(DlgParam); // Remove entry from Window list @@ -548,7 +548,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l case WM_INITDIALOG: { TranslateDialogDefault(hDlg); - useDefault = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); + useDefault = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); if ( useDefault == 0x01 ) { mCol = GetMirandaColour(&colourSet); @@ -838,7 +838,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l options.showTime = 1; WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options); - //DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01); + //db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01); WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options); break; @@ -853,7 +853,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l options.showDirection = 1; WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options); - //DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01); + //db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01); WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options); break; @@ -868,7 +868,7 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l options.showType = 1; WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options); - //DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01); + //db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01); WriteOptionExample(hDlg, colourSet.incoming, colourSet.outgoing, colourSet.background, colourSet.text, &options); break; @@ -882,10 +882,10 @@ INT_PTR CALLBACK OptionsDlgProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM l { // Write Settings to Database if ( SendDlgItemMessage(hDlg, IDC_CHECK1, BM_GETCHECK, 0, 0) == BST_CHECKED ) - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); else { - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(NULL, 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 bc5c5abe61..3e12ced1ef 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_fct.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_fct.cpp @@ -842,77 +842,77 @@ void GetListInfo(BYTE params, LISTELEMENT *listStart, LPCTSTR searchString, siz void GetListOptions(LISTOPTIONS *options) { - options->openNewWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); + options->openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); if(options->openNewWindow == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0x00); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0x00); options->openNewWindow = 0x00; } - options->updateWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); + options->updateWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); if(options->updateWindow == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); options->updateWindow = 0x00; } - options->mouseEvent = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); + options->mouseEvent = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0xFF); if(options->mouseEvent == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0x00); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, 0x00); options->mouseEvent = 0x00; } - options->saveSpecial = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0xFF); + options->saveSpecial = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0xFF); if(options->saveSpecial == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, 0x00); options->saveSpecial = 0x00; } - options->showDate = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0xFF); + options->showDate = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0xFF); if(options->showDate == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0x01); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, 0x01); options->showDate = 0x01; } - options->showLine = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0xFF); + options->showLine = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0xFF); if(options->showLine == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0x01); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, 0x01); options->showLine = 0x01; } - options->showTime = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0xFF); + options->showTime = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0xFF); if(options->showTime == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, 0x01); options->showTime = 0x01; } - options->showDirection = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0xFF); + options->showDirection = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0xFF); if(options->showDirection == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, 0x01); options->showDirection = 0x01; } - options->showType = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0xFF); + options->showType = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0xFF); if(options->showType == 0xFF) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, 0x01); options->showType = 0x01; } @@ -921,15 +921,15 @@ void GetListOptions(LISTOPTIONS *options) void SetListOptions(LISTOPTIONS *options) { - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, options->openNewWindow); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, options->updateWindow); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_MOUSE_EVENT, options->mouseEvent); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SAVESPECIAL, options->saveSpecial); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DATE, options->showDate); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_LINE, options->showLine); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TIME, options->showTime); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_DIRECTION, options->showDirection); - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_SHOW_TYPE, options->showType); + 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); } /* @@ -977,11 +977,11 @@ void GetColour(MYCOLOURSET *colourSet) DWORD colour; BYTE useDefault; - useDefault = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); + useDefault = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0xFF); if ( useDefault == 0xFF ) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x01); useDefault = 0x01; } @@ -990,51 +990,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 = DBGetContactSettingDword(NULL, "SRMM", "SRMFont1Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMM", "SRMFont1Col", 0xFF000000); if ( colour != 0xFF000000 ) colourSet->incoming = colour; else { - colour = DBGetContactSettingDword(NULL, "SRMsg", "Font3Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMsg", "Font3Col", 0xFF000000); if ( colour != 0xFF000000 ) colourSet->incoming = colour; else { - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } // SRMM - colour = DBGetContactSettingDword(NULL, "SRMM", "SRMFont0Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMM", "SRMFont0Col", 0xFF000000); if ( colour != 0xFF000000 ) colourSet->outgoing = colour; else { // SRMsg - colour = DBGetContactSettingDword(NULL, "SRMsg", "Font0Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMsg", "Font0Col", 0xFF000000); if ( colour != 0xFF000000 ) colourSet->outgoing = colour; else { - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } // SRMM - colour = DBGetContactSettingDword(NULL, "SRMM", "BkgColour", 0xFF000000); + colour = db_get_dw(NULL, "SRMM", "BkgColour", 0xFF000000); if ( colour != 0xFF000000 ) colourSet->background = colour; else { // SRMsg - colour = DBGetContactSettingDword(NULL, "SRMsg", "BkgColour", 0xFF000000); + colour = db_get_dw(NULL, "SRMsg", "BkgColour", 0xFF000000); if ( colour != 0xFF000000 ) colourSet->background = colour; else { - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); + db_set_b(NULL, LINKLIST_MODULE, LINKLIST_USE_DEF, 0x00); useDefault = 0x00; } } @@ -1044,25 +1044,25 @@ void GetColour(MYCOLOURSET *colourSet) if ( useDefault == 0x00 ) { // Use Plugin user defined or default colours - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); if ( colour != 0xFF000000 ) colourSet->incoming = colour; else colourSet->incoming = IN_COL_DEF; - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); if ( colour != 0xFF000000 ) colourSet->outgoing = colour; else colourSet->outgoing = OUT_COL_DEF; - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); if ( colour != 0xFF000000 ) colourSet->background = colour; else colourSet->background = BG_COL_DEF; - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); if ( colour != 0xFF000000 ) colourSet->text = colour; else @@ -1079,39 +1079,39 @@ void GetDBColour(MYCOLOURSET *colourSet) DWORD colour; // Use Plugin user defined or default colours - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, 0xFF000000); if(colour != 0xFF000000) colourSet->incoming = colour; else { - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, IN_COL_DEF); + db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, IN_COL_DEF); colourSet->incoming = IN_COL_DEF; } - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, 0xFF000000); if(colour != 0xFF000000) colourSet->outgoing = colour; else { - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, OUT_COL_DEF); + db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, OUT_COL_DEF); colourSet->outgoing = OUT_COL_DEF; } - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, 0xFF000000); if(colour != 0xFF000000) colourSet->background = colour; else { - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, BG_COL_DEF); + db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, BG_COL_DEF); colourSet->background = BG_COL_DEF; } - colour = DBGetContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); + colour = db_get_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, 0xFF000000); if(colour != 0xFF000000) colourSet->text = colour; else { - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, TXT_COL_DEF); + db_set_dw(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, TXT_COL_DEF); colourSet->text = TXT_COL_DEF; } } @@ -1125,12 +1125,12 @@ int GetMirandaColour(MYCOLOURSET *colourSet) // Use Miranda-IM Default colours // Try SRMM (Miranda 0.4) .... or SRMsg... for older versions - colour = DBGetContactSettingDword(NULL, "SRMM", "SRMFont1Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMM", "SRMFont1Col", 0xFF000000); if(colour != 0xFF000000) colourSet->incoming = colour; else { - colour = DBGetContactSettingDword(NULL, "SRMsg", "Font3Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMsg", "Font3Col", 0xFF000000); if(colour != 0xFF000000) colourSet->incoming = colour; else @@ -1138,24 +1138,24 @@ int GetMirandaColour(MYCOLOURSET *colourSet) } - colour = DBGetContactSettingDword(NULL, "SRMM", "SRMFont0Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMM", "SRMFont0Col", 0xFF000000); if(colour != 0xFF000000) colourSet->outgoing = colour; else { - colour = DBGetContactSettingDword(NULL, "SRMsg", "Font0Col", 0xFF000000); + colour = db_get_dw(NULL, "SRMsg", "Font0Col", 0xFF000000); if(colour != 0xFF000000) colourSet->outgoing = colour; else return 1; } - colour = DBGetContactSettingDword(NULL, "SRMM", "BkgColour", 0xFF000000); + colour = db_get_dw(NULL, "SRMM", "BkgColour", 0xFF000000); if(colour != 0xFF000000) colourSet->background = colour; else { - colour = DBGetContactSettingDword(NULL, "SRMsg", "BkgColour", 0xFF000000); + colour = db_get_dw(NULL, "SRMsg", "BkgColour", 0xFF000000); if(colour != 0xFF000000) colourSet->background = colour; else @@ -1172,21 +1172,21 @@ Write user defined colours to the database */ void SetDBColour(MYCOLOURSET *colourSet) { - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_IN_COL, colourSet->incoming); - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_OUT_COL, colourSet->outgoing); - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_BG_COL, colourSet->background); - DBWriteContactSettingDword(NULL, LINKLIST_MODULE, LINKLIST_TXT_COL, colourSet->text); + 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); } BYTE GetUpdateSetting(void) { BYTE updateWindow; - updateWindow = DBGetContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); + updateWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0xFF); if ( updateWindow == 0xFF ) { // No DB entry for this Plugin - DBWriteContactSettingByte(NULL, LINKLIST_MODULE, LINKLIST_UPDATE_WINDOW, 0x00); + db_set_b(NULL, 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 8783aafa34..70be70347b 100644 --- a/plugins/HistorySweeperLight/src/historysweeperlight.cpp +++ b/plugins/HistorySweeperLight/src/historysweeperlight.cpp @@ -132,7 +132,7 @@ static void GetBookmarks(HANDLE hContact, BEventData** books, size_t* bookcnt ) mir_free(tbooks); } - DBFreeVariant(&dbv); + db_free(&dbv); } } @@ -141,15 +141,15 @@ void SweepHistoryFromContact(HANDLE hContact, CriteriaStruct Criteria, BOOL keep { int lPolicy; if (hContact == NULL) // for system history - lPolicy = DBGetContactSettingByte(NULL, ModuleName, "SweepSHistory", 0); + lPolicy = db_get_b(NULL, ModuleName, "SweepSHistory", 0); else // for contact history (or "SweepHistory" - default action) - lPolicy = DBGetContactSettingByte(hContact, ModuleName, "SweepHistory", DBGetContactSettingByte(NULL, ModuleName, "SweepHistory", 0)); + lPolicy = db_get_b(hContact, ModuleName, "SweepHistory", db_get_b(NULL, ModuleName, "SweepHistory", 0)); if (lPolicy == 0) return; // nothing to do int eventsCnt = db_event_count(hContact); if (eventsCnt != 0) { - BOOL doDelete, unsafe = DBGetContactSettingByte(NULL, ModuleName, "UnsafeMode", 0); + BOOL doDelete, unsafe = db_get_b(NULL, ModuleName, "UnsafeMode", 0); BEventData *books, *item, ev = { 0 }; size_t bookcnt, btshift; @@ -211,8 +211,8 @@ void ShutdownAction(void) CriteriaStruct Criteria; HANDLE hContact = db_find_first(); - Criteria.keep = KeepCriteria(DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0)); - Criteria.time = BuildCriteria(DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0)); + Criteria.keep = KeepCriteria(db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)); + Criteria.time = BuildCriteria(db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)); SweepHistoryFromContact(NULL, Criteria, FALSE); // sweep system history, keepunread==0 @@ -228,12 +228,12 @@ int OnWindowEvent(WPARAM wParam, LPARAM lParam) { MessageWindowEventData* msgEvData = (MessageWindowEventData*)lParam; - if (msgEvData->uType == MSG_WINDOW_EVT_CLOSE && DBGetContactSettingByte(NULL, ModuleName, "SweepOnClose", 0)) + if (msgEvData->uType == MSG_WINDOW_EVT_CLOSE && db_get_b(NULL, ModuleName, "SweepOnClose", 0)) { CriteriaStruct Criteria; - Criteria.keep = KeepCriteria(DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0)); - Criteria.time = BuildCriteria(DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0)); + Criteria.keep = KeepCriteria(db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)); + Criteria.time = BuildCriteria(db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)); SweepHistoryFromContact(msgEvData->hContact, Criteria, TRUE); } diff --git a/plugins/HistorySweeperLight/src/main.cpp b/plugins/HistorySweeperLight/src/main.cpp index 6f1133dbea..3508a6b8dc 100644 --- a/plugins/HistorySweeperLight/src/main.cpp +++ b/plugins/HistorySweeperLight/src/main.cpp @@ -52,7 +52,7 @@ int OnIconPressed(WPARAM wParam, LPARAM lParam) StatusIconClickData *sicd = (StatusIconClickData *)lParam; if ( !(sicd->flags & MBCF_RIGHTBUTTON) && !lstrcmpA(sicd->szModule, ModuleName) - && DBGetContactSettingByte(NULL, ModuleName, "ChangeInMW", 0)) + && db_get_b(NULL, ModuleName, "ChangeInMW", 0)) { int nh = sicd->dwId; HANDLE hContact = (HANDLE)wParam; StatusIconData sid = {0}; @@ -63,7 +63,7 @@ int OnIconPressed(WPARAM wParam, LPARAM lParam) CallService(MS_MSG_MODIFYICON, (WPARAM)hContact, (LPARAM)&sid); nh = (nh + 1) % 4; - DBWriteContactSettingByte((HANDLE)wParam, ModuleName, "SweepHistory", (BYTE)nh); + db_set_b((HANDLE)wParam, ModuleName, "SweepHistory", (BYTE)nh); sid.dwId = nh; sid.flags = 0; @@ -76,7 +76,7 @@ int OnIconPressed(WPARAM wParam, LPARAM lParam) int OnModulesLoaded(WPARAM wParam, LPARAM lParam) { StatusIconData sid = {0}; - int i, sweep = DBGetContactSettingByte(NULL, ModuleName, "SweepHistory", 0); + int i, sweep = db_get_b(NULL, ModuleName, "SweepHistory", 0); HANDLE hContact = db_find_first(); sid.cbSize = sizeof(sid); @@ -87,11 +87,11 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) sid.szTooltip = Translate("Keep all events"); else if (sweep == 1) { - sid.szTooltip = Translate(time_stamp_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0)]); + sid.szTooltip = Translate(time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]); } else if (sweep == 2) { - sid.szTooltip = Translate(keep_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0)]); + sid.szTooltip = Translate(keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]); } else if (sweep == 3) { @@ -102,13 +102,13 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) sid.dwId = 1; sid.hIcon = LoadIconEx("act1"); - sid.szTooltip = Translate(time_stamp_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0)]); + sid.szTooltip = Translate(time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]); sid.flags = MBF_HIDDEN; CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid); sid.dwId = 2; sid.hIcon = LoadIconEx("act2"); - sid.szTooltip = Translate(keep_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0)]); + sid.szTooltip = Translate(keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]); sid.flags = MBF_HIDDEN; CallService(MS_MSG_ADDICON, 0, (LPARAM)&sid); @@ -123,7 +123,7 @@ int OnModulesLoaded(WPARAM wParam, LPARAM lParam) { ZeroMemory(&sid,sizeof(sid)); - sweep = DBGetContactSettingByte(hContact, ModuleName, "SweepHistory", 0); + sweep = db_get_b(hContact, ModuleName, "SweepHistory", 0); sid.cbSize = sizeof(sid); sid.szModule = ModuleName; diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp index 2d13aefd7f..d77d4946f9 100644 --- a/plugins/HistorySweeperLight/src/options.cpp +++ b/plugins/HistorySweeperLight/src/options.cpp @@ -105,16 +105,16 @@ static void ShowAllContactIcons(HWND hwndList) HANDLE hContact, hItem; SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hAllContacts, - MAKELPARAM(0, DBGetContactSettingByte(NULL, ModuleName, "SweepHistory", 0))); + MAKELPARAM(0, db_get_b(NULL, ModuleName, "SweepHistory", 0))); SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hSystemHistory, - MAKELPARAM(0, DBGetContactSettingByte(NULL, ModuleName, "SweepSHistory", 0))); + MAKELPARAM(0, db_get_b(NULL, ModuleName, "SweepSHistory", 0))); for (hContact=db_find_first(); hContact; hContact=db_find_next(hContact)) { hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, - MAKELPARAM(0, DBGetContactSettingByte(hContact, ModuleName, "SweepHistory", 0))); + MAKELPARAM(0, db_get_b(hContact, ModuleName, "SweepHistory", 0))); } }//ShowAllContactIcons @@ -150,12 +150,12 @@ void LoadSettings(HWND hwndDlg) mir_free(ptszTimeStr); } - SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_SETCURSEL, DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0), 0); - SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_SETCURSEL, DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0), 0); + 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); - CheckDlgButton(hwndDlg, IDC_UNSAFEMODE, DBGetContactSettingByte(NULL, ModuleName, "UnsafeMode", 0)); - CheckDlgButton(hwndDlg, IDC_SWEEPONCLOSE, DBGetContactSettingByte(NULL, ModuleName, "SweepOnClose", 0)); - CheckDlgButton(hwndDlg, IDC_HISTMW, DBGetContactSettingByte(NULL, ModuleName, "ChangeInMW", 0)); + CheckDlgButton(hwndDlg, IDC_UNSAFEMODE, db_get_b(NULL, ModuleName, "UnsafeMode", 0)); + CheckDlgButton(hwndDlg, IDC_SWEEPONCLOSE, db_get_b(NULL, ModuleName, "SweepOnClose", 0)); + CheckDlgButton(hwndDlg, IDC_HISTMW, db_get_b(NULL, ModuleName, "ChangeInMW", 0)); }//LoadSettings @@ -163,18 +163,18 @@ void SaveSettings(HWND hwndDlg) { int st, i; StatusIconData sid = {0}; HANDLE hContact, hItem; HWND hwndList = GetDlgItem(hwndDlg, IDC_LIST); - DBWriteContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSOLDER, CB_GETCURSEL, 0, 0)); - DBWriteContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", (BYTE)SendDlgItemMessage(hwndDlg, IDC_SSKEEP, CB_GETCURSEL, 0, 0)); - DBWriteContactSettingByte(NULL, ModuleName, "UnsafeMode", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_UNSAFEMODE)); - DBWriteContactSettingByte(NULL, ModuleName, "SweepOnClose", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_SWEEPONCLOSE)); - DBWriteContactSettingByte(NULL, ModuleName, "ChangeInMW", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_HISTMW)); + 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)); sid.cbSize = sizeof(sid); sid.szModule = ModuleName; - DBWriteContactSettingByte(NULL, ModuleName, "SweepHistory", + db_set_b(NULL, ModuleName, "SweepHistory", (BYTE)SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hAllContacts, 0)); - DBWriteContactSettingByte(NULL, ModuleName, "SweepSHistory", + db_set_b(NULL, ModuleName, "SweepSHistory", (BYTE)SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hSystemHistory, 0)); for (hContact=db_find_first(); hContact; @@ -183,8 +183,8 @@ void SaveSettings(HWND hwndDlg) hItem = (HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0); st = SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, 0); - if ( st != 0 ) DBWriteContactSettingByte(hContact, ModuleName, "SweepHistory", (BYTE)st); - else DBDeleteContactSetting(hContact, ModuleName, "SweepHistory"); + if ( st != 0 ) db_set_b(hContact, ModuleName, "SweepHistory", (BYTE)st); + else db_unset(hContact, ModuleName, "SweepHistory"); // set per-contact icons in status bar for(i = 0; i < 4; i++) @@ -196,21 +196,21 @@ void SaveSettings(HWND hwndDlg) } // set tooltips - st = DBGetContactSettingByte(NULL, ModuleName, "SweepHistory", 0); + st = db_get_b(NULL, ModuleName, "SweepHistory", 0); sid.dwId = 0; if (st == 0) sid.szTooltip = Translate("Keep all events"); - else if (st == 1) sid.szTooltip = Translate(time_stamp_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0)]); - else if (st == 2) sid.szTooltip = Translate(keep_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0)]); + else if (st == 1) sid.szTooltip = Translate(time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]); + else if (st == 2) sid.szTooltip = Translate(keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]); else if (st == 3) sid.szTooltip = Translate("Delete all events"); CallService(MS_MSG_MODIFYICON, 0, (LPARAM)&sid); sid.dwId = 1; - sid.szTooltip = Translate(time_stamp_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownOlder", 0)]); + sid.szTooltip = Translate(time_stamp_strings[db_get_b(NULL, ModuleName, "StartupShutdownOlder", 0)]); CallService(MS_MSG_MODIFYICON, 0, (LPARAM)&sid); sid.dwId = 2; - sid.szTooltip = Translate(keep_strings[DBGetContactSettingByte(NULL, ModuleName, "StartupShutdownKeep", 0)]); + sid.szTooltip = Translate(keep_strings[db_get_b(NULL, ModuleName, "StartupShutdownKeep", 0)]); CallService(MS_MSG_MODIFYICON, 0, (LPARAM)&sid); }//SaveSettings diff --git a/plugins/IEView/src/ChatHTMLBuilder.cpp b/plugins/IEView/src/ChatHTMLBuilder.cpp index 636f070464..ff441a8642 100644 --- a/plugins/IEView/src/ChatHTMLBuilder.cpp +++ b/plugins/IEView/src/ChatHTMLBuilder.cpp @@ -49,33 +49,33 @@ void ChatHTMLBuilder::loadMsgDlgFont(int i, LOGFONTA * lf, COLORREF * colour) { DBVARIANT dbv; if (colour) { wsprintfA(str, "Font%dCol", i); - *colour = DBGetContactSettingDword(NULL, CHATFONTMOD, str, 0x000000); + *colour = db_get_dw(NULL, CHATFONTMOD, str, 0x000000); } if (lf) { wsprintfA(str, "Font%dSize", i); - lf->lfHeight = (char) DBGetContactSettingByte(NULL, CHATFONTMOD, str, 10); + lf->lfHeight = (char) db_get_b(NULL, CHATFONTMOD, str, 10); lf->lfHeight = abs(lf->lfHeight); lf->lfWidth = 0; lf->lfEscapement = 0; lf->lfOrientation = 0; wsprintfA(str, "Font%dSty", i); - style = DBGetContactSettingByte(NULL, CHATFONTMOD, str, 0); + style = db_get_b(NULL, 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; wsprintfA(str, "Font%dSet", i); - lf->lfCharSet = DBGetContactSettingByte(NULL, CHATFONTMOD, str, DEFAULT_CHARSET); + lf->lfCharSet = db_get_b(NULL, CHATFONTMOD, str, DEFAULT_CHARSET); lf->lfOutPrecision = OUT_DEFAULT_PRECIS; lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; lf->lfQuality = DEFAULT_QUALITY; lf->lfPitchAndFamily = DEFAULT_PITCH | FF_DONTCARE; wsprintfA(str, "Font%d", i); - if (DBGetContactSetting(NULL, CHATFONTMOD, str, &dbv)) + if (db_get(NULL, CHATFONTMOD, str, &dbv)) lstrcpyA(lf->lfFaceName, "Verdana"); else { lstrcpynA(lf->lfFaceName, dbv.pszVal, sizeof(lf->lfFaceName)); - DBFreeVariant(&dbv); + db_free(&dbv); } } } @@ -115,7 +115,7 @@ void ChatHTMLBuilder::buildHead(IEView *view, IEVIEWEVENT *event) { ReleaseDC(NULL, hdc); Utils::appendText(&output, &outputSize, ""); Utils::appendText(&output, &outputSize, "