diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 20:04:13 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2012-06-15 20:04:13 +0000 |
| commit | e521b812384a0e93f48e078c6cb248913dcc893a (patch) | |
| tree | 13b1de3e9bef13a48af0318f1fd338915dd69e9a /plugins/QuickMessages/Utils.c | |
| parent | ae481600939fb5420b80a8a7ef84f0ce9d6b3356 (diff) | |
another portion of "#ifsef Unicode" removal
git-svn-id: http://svn.miranda-ng.org/main/trunk@437 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/QuickMessages/Utils.c')
| -rw-r--r-- | plugins/QuickMessages/Utils.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/plugins/QuickMessages/Utils.c b/plugins/QuickMessages/Utils.c index 8adf1a13bd..41b3710664 100644 --- a/plugins/QuickMessages/Utils.c +++ b/plugins/QuickMessages/Utils.c @@ -474,11 +474,9 @@ TCHAR* ParseString(HANDLE hContact,TCHAR* ptszQValIn,TCHAR* ptszText,TCHAR* ptsz TCHAR* p=NULL;
int NameLenght=0;
TCHAR* ptszName=NULL;
-#ifdef _UNICODE
+
ptszName=mir_a2u((char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0));
-#else
- ptszName=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-#endif
+
NameLenght=(int)_tcslen(ptszName);
p=realloc(tempQValue, (QVSize+NameLenght+1)*sizeof(TCHAR));
@@ -538,11 +536,9 @@ TCHAR* ParseString(HANDLE hContact,TCHAR* ptszQValIn,TCHAR* ptszText,TCHAR* ptsz ZeroMemory(&ci,sizeof(CONTACTINFO));
ci.cbSize = sizeof(CONTACTINFO);
ci.hContact = hContact;
-#ifdef UNICODE
+
ci.dwFlag =CNF_FIRSTNAME|CNF_UNICODE;
-#else
- ci.dwFlag =CNF_FIRSTNAME;
-#endif
+
ci.szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)&&ci.pszVal){
NameLenght=(int)_tcslen(ci.pszVal);
@@ -578,11 +574,9 @@ TCHAR* ParseString(HANDLE hContact,TCHAR* ptszQValIn,TCHAR* ptszText,TCHAR* ptsz ci.cbSize = sizeof(CONTACTINFO);
ci.hContact = hContact;
ci.szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
-#ifdef UNICODE
+
ci.dwFlag =CNF_LASTNAME|CNF_UNICODE;
-#else
- ci.dwFlag =CNF_LASTNAME;
-#endif
+
if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)&&ci.pszVal){
NameLenght=(int)_tcslen(ci.pszVal);
ptszName=ci.pszVal;
|