diff options
Diffstat (limited to 'worldtime_protocol/time_display.cpp')
| -rw-r--r-- | worldtime_protocol/time_display.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/worldtime_protocol/time_display.cpp b/worldtime_protocol/time_display.cpp index f49cde7..064ff45 100644 --- a/worldtime_protocol/time_display.cpp +++ b/worldtime_protocol/time_display.cpp @@ -43,9 +43,9 @@ void UnloadFonts() { typedef struct WindowData_tag {
HANDLE hContact;
int timezone_list_index;
- char time_buff[32];
- char date_buff[128];
- char nick_buff[256];
+ TCHAR time_buff[32];
+ TCHAR date_buff[128];
+ TCHAR nick_buff[256];
TIME_ZONE_INFORMATION tzi;
} WindowData;
@@ -77,10 +77,10 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP RECT br = r, lr = r;
br.bottom -= (r.bottom - r.top) / 4;
oldFont = (HFONT)SelectObject(hdc, hBigFont);
- DrawText(hdc, wd->time_buff, (int)strlen(wd->time_buff), &br, DT_SINGLELINE | DT_VCENTER | DT_CENTER);
+ DrawText(hdc, wd->time_buff, (int)_tcslen(wd->time_buff), &br, DT_SINGLELINE | DT_VCENTER | DT_CENTER);
SelectObject(hdc, hNormalFont);
lr.top = (r.bottom - r.top) * 3 / 4;
- DrawText(hdc, wd->date_buff, (int)strlen(wd->date_buff), &lr, DT_SINGLELINE | DT_VCENTER | DT_CENTER);
+ DrawText(hdc, wd->date_buff, (int)_tcslen(wd->date_buff), &lr, DT_SINGLELINE | DT_VCENTER | DT_CENTER);
SelectObject(hdc, oldFont);
}
@@ -104,10 +104,10 @@ INT_PTR CALLBACK DlgProcDisplay(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &other_st, 0, wd->date_buff, 128);
if(IsIconic(hwndDlg)) {
- char buff[255 + 32];
- strcpy(buff, wd->nick_buff);
- strcat(buff, " - ");
- strcat(buff, wd->time_buff);
+ TCHAR buff[255 + 32];
+ _tcscpy(buff, wd->nick_buff);
+ _tcscat(buff, _T(" - "));
+ _tcscat(buff, wd->time_buff);
SetWindowText(hwndDlg, buff);
} else
SetWindowText(hwndDlg, wd->nick_buff);
@@ -159,9 +159,9 @@ int show_time(HANDLE hContact) { wd->tzi.StandardDate = timezone_list[wd->timezone_list_index].TZI.StandardDate;
DBVARIANT dbv;
- if(!DBGetContactSetting(wd->hContact, PROTO, "Nick", &dbv)) {
- strncpy(wd->nick_buff, dbv.pszVal, 255);
- SetWindowText(hwnd, dbv.pszVal);
+ if(!DBGetContactSettingTString(wd->hContact, PROTO, "Nick", &dbv)) {
+ _tcsncpy(wd->nick_buff, dbv.ptszVal, 255);
+ SetWindowText(hwnd, dbv.ptszVal);
DBFreeVariant(&dbv);
}
@@ -188,7 +188,7 @@ void time_windows_cleanup() { while ( hContact != NULL )
{
proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
- if (proto && lstrcmp( PROTO, proto) == 0) {
+ if (proto && strcmp( PROTO, proto) == 0) {
if((hwnd = (HWND)DBGetContactSettingDword(hContact, PROTO, "WindowHandle", 0)) != 0) {
DestroyWindow(hwnd);
DBWriteContactSettingByte(hContact, PROTO, "WindowWasOpen", 1);
@@ -208,7 +208,7 @@ void time_windows_init() { while ( hContact != NULL )
{
char* proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
- if (proto && lstrcmp( PROTO, proto) == 0)
+ if (proto && strcmp( PROTO, proto) == 0)
{
if (DBGetContactSettingByte(hContact, PROTO, "WindowWasOpen", 0) != 0)
{
@@ -217,17 +217,17 @@ void time_windows_init() { }
DBVARIANT dbv;
- if (!DBGetContactSetting(hContact, PROTO, "TZName", &dbv))
+ if (!DBGetContactSettingTString(hContact, PROTO, "TZName", &dbv))
{
int list_index = DBGetContactSettingDword(hContact, PROTO, "TimezoneListIndex", -1);
if (list_index < 0 || list_index >= timezone_list.getCount())
list_index = 0;
- if (strcmp(timezone_list[list_index].tcName, dbv.pszVal))
+ if (_tcscmp(timezone_list[list_index].tcName, dbv.ptszVal))
{
for (int j = 0; j < timezone_list.getCount(); ++j)
{
- if (!strcmp(timezone_list[j].tcName, dbv.pszVal))
+ if (!_tcscmp(timezone_list[j].tcName, dbv.ptszVal))
{
list_index = j;
break;
|