From 428bf0cbd77813a43094cb5c984436deff251936 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 Jul 2016 12:36:34 +0000 Subject: no more TCHARs git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/NotifyAnything/src/main.cpp | 8 ++++---- plugins/NotifyAnything/src/options.cpp | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/NotifyAnything/src') diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp index 88e4b16fbf..3e72bf9f3d 100644 --- a/plugins/NotifyAnything/src/main.cpp +++ b/plugins/NotifyAnything/src/main.cpp @@ -145,11 +145,11 @@ void registerSound(const std::wstring &name) SKINSOUNDDESCEX ssd = { 0 }; ssd.cbSize = sizeof(ssd); - ssd.dwFlags = SSDF_TCHAR; + ssd.dwFlags = SSDF_UNICODE; ssd.pszName = _T2A(id.c_str()); - ssd.ptszSection = LPGENW("Notify Anything"); - ssd.ptszDescription = desc.c_str(); - ssd.ptszDefaultFile = file.c_str(); + ssd.pwszSection = LPGENW("Notify Anything"); + ssd.pwszDescription = desc.c_str(); + ssd.pwszDefaultFile = file.c_str(); Skin_AddSound(&ssd); } diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp index 0abd9cf948..377be8ac3a 100644 --- a/plugins/NotifyAnything/src/options.cpp +++ b/plugins/NotifyAnything/src/options.cpp @@ -66,7 +66,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara ofn.lpstrFilter = TranslateT("Log (*.log)\0*.log\0Text (*.txt)\0*.txt\0All Files (*.*)\0*.*\0"); ofn.nFilterIndex = 1; // Use profile directory as default, if path is not specified - CallService(MS_DB_GETPROFILEPATHT, (WPARAM)MAX_PATH, (LPARAM)szProfileDir); + CallService(MS_DB_GETPROFILEPATHW, (WPARAM)MAX_PATH, (LPARAM)szProfileDir); ofn.lpstrInitialDir = szProfileDir; ofn.Flags = OFN_PATHMUSTEXIST | OFN_HIDEREADONLY; ofn.lpstrDefExt = L"log"; @@ -141,8 +141,8 @@ void save_settings() db_set_b(NULL, PlugName, "use_pcspeaker", g_settings.use_pcspeaker); db_set_b(NULL, PlugName, "allow_execute", g_settings.allow_execute); db_set_dw(NULL, PlugName, "port", g_settings.port); - db_set_ts(NULL, PlugName, "password", g_settings.password.c_str()); - db_set_ts(NULL, PlugName, "log_filename", g_settings.log_filename.c_str()); + db_set_ws(NULL, PlugName, "password", g_settings.password.c_str()); + db_set_ws(NULL, PlugName, "log_filename", g_settings.log_filename.c_str()); } void load_settings() @@ -156,12 +156,12 @@ void load_settings() g_settings.port = db_get_dw(NULL, PlugName, "port", 12001); DBVARIANT dbv; - if (!db_get_ts(NULL, PlugName, "password", &dbv)) { + if (!db_get_ws(NULL, PlugName, "password", &dbv)) { g_settings.password = dbv.ptszVal; db_free(&dbv); } - if (!db_get_ts(NULL, PlugName, "log_filename", &dbv)) { + if (!db_get_ws(NULL, PlugName, "log_filename", &dbv)) { g_settings.log_filename = dbv.ptszVal; db_free(&dbv); } -- cgit v1.2.3