From 131975945929c21f78de8343e61d89e359d396c0 Mon Sep 17 00:00:00 2001
From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10>
Date: Mon, 5 Apr 2010 02:42:12 +0000
Subject: Converted x64 version to Unicode

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@489 4f64403b-2f21-0410-a795-97e2b3489a10
---
 worldtime_protocol/timezone_list.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'worldtime_protocol/timezone_list.cpp')

diff --git a/worldtime_protocol/timezone_list.cpp b/worldtime_protocol/timezone_list.cpp
index 2e28bc1..6f1b5a8 100644
--- a/worldtime_protocol/timezone_list.cpp
+++ b/worldtime_protocol/timezone_list.cpp
@@ -13,11 +13,11 @@ void load_listbox_items() {
 	listbox_items.destroy();
 	while ( hContact != NULL ) {
 		proto = ( char* )CallService( MS_PROTO_GETCONTACTBASEPROTO, ( WPARAM )hContact,0 );
-		if ( proto && !lstrcmp( PROTO, proto)) {
+		if ( proto && !strcmp( PROTO, proto)) {
 			pa.hContact = hContact;
-			if(!DBGetContactSetting(pa.hContact, PROTO, "TZName", &dbv)) {
+			if(!DBGetContactSettingTString(pa.hContact, PROTO, "TZName", &dbv)) {
 				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)) {
 						pa.timezone_list_index = timezone_list[j].list_index;
 						break;
 					}
@@ -25,8 +25,8 @@ void load_listbox_items() {
 				DBFreeVariant(&dbv);
 			} else
 				pa.timezone_list_index = DBGetContactSettingDword(pa.hContact, PROTO, "TimezoneListIndex", -1);
-			if(!DBGetContactSetting(pa.hContact, PROTO, "Nick", &dbv)) {
-				strncpy(pa.pszText, dbv.pszVal, MAX_NAME_LENGTH);
+			if(!DBGetContactSettingTString(pa.hContact, PROTO, "Nick", &dbv)) {
+				_tcsncpy(pa.pszText, dbv.ptszVal, MAX_NAME_LENGTH);
 				DBFreeVariant(&dbv);
 			}
 
@@ -50,10 +50,10 @@ void save_listbox_items() {
 			CallService(MS_IGNORE_IGNORE, (WPARAM)listbox_items[i].hContact, (WPARAM)IGNOREEVENT_USERONLINE);
 		}
 
-		DBWriteContactSettingString(listbox_items[i].hContact, PROTO, "Nick", listbox_items[i].pszText);
+		DBWriteContactSettingTString(listbox_items[i].hContact, PROTO, "Nick", listbox_items[i].pszText);
 		DBWriteContactSettingDword(listbox_items[i].hContact, PROTO, "TimezoneListIndex", listbox_items[i].timezone_list_index);
 		DBWriteContactSettingWord(listbox_items[i].hContact, PROTO, "Status", ID_STATUS_ONLINE);
-		DBWriteContactSettingString(listbox_items[i].hContact, PROTO, "TZName", timezone_list[listbox_items[i].timezone_list_index].tcName);
+		DBWriteContactSettingTString(listbox_items[i].hContact, PROTO, "TZName", timezone_list[listbox_items[i].timezone_list_index].tcName);
 	}
 	DBWriteContactSettingWord(0, PROTO, "DataVersion", 1);
 
@@ -63,7 +63,7 @@ void save_listbox_items() {
 	bool found;
 	while ( hContact != NULL ) {
 		proto = ( char* )CallService( MS_PROTO_GETCONTACTBASEPROTO, ( WPARAM )hContact,0 );
-		if ( proto && !lstrcmp( PROTO, proto)) {
+		if ( proto && !strcmp( PROTO, proto)) {
 			found = false;
 			for(int i = 0; i < listbox_items.getCount(); i++) {
 				if(listbox_items[i].hContact == hContact) {
-- 
cgit v1.2.3