Fixes for unicode

git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@599 4f64403b-2f21-0410-a795-97e2b3489a10

2 files changed, 10 insertions, 17 deletions

diff --git a/tipper/popwin.cpp b/tipper/popwin.cpp
index 79f6f17..1aac665 100644
--- a/tipper/popwin.cpp
+++ b/tipper/popwin.cpp
@@ -84,14 +84,13 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 					}

 

 					WORD status = CallProtoService(pwd->clcit.proto, PS_GETSTATUS, 0, 0);

-					char *strptr = (char *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, (WPARAM)status, (LPARAM)0);

-					if(strptr) {

-						TCHAR *swzText = a2t(strptr);

-

+					TCHAR *strptr = (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, status, GSMDF_TCHAR);

+					if (strptr) 

+					{

 						pwd->rows = (RowData *) realloc(pwd->rows, sizeof(RowData) * (pwd->row_count + 1));								

 

 						pwd->rows[pwd->row_count].swzLabel = _tcsdup(TranslateT("Status:"));

-						pwd->rows[pwd->row_count].swzValue = swzText;

+						pwd->rows[pwd->row_count].swzValue = strptr;

 						pwd->rows[pwd->row_count].value_newline = false;

 						pwd->rows[pwd->row_count].line_above = false;

 						pwd->row_count++;

@@ -255,15 +254,9 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 					else _tcscpy(pwd->swzTitle, TranslateT("(Unknown)"));

 

 					//get avatar if possible

-					char *proto = (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)pwd->hContact, 0);

-					if(proto) {

-						char svc[256];

-						mir_snprintf(svc, 256, "%s%s", proto, PS_GETAVATARINFO);

-						PROTO_AVATAR_INFORMATION AI = {0};

-						AI.cbSize = sizeof(AI);

-						AI.hContact = pwd->hContact;

-						CallService(svc, 0, (LPARAM)&AI);

-					}

+					PROTO_AVATAR_INFORMATION AI = { sizeof(AI),  pwd->hContact };

+					char *szProto = (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)pwd->hContact, 0);

+					CallProtoService(szProto, PS_GETAVATARINFO, GAIF_FORCE, (LPARAM)&AI);

 					SendMessage(hwnd, PUM_REFRESH_VALUES, 0, 0);

 				}

 			}

@@ -316,9 +309,10 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 				GetClientRect(hwnd, &r); 

 				

 				// bg

-				if(options.bg_fn[0]) {

+				if (options.bg_fn[0])

+				{

 					BITMAP bm;

-					HBITMAP hBg = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)options.bg_fn, (LPARAM)IMGL_WCHAR);		

+					HBITMAP hBg = (HBITMAP)CallService(MS_IMG_LOAD, (WPARAM)options.bg_fn, IMGL_TCHAR);		

 					if(hBg) {

 						HDC hdcMem = CreateCompatibleDC(hdc);

 						HBITMAP hbmOld = (HBITMAP)SelectObject(hdcMem, hBg);

diff --git a/tipper/tipper.cpp b/tipper/tipper.cpp
index 72e562a..98ca543 100644
--- a/tipper/tipper.cpp
+++ b/tipper/tipper.cpp
@@ -190,7 +190,6 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	HookEvent(ME_FONT_RELOAD, ReloadFont);

 

 	hAvChangeEvent = HookEvent(ME_AV_AVATARCHANGED, AvatarChanged);

-	hAvContactChangeEvent = HookEvent(ME_AV_CONTACTAVATARCHANGED, AvatarChanged);

 	hShowTipEvent = HookEvent(ME_CLC_SHOWINFOTIP, ShowTipHook);

 	hHideTipEvent = HookEvent(ME_CLC_HIDEINFOTIP, HideTipHook);

 	hAckEvent = HookEvent(ME_PROTO_ACK, ProtoAck);