popup code cleaning (cause we have no tchar.h)

2 files changed, 21 insertions, 21 deletions

diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp
index 276d45ef4b..5df4bf076a 100644
--- a/plugins/YAMN/src/browser/badconnect.cpp
+++ b/plugins/YAMN/src/browser/badconnect.cpp
@@ -85,7 +85,7 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg, UINT msg, WPARAM wParam, LP
 			char* TitleStrA;

 			char *Message1A = nullptr;

 			wchar_t *Message1W = nullptr;

-			POPUPDATAT BadConnectPopup;

+			POPUPDATAW BadConnectPopup;

 

 			ActualAccount = ((struct BadConnectionParam *)lParam)->account;

 			ErrorCode = ((struct BadConnectionParam *)lParam)->errcode;

@@ -117,29 +117,29 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg, UINT msg, WPARAM wParam, LP
 

 				BadConnectPopup.PluginWindowProc = BadConnectPopupProc;

 				BadConnectPopup.PluginData = ActualAccount;

-				mir_wstrncpy(BadConnectPopup.lptzContactName, _A2T(ActualAccount->Name), _countof(BadConnectPopup.lptzContactName));

+				mir_wstrncpy(BadConnectPopup.lpwzContactName, _A2T(ActualAccount->Name), _countof(BadConnectPopup.lpwzContactName));

 			}

 

 			if (ActualAccount->Plugin->Fcn != nullptr && ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr != nullptr) {

 				Message1W = ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr(ErrorCode);

 				SetDlgItemText(hDlg, IDC_STATICMSG, Message1W);

-				wcsncpy_s(BadConnectPopup.lptzText, Message1W, _TRUNCATE);

+				wcsncpy_s(BadConnectPopup.lpwzText, Message1W, _TRUNCATE);

 				if (ShowPopup)

-					PUAddPopupT(&BadConnectPopup);

+					PUAddPopupW(&BadConnectPopup);

 			}

 			else if (ActualAccount->Plugin->Fcn != nullptr && ActualAccount->Plugin->Fcn->GetErrorStringAFcnPtr != nullptr) {

 				Message1W = ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr(ErrorCode);

 				SetDlgItemText(hDlg, IDC_STATICMSG, Message1W);

-				wcsncpy_s(BadConnectPopup.lptzText, Message1W, _TRUNCATE);

+				wcsncpy_s(BadConnectPopup.lpwzText, Message1W, _TRUNCATE);

 				if (ShowPopup)

-					PUAddPopupT(&BadConnectPopup);

+					PUAddPopupW(&BadConnectPopup);

 			}

 			else {

 				Message1W = TranslateT("Unknown error");

 				SetDlgItemText(hDlg, IDC_STATICMSG, Message1W);

-				wcsncpy_s(BadConnectPopup.lptzText, Message1W, _TRUNCATE);

+				wcsncpy_s(BadConnectPopup.lpwzText, Message1W, _TRUNCATE);

 				if (ShowPopup)

-					PUAddPopupT(&BadConnectPopup);

+					PUAddPopupW(&BadConnectPopup);

 			}

 

 			if (!ShowMsg && !ShowIco)

diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp
index 3cb68c9f90..bbac178d15 100644
--- a/plugins/YAMN/src/browser/mailbrowser.cpp
+++ b/plugins/YAMN/src/browser/mailbrowser.cpp
@@ -495,7 +495,7 @@ int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, DWORD nflags)
 		lfoundi = 0;
 	}
 
-	POPUPDATAT NewMailPopup = { 0 };
+	POPUPDATAW NewMailPopup = { 0 };
 	NewMailPopup.lchContact = (ActualAccount->hContact != NULL) ? ActualAccount->hContact : (UINT_PTR)ActualAccount;
 	NewMailPopup.lchIcon = g_LoadIconEx(2);
 	if (nflags & YAMN_ACC_POPC) {
@@ -587,8 +587,8 @@ int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, DWORD nflags)
 		}
 
 		if ((nflags & YAMN_ACC_POP) && (ActualAccount->Flags & YAMN_ACC_POPN) && (msgq->Flags & YAMN_MSG_POPUP) && (msgq->Flags & YAMN_MSG_NEW)) {
-			mir_wstrncpy(NewMailPopup.lptzContactName, FromStr, _countof(NewMailPopup.lptzContactName));
-			mir_wstrncpy(NewMailPopup.lptzText, UnicodeHeader.Subject, _countof(NewMailPopup.lptzText));
+			mir_wstrncpy(NewMailPopup.lpwzContactName, FromStr, _countof(NewMailPopup.lpwzContactName));
+			mir_wstrncpy(NewMailPopup.lpwzText, UnicodeHeader.Subject, _countof(NewMailPopup.lpwzText));
 
 			PYAMN_MAILSHOWPARAM MailParam = (PYAMN_MAILSHOWPARAM)malloc(sizeof(YAMN_MAILSHOWPARAM));
 			if (MailParam) {
@@ -596,7 +596,7 @@ int AddNewMailsToListView(HWND hListView, HACCOUNT ActualAccount, DWORD nflags)
 				MailParam->mail = msgq;
 				MailParam->ThreadRunningEV = nullptr;
 				NewMailPopup.PluginData = MailParam;
-				PUAddPopupT(&NewMailPopup);
+				PUAddPopupW(&NewMailPopup);
 			}
 		}
 
@@ -656,7 +656,7 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
 	if ((nflags & YAMN_ACC_POP) &&
 		!(ActualAccount->Flags & YAMN_ACC_POPN) &&
 		(MN->Real.PopupRun + MN->Virtual.PopupRun)) {
-		POPUPDATAT NewMailPopup = { 0 };
+		POPUPDATAW NewMailPopup = { 0 };
 
 		NewMailPopup.lchContact = (ActualAccount->hContact != NULL) ? ActualAccount->hContact : (UINT_PTR)ActualAccount;
 		NewMailPopup.lchIcon = g_LoadIconEx(2);
@@ -673,9 +673,9 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
 		NewMailPopup.PluginWindowProc = NewMailPopupProc;
 		NewMailPopup.PluginData = (void *)nullptr;	//multiple popups
 
-		mir_wstrncpy(NewMailPopup.lptzContactName, _A2T(ActualAccount->Name), _countof(NewMailPopup.lptzContactName));
-		mir_snwprintf(NewMailPopup.lptzText, TranslateT("%d new mail message(s), %d total"), MN->Real.PopupNC + MN->Virtual.PopupNC, MN->Real.PopupTC + MN->Virtual.PopupTC);
-		PUAddPopupT(&NewMailPopup);
+		mir_wstrncpy(NewMailPopup.lpwzContactName, _A2T(ActualAccount->Name), _countof(NewMailPopup.lpwzContactName));
+		mir_snwprintf(NewMailPopup.lpwzText, TranslateT("%d new mail message(s), %d total"), MN->Real.PopupNC + MN->Virtual.PopupNC, MN->Real.PopupTC + MN->Virtual.PopupTC);
+		PUAddPopupW(&NewMailPopup);
 	}
 
 	// destroy tray icon if no new mail
@@ -744,7 +744,7 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
 			Skin_PlaySound(YAMN_NEWMAILSOUND);
 
 	if ((nnflags & YAMN_ACC_POP) && (MN->Real.PopupRun + MN->Virtual.PopupRun == 0)) {
-		POPUPDATAT NoNewMailPopup;
+		POPUPDATAW NoNewMailPopup;
 
 		NoNewMailPopup.lchContact = (ActualAccount->hContact != NULL) ? ActualAccount->hContact : (UINT_PTR)ActualAccount;
 		NoNewMailPopup.lchIcon = g_LoadIconEx(1);
@@ -761,12 +761,12 @@ void DoMailActions(HWND hDlg, HACCOUNT ActualAccount, struct CMailNumbers *MN, D
 		NoNewMailPopup.PluginWindowProc = NoNewMailPopupProc;
 		NoNewMailPopup.PluginData = nullptr;					//it's not new mail popup
 
-		mir_wstrncpy(NoNewMailPopup.lptzContactName, _A2T(ActualAccount->Name), _countof(NoNewMailPopup.lptzContactName));
+		mir_wstrncpy(NoNewMailPopup.lpwzContactName, _A2T(ActualAccount->Name), _countof(NoNewMailPopup.lpwzContactName));
 		if (MN->Real.PopupSL2NC + MN->Virtual.PopupSL2NC)
-			mir_snwprintf(NoNewMailPopup.lptzText, TranslateT("No new mail message, %d spam(s)"), MN->Real.PopupSL2NC + MN->Virtual.PopupSL2NC);
+			mir_snwprintf(NoNewMailPopup.lpwzText, TranslateT("No new mail message, %d spam(s)"), MN->Real.PopupSL2NC + MN->Virtual.PopupSL2NC);
 		else
-			mir_wstrncpy(NoNewMailPopup.lptzText, TranslateT("No new mail message"), _countof(NoNewMailPopup.lptzText));
-		PUAddPopupT(&NoNewMailPopup);
+			mir_wstrncpy(NoNewMailPopup.lpwzText, TranslateT("No new mail message"), _countof(NoNewMailPopup.lpwzText));
+		PUAddPopupW(&NoNewMailPopup);
 	}
 
 	if ((nflags & YAMN_ACC_CONT) && (MN->Real.PopupRun + MN->Virtual.PopupRun == 0)) {