unicode

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

2 files changed, 17 insertions, 21 deletions

diff --git a/plugins/Chat/src/main.cpp b/plugins/Chat/src/main.cpp
index 66e0e8282f..1c46524fec 100644
--- a/plugins/Chat/src/main.cpp
+++ b/plugins/Chat/src/main.cpp
@@ -83,18 +83,18 @@ extern "C" __declspec(dllexport) int Load(void)
 	// set the memory & utf8 managers

 	mir_getLP( &pluginInfo );

 

-	HINSTANCE hDll = LoadLibraryA("riched20.dll");

+	HINSTANCE hDll = LoadLibrary(_T("riched20.dll"));

 	if ( hDll ) {

-		char modulePath[MAX_PATH];

-		if (GetModuleFileNameA(hDll, modulePath, MAX_PATH)) {

+		TCHAR modulePath[MAX_PATH];

+		if (GetModuleFileName(hDll, modulePath, MAX_PATH)) {

 			DWORD dummy;

 			VS_FIXEDFILEINFO* vsInfo;

 			UINT vsInfoSize;

-			DWORD size = GetFileVersionInfoSizeA(modulePath, &dummy);

+			DWORD size = GetFileVersionInfoSize(modulePath, &dummy);

 			BYTE* buffer = (BYTE*) mir_alloc(size);

 

-			if (GetFileVersionInfoA(modulePath, 0, size, buffer))

-                if (VerQueryValueA(buffer, "\\", (LPVOID*) &vsInfo, &vsInfoSize))

+			if (GetFileVersionInfo(modulePath, 0, size, buffer))

+                if (VerQueryValue(buffer, _T("\\"), (LPVOID*) &vsInfo, &vsInfoSize))

                     if (LOWORD(vsInfo->dwFileVersionMS) != 0)

                         bFlag= TRUE;

 			mir_free(buffer);

@@ -102,7 +102,7 @@ extern "C" __declspec(dllexport) int Load(void)
 

 	if ( !bFlag ) {

 		if (IDYES == MessageBox(0, TranslateT("Miranda could not load the Chat plugin because Microsoft Rich Edit v 3 is missing.\nIf you are using Windows 95/98/NT or WINE please upgrade your Rich Edit control.\n\nDo you want to download an update now?."),TranslateT("Information"),MB_YESNO|MB_ICONINFORMATION))

-			CallService(MS_UTILS_OPENURL, 1, (LPARAM) "http://members.chello.se/matrix/re3/richupd.exe");

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW|OUF_TCHAR, (LPARAM) _T("http://members.chello.se/matrix/re3/richupd.exe"));

 		FreeLibrary(GetModuleHandleA("riched20.dll"));

 		return 1;

 	}

@@ -137,7 +137,7 @@ extern "C" __declspec(dllexport) int Unload(void)
 	DestroyHookableEvents();

 	FreeIcons();

 	OptionsUnInit();

-	FreeLibrary(GetModuleHandleA("riched20.dll"));

+	FreeLibrary(GetModuleHandle(_T("riched20.dll")));

 	UnhookEvents();

 	return 0;

 }

diff --git a/plugins/Chat/src/window.cpp b/plugins/Chat/src/window.cpp
index 2bb493ca49..ccddae051b 100644
--- a/plugins/Chat/src/window.cpp
+++ b/plugins/Chat/src/window.cpp
@@ -2295,10 +2295,10 @@ LABEL_SHOWWINDOW:
 

 					case ID_SEARCH_GOOGLE:

 						{

-							char szURL[4096];

+							TCHAR szURL[4096];

 							if (pszWord[0]) {

-								mir_snprintf( szURL, sizeof( szURL ), "http://www.google.com/search?q=" TCHAR_STR_PARAM, pszWord );

-								CallService(MS_UTILS_OPENURL, 1, (LPARAM) szURL);

+								mir_sntprintf( szURL, SIZEOF( szURL ), _T("http://www.google.com/search?q=%s"), pszWord );

+								CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW|OUF_TCHAR, (LPARAM) szURL);

 							}

 							PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0 );

 						}

@@ -2306,10 +2306,10 @@ LABEL_SHOWWINDOW:
 

 					case ID_SEARCH_WIKIPEDIA:

 						{

-							char szURL[4096];

+							TCHAR szURL[4096];

 							if (pszWord[0]) {

-								mir_snprintf( szURL, sizeof( szURL ), "http://en.wikipedia.org/wiki/" TCHAR_STR_PARAM, pszWord );

-								CallService(MS_UTILS_OPENURL, 1, (LPARAM) szURL);

+								mir_sntprintf( szURL, SIZEOF( szURL ), _T("http://en.wikipedia.org/wiki/%s"), pszWord );

+								CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW|OUF_TCHAR, (LPARAM) szURL);

 							}

 							PostMessage(hwndDlg, WM_MOUSEACTIVATE, 0, 0 );

 						}

@@ -2333,7 +2333,6 @@ LABEL_SHOWWINDOW:
 						{

 							TEXTRANGE tr;

 							CHARRANGE sel;

-							char* pszUrl;

 

 							SendMessage(pNmhdr->hwndFrom, EM_EXGETSEL, 0, (LPARAM) & sel);

 							if (sel.cpMin != sel.cpMax)

@@ -2341,7 +2340,6 @@ LABEL_SHOWWINDOW:
 							tr.chrg = ((ENLINK *) lParam)->chrg;

 							tr.lpstrText = (LPTSTR)mir_alloc(sizeof(TCHAR)*(tr.chrg.cpMax - tr.chrg.cpMin + 1));

 							SendMessage(pNmhdr->hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM) & tr);

-							pszUrl = mir_t2a( tr.lpstrText );

 

 							if (((ENLINK *) lParam)->msg == WM_RBUTTONDOWN) {

 								HMENU hSubMenu;

@@ -2354,11 +2352,11 @@ LABEL_SHOWWINDOW:
 								ClientToScreen(((NMHDR *) lParam)->hwndFrom, &pt);

 								switch (TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL)) {

 								case ID_NEW:

-									CallService(MS_UTILS_OPENURL, 1, (LPARAM) pszUrl);

+									CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW|OUF_TCHAR, (LPARAM) tr.lpstrText);

 									break;

 

 								case ID_CURR:

-									CallService(MS_UTILS_OPENURL, 0, (LPARAM) pszUrl);

+									CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM) tr.lpstrText);

 									break;

 

 								case ID_COPY:

@@ -2376,14 +2374,12 @@ LABEL_SHOWWINDOW:
 										break;

 								}	}

 								mir_free(tr.lpstrText);

-								mir_free(pszUrl);

 								return TRUE;

 							}

 

-							CallService(MS_UTILS_OPENURL, 1, (LPARAM) pszUrl);

+							CallService(MS_UTILS_OPENURL, OUF_TCHAR|OUF_NEWWINDOW, (LPARAM) tr.lpstrText);

 							SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGE));

 							mir_free(tr.lpstrText);

-							mir_free(pszUrl);

 							break;

 				}	}	}

 				break;