summaryrefslogtreecommitdiff
path: root/plugins/Exchange
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2016-07-29 12:36:34 +0000
committerGeorge Hazan <george.hazan@gmail.com>2016-07-29 12:36:34 +0000
commit428bf0cbd77813a43094cb5c984436deff251936 (patch)
treed7dfa8971153d53a849e45c942be97fe5b90b7ec /plugins/Exchange
parent82ef17ca5286f58ae7af604fb9518e8dc496b7c3 (diff)
no more TCHARs
git-svn-id: http://svn.miranda-ng.org/main/trunk@17143 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Exchange')
-rw-r--r--plugins/Exchange/src/dlg_handlers.cpp6
-rw-r--r--plugins/Exchange/src/emails.cpp2
-rw-r--r--plugins/Exchange/src/hooked_events.cpp4
-rw-r--r--plugins/Exchange/src/utils.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp
index 93e5cde48f..6a4d7cc15e 100644
--- a/plugins/Exchange/src/dlg_handlers.cpp
+++ b/plugins/Exchange/src/dlg_handlers.cpp
@@ -112,13 +112,13 @@ INT_PTR CALLBACK DlgProcOptions(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
wchar_t buffer[4096];
GetDlgItemText(hWnd, IDC_USER_EDIT, buffer, _countof(buffer));
- db_set_ts(NULL, ModuleName, "Username", buffer);
+ db_set_ws(NULL, ModuleName, "Username", buffer);
GetDlgItemText(hWnd, IDC_PASSWORD_EDIT, buffer, _countof(buffer));
- db_set_ts(NULL, ModuleName, "Password", buffer);
+ db_set_ws(NULL, ModuleName, "Password", buffer);
GetDlgItemText(hWnd, IDC_SERVER_EDIT, buffer, _countof(buffer));
- db_set_ts(NULL, ModuleName, "Server", buffer);
+ db_set_ws(NULL, ModuleName, "Server", buffer);
GetDlgItemText(hWnd, IDC_PORT_EDIT, buffer, _countof(buffer));
db_set_dw(NULL, ModuleName, "Port", GetDlgItemInt(hWnd, IDC_PORT_EDIT, NULL, FALSE));
diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp
index 5f22aa6a29..51fdb00455 100644
--- a/plugins/Exchange/src/emails.cpp
+++ b/plugins/Exchange/src/emails.cpp
@@ -62,7 +62,7 @@ int CExchangeServer::Connect(int bForceConnect)
wchar_t server[1024];
GetStringFromDatabase("Username", L"", user, _countof(user));
- wcsncpy_s(user, VARST(user), _TRUNCATE);
+ wcsncpy_s(user, VARSW(user), _TRUNCATE);
GetStringFromDatabase("Password", L"", password, _countof(password));
GetStringFromDatabase("Server", L"", server, _countof(server));
diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp
index c484e976c3..4d70d44ceb 100644
--- a/plugins/Exchange/src/hooked_events.cpp
+++ b/plugins/Exchange/src/hooked_events.cpp
@@ -65,7 +65,7 @@ int OnModulesLoaded(WPARAM, LPARAM)
mi.hIcolibItem = hiMailIcon;
mi.position = 10000000;
mi.pszService = MS_EXCHANGE_CHECKEMAIL;
- mi.flags = CMIF_TCHAR;
+ mi.flags = CMIF_UNICODE;
mi.name.w = LPGENW("Check exchange mailbox");
Menu_AddMainMenuItem(&mi);
@@ -85,7 +85,7 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM)
odp.pwszTitle = LPGENW("Exchange notify");
odp.pwszGroup = LPGENW("Plugins");
odp.groupPosition = 910000000;
- odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
+ odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcOptions;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp
index e65843eb88..97fc4cca13 100644
--- a/plugins/Exchange/src/utils.cpp
+++ b/plugins/Exchange/src/utils.cpp
@@ -113,7 +113,7 @@ int GetStringFromDatabase(char *szSettingName, wchar_t *szError, wchar_t *szResu
DBVARIANT dbv = { 0 };
int res = 1;
dbv.type = DBVT_ASCIIZ;
- if (db_get_ts(NULL, ModuleName, szSettingName, &dbv) == 0) {
+ if (db_get_ws(NULL, ModuleName, szSettingName, &dbv) == 0) {
res = 0;
size_t tmp = mir_wstrlen(dbv.ptszVal);
size_t len = (tmp < size - 1) ? tmp : size - 1;