less TCHARs

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

3 files changed, 19 insertions, 19 deletions

diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
index 51371d27fc..e62f6c83b9 100644
--- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp
+++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp
@@ -76,11 +76,11 @@ BOOL strrep(wchar_t *src, wchar_t *needle, wchar_t *newstring)
 	wcsncpy_s(begining, src, pos);

 	begining[pos] = 0;

 

-	pos = pos + mir_tstrlen(needle);

+	pos = pos + mir_wstrlen(needle);

 	wcsncpy_s(tail, src + pos, _TRUNCATE);

 	begining[pos] = 0;

 

-	pos = mir_sntprintf(src, mir_tstrlen(src), L"%s%s%s", begining, newstring, tail);

+	pos = mir_snwprintf(src, mir_wstrlen(src), L"%s%s%s", begining, newstring, tail);

 	return TRUE;

 }

 

@@ -194,16 +194,16 @@ void fillExceptionsListView(HWND hwndDlg)
 		ListView_InsertItem(hwndList, &lvI);

 		lvI.iSubItem = 1;

 		if (tmp->intIntPort == -1)

-			mir_sntprintf(tmpAddress, L"%s:*", tmp->strIntIp);

+			mir_snwprintf(tmpAddress, L"%s:*", tmp->strIntIp);

 		else

-			mir_sntprintf(tmpAddress, L"%s:%d", tmp->strIntIp, tmp->intIntPort);

+			mir_snwprintf(tmpAddress, L"%s:%d", tmp->strIntIp, tmp->intIntPort);

 		lvI.pszText = tmpAddress;

 		ListView_SetItem(hwndList, &lvI);

 		lvI.iSubItem = 2;

 		if (tmp->intExtPort == -1)

-			mir_sntprintf(tmpAddress, L"%s:*", tmp->strExtIp);

+			mir_snwprintf(tmpAddress, L"%s:*", tmp->strExtIp);

 		else

-			mir_sntprintf(tmpAddress, L"%s:%d", tmp->strExtIp, tmp->intExtPort);

+			mir_snwprintf(tmpAddress, L"%s:%d", tmp->strExtIp, tmp->intExtPort);

 		lvI.pszText = tmpAddress;

 		ListView_SetItem(hwndList, &lvI);

 		lvI.iSubItem = 3;

@@ -298,9 +298,9 @@ INT_PTR CALLBACK DlgProcConnectionNotifyOpts(HWND hwndDlg, UINT msg, WPARAM wPar
 			bOptionsOpen = TRUE;

 			TranslateDialogDefault(hwndDlg);//translate miranda function

 			#ifdef _WIN64

-			mir_sntprintf(buff, L"%d.%d.%d.%d/64", HIBYTE(HIWORD(pluginInfo.version)), LOBYTE(HIWORD(pluginInfo.version)), HIBYTE(LOWORD(pluginInfo.version)), LOBYTE(LOWORD(pluginInfo.version)));

+			mir_snwprintf(buff, L"%d.%d.%d.%d/64", HIBYTE(HIWORD(pluginInfo.version)), LOBYTE(HIWORD(pluginInfo.version)), HIBYTE(LOWORD(pluginInfo.version)), LOBYTE(LOWORD(pluginInfo.version)));

 			#else

-			mir_sntprintf(buff, L"%d.%d.%d.%d/32", HIBYTE(HIWORD(pluginInfo.version)), LOBYTE(HIWORD(pluginInfo.version)), HIBYTE(LOWORD(pluginInfo.version)), LOBYTE(LOWORD(pluginInfo.version)));

+			mir_snwprintf(buff, L"%d.%d.%d.%d/32", HIBYTE(HIWORD(pluginInfo.version)), LOBYTE(HIWORD(pluginInfo.version)), HIBYTE(LOWORD(pluginInfo.version)), LOBYTE(LOWORD(pluginInfo.version)));

 			#endif

 			SetDlgItemText(hwndDlg, IDC_VERSION, buff);

 			LoadSettings();

@@ -699,7 +699,7 @@ static unsigned __stdcall checkthread(void *)
 

 				#ifdef _DEBUG

 				wchar_t msg[1024];

-				mir_sntprintf(msg, L"%s:%d\n%s:%d", cur->strIntIp, cur->intIntPort, cur->strExtIp, cur->intExtPort);

+				mir_snwprintf(msg, L"%s:%d\n%s:%d", cur->strIntIp, cur->intIntPort, cur->strExtIp, cur->intExtPort);

 				_OutputDebugString(L"New connection: %s", msg);

 				#endif

 				pid2name(cur->Pid, cur->PName, _countof(cur->PName));

@@ -769,7 +769,7 @@ void showMsg(wchar_t *pName, DWORD pid, wchar_t *intIp, wchar_t *extIp, int intP
 	//99% of the times you'll just copy this line.

 	//1% of the times you may wish to change the contact's name. I don't know why you should, but you can.

 	//char * lpzText;

-	//The text for the second line. You could even make something like: char lpzText[128]; mir_tstrcpy(lpzText, "Hello world!"); It's your choice.

+	//The text for the second line. You could even make something like: char lpzText[128]; mir_wstrcpy(lpzText, "Hello world!"); It's your choice.

 

 	struct CONNECTION *mpd = (struct CONNECTION*)mir_alloc(sizeof(struct CONNECTION));

 	//MessageBox(NULL,"aaa","aaa",1);

@@ -779,11 +779,11 @@ void showMsg(wchar_t *pName, DWORD pid, wchar_t *intIp, wchar_t *extIp, int intP
 	if (settingResolveIp) {

 		wchar_t hostName[128];

 		getDnsName(extIp, hostName, _countof(hostName));

-		mir_sntprintf(ppd.lptzText, L"%s:%d\n%s:%d", hostName, extPort, intIp, intPort);

+		mir_snwprintf(ppd.lptzText, L"%s:%d\n%s:%d", hostName, extPort, intIp, intPort);

 	}

-	else mir_sntprintf(ppd.lptzText, L"%s:%d\n%s:%d", extIp, extPort, intIp, intPort);

+	else mir_snwprintf(ppd.lptzText, L"%s:%d\n%s:%d", extIp, extPort, intIp, intPort);

 

-	mir_sntprintf(ppd.lptzContactName, L"%s (%s)", pName, tcpStates[state - 1]);

+	mir_snwprintf(ppd.lptzContactName, L"%s (%s)", pName, tcpStates[state - 1]);

 

 	if (settingSetColours) {

 		ppd.colorBack = settingBgColor;

diff --git a/plugins/ConnectionNotify/src/filter.cpp b/plugins/ConnectionNotify/src/filter.cpp
index f0c40dfed8..db9b205e0f 100644
--- a/plugins/ConnectionNotify/src/filter.cpp
+++ b/plugins/ConnectionNotify/src/filter.cpp
@@ -133,7 +133,7 @@ static INT_PTR CALLBACK ConnectionFilterEditProc(HWND hWnd, UINT message, WPARAM
 BOOL checkFilter(struct CONNECTION *head, struct CONNECTION *conn)

 {

 	for (struct CONNECTION *cur = head; cur != NULL; cur = cur->next)

-		if (wildcmpt(conn->PName, cur->PName) && wildcmpt(conn->strIntIp, cur->strIntIp) && wildcmpt(conn->strExtIp, cur->strExtIp)

+		if (wildcmpw(conn->PName, cur->PName) && wildcmpw(conn->strIntIp, cur->strIntIp) && wildcmpw(conn->strExtIp, cur->strExtIp)

 			&& (cur->intIntPort == -1 || cur->intIntPort == conn->intIntPort) && (cur->intExtPort == -1 || cur->intExtPort == conn->intExtPort))

 			return cur->Pid;

 

diff --git a/plugins/ConnectionNotify/src/netstat.cpp b/plugins/ConnectionNotify/src/netstat.cpp
index a9827bf7f4..663e22a16e 100644
--- a/plugins/ConnectionNotify/src/netstat.cpp
+++ b/plugins/ConnectionNotify/src/netstat.cpp
@@ -41,14 +41,14 @@ struct CONNECTION *GetConnectionsTable()
 		if (pTcpTable->table[i].dwLocalAddr) {
 			IpAddr.S_un.S_addr = (ULONG)pTcpTable->table[i].dwLocalAddr;
 			//_snprintf(newConn->strIntIp,_countof(newConn->strIntIp),"%d.%d.%d.%d",IpAddr.S_un.S_un_b.s_b1,IpAddr.S_un.S_un_b.s_b2,IpAddr.S_un.S_un_b.s_b3,IpAddr.S_un.S_un_b.s_b4);
-			wchar_t *strIntIp = mir_a2t(inet_ntoa(IpAddr));
+			wchar_t *strIntIp = mir_a2u(inet_ntoa(IpAddr));
 			wcsncpy(newConn->strIntIp, strIntIp, _countof(newConn->strIntIp) - 1);
 			mir_free(strIntIp);
 		}
 
 		if (pTcpTable->table[i].dwRemoteAddr) {
 			IpAddr.S_un.S_addr = (u_long)pTcpTable->table[i].dwRemoteAddr;
-			wchar_t *strExtIp = mir_a2t(inet_ntoa(IpAddr));
+			wchar_t *strExtIp = mir_a2u(inet_ntoa(IpAddr));
 			wcsncpy(newConn->strExtIp, strExtIp, _countof(newConn->strExtIp) - 1);
 			mir_free(strExtIp);
 		}
@@ -126,8 +126,8 @@ void deleteConnectionsTable(struct CONNECTION *head)
 struct CONNECTION *searchConnection(struct CONNECTION *head, wchar_t *intIp, wchar_t *extIp, int intPort, int extPort, int state)
 {
 	for (struct CONNECTION *cur = head; cur != NULL; cur = cur->next) {
-		if (mir_tstrcmp(cur->strIntIp, intIp) == 0 &&
-			mir_tstrcmp(cur->strExtIp, extIp) == 0 &&
+		if (mir_wstrcmp(cur->strIntIp, intIp) == 0 &&
+			mir_wstrcmp(cur->strExtIp, extIp) == 0 &&
 			cur->intExtPort == extPort &&
 			cur->intIntPort == intPort &&
 			cur->state == state)
@@ -140,7 +140,7 @@ void getDnsName(wchar_t *strIp, wchar_t *strHostName, size_t len)
 {
 	in_addr iaHost;
 
-	char *szStrIP = mir_t2a(strIp);
+	char *szStrIP = mir_u2a(strIp);
 	iaHost.s_addr = inet_addr(szStrIP);
 	mir_free(szStrIP);
 	hostent *h = gethostbyaddr((char *)&iaHost, sizeof(struct in_addr), AF_INET);