less TCHARs:

- TCHAR is replaced with wchar_t everywhere;
- LPGENT replaced with either LPGENW or LPGEN;
- fixes for ANSI plugins that improperly used _t functions;
- TCHAR *t removed from MAllStrings;
- ptszGroup, ptszTitle & ptszTab in OPTIONSDIALOGPAGE replaced with pwsz*

git-svn-id: http://svn.miranda-ng.org/main/trunk@17133 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 21 insertions, 21 deletions

diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp
index c03a5a75db..b70724c993 100644
--- a/plugins/UserInfoEx/src/dlg_propsheet.cpp
+++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp
@@ -268,7 +268,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM)
 	metrics.x = GetSystemMetrics(SM_CXSMICON);

 	metrics.y = GetSystemMetrics(SM_CYSMICON);

 	if ((psh._hImages = ImageList_Create(metrics.x, metrics.y, ILC_COLOR32 | ILC_MASK, 0, 1)) == NULL) {

-		MsgErr(NULL, LPGENT("Creating the image list failed!"));

+		MsgErr(NULL, LPGENW("Creating the image list failed!"));

 		return 1;

 	}

 

@@ -291,7 +291,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM)
 		// get contact's protocol

 		psh._pszPrefix = psh._pszProto = Proto_GetBaseAccountName(wParam);

 		if (psh._pszProto == NULL) {

-			MsgErr(NULL, LPGENT("Could not find contact's protocol. Maybe it is not active!"));

+			MsgErr(NULL, LPGENW("Could not find contact's protocol. Maybe it is not active!"));

 			return 1;

 		}

 		// prepare scanning for metacontact's subcontact's pages

@@ -302,7 +302,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM)
 	// add the pages

 	NotifyEventHooks(g_hDetailsInitEvent, (WPARAM)&psh, wParam);

 	if (!psh._pPages || !psh._numPages) {

-		MsgErr(NULL, LPGENT("No pages have been added. Canceling dialog creation!"));

+		MsgErr(NULL, LPGENW("No pages have been added. Canceling dialog creation!"));

 		return 1;

 	}

 

@@ -330,7 +330,7 @@ static INT_PTR ShowDialog(WPARAM wParam, LPARAM)
 

 	// create the dialog itself

 	if (!CreateDialogParam(ghInst, MAKEINTRESOURCE(IDD_DETAILS), NULL, DlgProc, (LPARAM)&psh))

-		MsgErr(NULL, LPGENT("Details dialog failed to be created. Returning error is %d."), GetLastError());

+		MsgErr(NULL, LPGENW("Details dialog failed to be created. Returning error is %d."), GetLastError());

 	return 0;

 }

 

@@ -356,7 +356,7 @@ static INT_PTR AddPage(WPARAM wParam, LPARAM lParam)
 

 	if (pPsh->_dwFlags & (PSF_PROTOPAGESONLY | PSF_PROTOPAGESONLY_INIT)) {

 		BYTE bIsUnicode = (odp->flags & ODPF_UNICODE) == ODPF_UNICODE;

-		TCHAR *ptszTitle = bIsUnicode ? mir_tstrdup(odp->ptszTitle) : mir_a2t(odp->pszTitle);

+		wchar_t *ptszTitle = bIsUnicode ? mir_tstrdup(odp->pwszTitle) : mir_a2t(odp->pszTitle);

 

 		// avoid adding pages for a meta subcontact, which have been added for a metacontact.

 		if (pPsh->_dwFlags & PSF_PROTOPAGESONLY) {

@@ -428,65 +428,65 @@ static int OnShutdown(WPARAM, LPARAM)
 **/

 static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProto = NULL)

 {

-	TCHAR szTitle[MAX_PATH];

+	wchar_t szTitle[MAX_PATH];

 	const BYTE ofs = (pszProto) ? mir_sntprintf(szTitle, L"%S\\", pszProto) : 0;

 

-	odp.ptszTitle = szTitle;

+	odp.pwszTitle = szTitle;

 	

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_GENERAL);

 	odp.position = 0x8000000;

 	odp.pfnDlgProc = PSPProcGeneral;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_GENERAL);

-	mir_tstrncpy(szTitle + ofs, LPGENT("General"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENW("General"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ADDRESS);

 	odp.position = 0x8000001;

 	odp.pfnDlgProc = PSPProcContactHome;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS);

-	mir_tstrncpy(szTitle + ofs, LPGENT("General") L"\\" LPGENT("Contact (private)"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENW("General") L"\\" LPGENW("Contact (private)"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ORIGIN);

 	odp.position = 0x8000002;

 	odp.pfnDlgProc = PSPProcOrigin;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADVANCED);

-	mir_tstrncpy(szTitle + ofs, LPGENT("General") L"\\" LPGENT("Origin"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENW("General") L"\\" LPGENW("Origin"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 		

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ANNIVERSARY);

 	odp.position = 0x8000003;

 	odp.pfnDlgProc = PSPProcAnniversary;

 	odp.hIcon = (HICON)ICONINDEX(IDI_BIRTHDAY);

-	mir_tstrncpy(szTitle + ofs,  LPGENT("General") L"\\" LPGENT("Anniversaries"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs,  LPGENW("General") L"\\" LPGENW("Anniversaries"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_COMPANY);

 	odp.position = 0x8000004;

 	odp.pfnDlgProc = PSPProcCompany;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_COMPANY);

-	mir_tstrncpy(szTitle + ofs, LPGENT("Work"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENW("Work"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ADDRESS);

 	odp.position = 0x8000005;

 	odp.pfnDlgProc = PSPProcContactWork;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ADDRESS);

-	mir_tstrncpy(szTitle + ofs, LPGENT("Work") L"\\" LPGENT("Contact (work)"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENW("Work") L"\\" LPGENW("Contact (work)"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 		

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT);

 	odp.position = 0x8000006;

 	odp.pfnDlgProc = PSPProcAbout;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_ABOUT);

-	mir_tstrncpy(szTitle + ofs, LPGENT("About"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENW("About"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_PROFILE);

 	odp.position = 0x8000007;

 	odp.pfnDlgProc = PSPProcContactProfile;

 	odp.hIcon = (HICON)ICONINDEX(IDI_TREE_PROFILE);

-	mir_tstrncpy(szTitle + ofs, LPGENT("About") L"\\" LPGENT("Profile"), _countof(szTitle) - ofs);

+	mir_tstrncpy(szTitle + ofs, LPGENW("About") L"\\" LPGENW("Profile"), _countof(szTitle) - ofs);

 	AddPage(wParam, (LPARAM)&odp);

 	return 0;

 }

@@ -508,16 +508,16 @@ static int InitDetails(WPARAM wParam, LPARAM lParam)
 			OPTIONSDIALOGPAGE odp = { 0 };

 			odp.hInstance = ghInst;

 			odp.flags = ODPF_ICON | ODPF_TCHAR;

-			odp.ptszGroup = IcoLib_GetDefaultIconFileName();

+			odp.pwszGroup = IcoLib_GetDefaultIconFileName();

 

 			if (lParam) {

 				// ignore common pages for weather contacts

 				if (!pPsh->_pszProto || _stricmp(pPsh->_pszProto, "weather")) {

 					AddProtocolPages(odp, wParam);

-					odp.ptszTitle = LPGENT("About") L"\\" LPGENT("Notes");

+					odp.pwszTitle = LPGENW("About") L"\\" LPGENW("Notes");

 				}

 				else

-					odp.ptszTitle = LPGENT("Notes");

+					odp.pwszTitle = LPGENW("Notes");

 

 				odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT);

 				odp.position = 0x8000008;

@@ -1218,9 +1218,9 @@ static INT_PTR CALLBACK DlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 			}

 			else if (ack->result == ACKRESULT_FAILED) {

 				MsgBox(hDlg, MB_ICON_WARNING,

-					LPGENT("Upload ICQ details"),

-					LPGENT("Upload failed"),

-					LPGENT("Your details were not uploaded successfully.\nThey were written to database only."));

+					LPGENW("Upload ICQ details"),

+					LPGENW("Upload failed"),

+					LPGENW("Your details were not uploaded successfully.\nThey were written to database only."));

 				KillTimer(hDlg, TIMERID_UPDATING);

 				ShowWindow(GetDlgItem(hDlg, TXT_UPDATING), SW_HIDE);

 				DlgProc(hDlg, M_CHECKONLINE, NULL, NULL);