x64 port

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

1 files changed, 8 insertions, 8 deletions

diff --git a/yapp/popwin.cpp b/yapp/popwin.cpp
index 1b0aa3e..8ef25fd 100644
--- a/yapp/popwin.cpp
+++ b/yapp/popwin.cpp
@@ -409,7 +409,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 							if(pwd->custom_col) SetTextColor(ps.hdc, pd->colorText);

 							else SetTextColor(ps.hdc, colTime);

 							if(hFontTime) SelectObject(hdc, (HGDIOBJ)hFontTime);

-							DrawText(ps.hdc, pwd->tbuff, _tcslen(pwd->tbuff), &avr, DT_VCENTER | DT_CENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);

+							DrawText(ps.hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &avr, DT_VCENTER | DT_CENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);

 							avr.top = avr.bottom + options.av_padding;

 						}

 

@@ -457,12 +457,12 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 							case PT_LEFT:

 								ttr.left = textxmin; ttr.right = ttr.left + pwd->time_width;

 								textxmin += pwd->time_width + options.padding;

-								DrawText(ps.hdc, pwd->tbuff, _tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);

+								DrawText(ps.hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);

 								break;

 							case PT_RIGHT:

 								ttr.right = textxmax; ttr.left = ttr.right - pwd->time_width;

 								textxmax -= pwd->time_width + options.padding;

-								DrawText(ps.hdc, pwd->tbuff, _tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);

+								DrawText(ps.hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &ttr, DT_VCENTER | DT_LEFT | DT_SINGLELINE | DT_NOPREFIX);

 								break;

 							default:

 								break;

@@ -478,7 +478,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 					

 					if(pwd->custom_col) SetTextColor(ps.hdc, pd->colorText);

 					else SetTextColor(ps.hdc, colFirstLine);

-					DrawTextW(ps.hdc, pd->pwzTitle, wcslen(pd->pwzTitle), &tr, DT_VCENTER | DT_LEFT | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);

+					DrawTextW(ps.hdc, pd->pwzTitle, (int)wcslen(pd->pwzTitle), &tr, DT_VCENTER | DT_LEFT | DT_END_ELLIPSIS | DT_SINGLELINE | DT_NOPREFIX);

 

 					// title underline

 					RECT tur;

@@ -489,7 +489,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 					FillRect(ps.hdc, &tur, pwd->underlineBrush);

 

 					// second line(s)

-					int len_second = wcslen(pd->pwzText);

+					int len_second = (int)wcslen(pd->pwzText);

 					if(len_second) {

 						if(hFontSecondLine) SelectObject(ps.hdc, (HGDIOBJ)hFontSecondLine);

 						if(!pwd->custom_col)

@@ -593,14 +593,14 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 				if(options.time_layout != PT_NONE) {

 					SIZE size_t;

 					if(hFontTime) SelectObject(hdc, (HGDIOBJ)hFontTime);

-					GetTextExtentPoint32(hdc, pwd->tbuff, _tcslen(pwd->tbuff), &size_t);

+					GetTextExtentPoint32(hdc, pwd->tbuff, (int)_tcslen(pwd->tbuff), &size_t);

 					pwd->time_height = size_t.cy;

 					pwd->time_width = size_t.cx;

 				}

 

 				// titlebar height

 				if(hFontFirstLine) SelectObject(hdc, (HGDIOBJ)hFontFirstLine);

-				GetTextExtentPoint32W(hdc, pd->pwzTitle, wcslen(pd->pwzTitle), &size);

+				GetTextExtentPoint32W(hdc, pd->pwzTitle, (int)wcslen(pd->pwzTitle), &size);

 				pwd->tb_height = size.cy;

 				if(options.time_layout == PT_LEFT || options.time_layout == PT_RIGHT) {

 					if(pwd->tb_height < pwd->time_height) pwd->tb_height = pwd->time_height;

@@ -624,7 +624,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lPa
 				}

 

 				// text height

-				int len_second = wcslen(pd->pwzText);

+				int len_second = (int)wcslen(pd->pwzText);

 				if(len_second) {

 					RECT r;

 					r.left = r.top = 0;