arg fixes for MS_UTILS_OPENURL service

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

22 files changed, 32 insertions, 32 deletions

diff --git a/protocols/AimOscar/src/ui.cpp b/protocols/AimOscar/src/ui.cpp
index 5521b00598..e8b06a29ec 100644
--- a/protocols/AimOscar/src/ui.cpp
+++ b/protocols/AimOscar/src/ui.cpp
@@ -1180,7 +1180,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NEWAIMACCOUNTLINK) {

-			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://www.aim.com/redirects/inclient/register.adp");

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://www.aim.com/redirects/inclient/register.adp");

 			return TRUE;

 		}

 

diff --git a/protocols/IcqOscarJ/src/icq_firstrun.cpp b/protocols/IcqOscarJ/src/icq_firstrun.cpp
index ecb28faa31..24da49beb2 100644
--- a/protocols/IcqOscarJ/src/icq_firstrun.cpp
+++ b/protocols/IcqOscarJ/src/icq_firstrun.cpp
@@ -70,7 +70,7 @@ INT_PTR CALLBACK icq_FirstRunDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 	case WM_COMMAND:

 		switch (LOWORD(wParam)) {

 		case IDC_REGISTER:

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

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)URL_REGISTER);

 			break;

 

 		case IDC_UIN:

diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp
index 916bbfb503..11aa521a24 100644
--- a/protocols/IcqOscarJ/src/icq_menu.cpp
+++ b/protocols/IcqOscarJ/src/icq_menu.cpp
@@ -178,7 +178,7 @@ INT_PTR CIcqProto::OpenWebProfile(WPARAM hContact, LPARAM lParam)
 	DWORD dwUin = getContactUin(hContact);

 	char url[256];

 	mir_snprintf(url, SIZEOF(url), "http://www.icq.com/people/%d",dwUin);

-	return CallService(MS_UTILS_OPENURL, 1, (LPARAM)url);

+	return CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)url);

 }

 

 

diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp
index 87c2a451cd..f3ee67e25a 100644
--- a/protocols/IcqOscarJ/src/icq_opts.cpp
+++ b/protocols/IcqOscarJ/src/icq_opts.cpp
@@ -107,11 +107,11 @@ static INT_PTR CALLBACK DlgProcIcqOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 	case WM_COMMAND:

 		switch (LOWORD(wParam)) {

 		case IDC_LOOKUPLINK:

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

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)URL_FORGOT_PASSWORD);

 			return TRUE;

 

 		case IDC_NEWUINLINK:

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

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)URL_REGISTER);

 			return TRUE;

 

 		case IDC_RESETSERVER:

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 529d78dbfb..29cb943a52 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -1340,7 +1340,7 @@ static void sttLogListHook(CJabberProto *ppro, JABBER_LIST_ITEM *item, GCHOOK* g
 				char *bufPtr, *url = mir_t2a(p);

 				for (bufPtr = url; *bufPtr && !isspace(*bufPtr); ++bufPtr) ;

 				*bufPtr++ = 0;

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

+				CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)url);

 				mir_free(url);

 				break;

 			}

diff --git a/protocols/MRA/src/MraMPop.cpp b/protocols/MRA/src/MraMPop.cpp
index 18667f1d72..4855d5bd10 100644
--- a/protocols/MRA/src/MraMPop.cpp
+++ b/protocols/MRA/src/MraMPop.cpp
@@ -73,7 +73,7 @@ DWORD CMraProto::MraMPopSessionQueueAddUrl(HANDLE hMPopSessionQueue, const CMStr
 	MRA_MPOP_SESSION_QUEUE_ITEM *pmpsqi;

 

 	if (!getByte("AutoAuthOnWebServices", MRA_DEFAULT_AUTO_AUTH_ON_WEB_SVCS) || !m_bLoggedIn) { /* Open without web auth. / Not loggedIn. */

-		CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)lpszUrl.c_str());

+		CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)lpszUrl.c_str());

 		return NO_ERROR;

 	}

 	/* Add to queue. */

@@ -133,7 +133,7 @@ void CMraProto::MraMPopSessionQueueStart(HANDLE hMPopSessionQueue)
 				pmpsqMPopSessionQueue->bKeyValid = false;

 				szEmail.MakeLower();

 				szUrl.Format(MRA_MPOP_AUTH_URL, szEmail, pmpsqMPopSessionQueue->lpszMPOPKey, pmpsqi->lpszUrl);

-				CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)szUrl.c_str());

+				CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szUrl.c_str());

 				debugLogA("Opening URL: %s\n", szUrl);

 			}

 			mir_free(pmpsqi);

@@ -150,7 +150,7 @@ void CMraProto::MraMPopSessionQueueFlush(HANDLE hMPopSessionQueue)
 	MRA_MPOP_SESSION_QUEUE_ITEM *pmpsqi;

 

 	while ( FifoMTItemPop(pmpsqMPopSessionQueue, NULL, (LPVOID*)&pmpsqi) == NO_ERROR) {

-		CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)pmpsqi->lpszUrl);

+		CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)pmpsqi->lpszUrl);

 		mir_free(pmpsqi);

 	}

 }

diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp
index 271a5de5a3..54b41e6989 100644
--- a/protocols/MSN/src/msn_auth.cpp
+++ b/protocols/MSN/src/msn_auth.cpp
@@ -230,7 +230,7 @@ int CMsnProto::MSN_GetPassportAuth(void)
 				if (retVal != 0) {

 					if (errurl) {

 						debugLogA("Starting URL: '%s'", errurl);

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

+						CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)errurl);

 					}

 

 					ezxml_t tokf = ezxml_get(xml, "S:Body", 0, "S:Fault", 0, "S:Detail", -1);

diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp
index b04aad206f..2474046216 100644
--- a/protocols/MSN/src/msn_misc.cpp
+++ b/protocols/MSN/src/msn_misc.cpp
@@ -796,7 +796,7 @@ void CMsnProto::MsnInvokeMyURL(bool ismail, const char* url)
 		hippy.AppendFormat("/ppsecure/sha1auth.srf?lc=%d&token=%s", itoa(langpref, passport, 10), ptrA(mir_urlEncode(post)));

 

 		debugLogA("Starting URL: '%s'", hippy);

-		CallService(MS_UTILS_OPENURL, 1, (LPARAM)hippy.GetString());

+		CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)hippy.GetString());

 	}

 }

 

@@ -836,7 +836,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara
 					tData->proto->MsnInvokeMyURL(true, tData->url);

 			}

 			else if (tData->url != NULL)

-				CallService(MS_UTILS_OPENURL, 1, (LPARAM)tData->url);

+				CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)tData->url);

 		}

 		PUDeletePopup(hWnd);

 		break;

diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp
index 9026ff912e..b44d5d89d5 100644
--- a/protocols/MSN/src/msn_opts.cpp
+++ b/protocols/MSN/src/msn_opts.cpp
@@ -128,7 +128,7 @@ static INT_PTR CALLBACK DlgProcMsnOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NEWMSNACCOUNTLINK) {

-			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"https://signup.live.com");

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"https://signup.live.com");

 			return TRUE;

 		}

 

@@ -527,7 +527,7 @@ static INT_PTR CALLBACK DlgProcAccMgrUI(HWND hwndDlg, UINT msg, WPARAM wParam, L
 

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NEWMSNACCOUNTLINK) {

-			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"https://signup.live.com");

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"https://signup.live.com");

 			return TRUE;

 		}

 

diff --git a/protocols/Tlen/src/tlen.cpp b/protocols/Tlen/src/tlen.cpp
index 81ef9b9d2e..32dbe61ffa 100644
--- a/protocols/Tlen/src/tlen.cpp
+++ b/protocols/Tlen/src/tlen.cpp
@@ -226,7 +226,7 @@ INT_PTR TlenProtocol::MenuHandleInbox(WPARAM wParam, LPARAM lParam)
 	mir_free(login);

 	mir_free(password);

 	mir_snprintf(szFileName, SIZEOF(szFileName), "http://poczta.o2.pl/login.html?sid=%s", cookie);

-	CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) szFileName);

+	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szFileName);

 	return 0;

 }

 

diff --git a/protocols/Tlen/src/tlen_opt.cpp b/protocols/Tlen/src/tlen_opt.cpp
index 1dacd46b80..c56eba5798 100644
--- a/protocols/Tlen/src/tlen_opt.cpp
+++ b/protocols/Tlen/src/tlen_opt.cpp
@@ -147,7 +147,7 @@ INT_PTR CALLBACK TlenAccMgrUIDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
 			break;
 		case IDC_REGISTERACCOUNT:
-			CallService(MS_UTILS_OPENURL, (WPARAM) 1, (LPARAM) TLEN_REGISTER);
+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)TLEN_REGISTER);
 			break;
 		}
 		break;
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp
index 92b929ffc4..eb7c5568d7 100644
--- a/protocols/Twitter/src/connection.cpp
+++ b/protocols/Twitter/src/connection.cpp
@@ -526,7 +526,7 @@ LRESULT CALLBACK PopupWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 		std::string *url = (std::string *)PUGetPluginData(hwnd);

 		if (url != NULL) {

 			//std::string url = profile_base_url("https://twitter.com/") + http::url_encode(dbv.pszVal);

-			CallService(MS_UTILS_OPENURL, 1, reinterpret_cast<LPARAM>(url->c_str()));

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, reinterpret_cast<LPARAM>(url->c_str()));

 		}

 		// Intentionally no break here

 	}

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 56e63acaf7..5c3eb8808c 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -263,7 +263,7 @@ INT_PTR TwitterProto::VisitHomepage(WPARAM hContact, LPARAM)
 		std::string url = profile_base_url("https://twitter.com/") + http::url_encode(dbv.pszVal);

 		db_set_s(hContact,m_szModuleName,"Homepage",url.c_str());

 

-		CallService(MS_UTILS_OPENURL,1,reinterpret_cast<LPARAM>(url.c_str()));

+		CallService(MS_UTILS_OPENURL,OUF_NEWWINDOW,reinterpret_cast<LPARAM>(url.c_str()));

 		db_free(&dbv);

 	}

 

diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp
index ee0b957176..a516c67a72 100644
--- a/protocols/Twitter/src/ui.cpp
+++ b/protocols/Twitter/src/ui.cpp
@@ -61,7 +61,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 

 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NEWACCOUNTLINK) {

-			CallService(MS_UTILS_OPENURL, 1, reinterpret_cast<LPARAM>("https://twitter.com/signup"));

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, reinterpret_cast<LPARAM>("https://twitter.com/signup"));

 			return true;

 		}

 

diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index 57882073d7..02fda4da69 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -47,7 +47,7 @@ INT_PTR CALLBACK VKAccountProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lP
 	case WM_COMMAND:

 		switch (LOWORD(wParam)) {

 		case IDC_URL:

-			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://www.vk.com");

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://www.vk.com");

 			break;

 

 		case IDC_LOGIN:

@@ -138,7 +138,7 @@ INT_PTR CALLBACK CVkProto::OptionsProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, L
 	case WM_COMMAND:

 		switch (LOWORD(wParam)) {

 		case IDC_URL:

-			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://www.vk.com");

+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://www.vk.com");

 			break;

 

 		case IDC_LOGIN:

diff --git a/protocols/Xfire/src/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp
index 776a6493b7..0a0657e72d 100644
--- a/protocols/Xfire/src/Xfire_game.cpp
+++ b/protocols/Xfire/src/Xfire_game.cpp
@@ -32,7 +32,7 @@ BOOL Xfire_game::start_game(char*ip, unsigned int port, char*pw) {
 			this->launchparams[3] == 'p'&&

 			this->launchparams[4] == ':')

 		{

-			return CallService(MS_UTILS_OPENURL, 1, (LPARAM)this->launchparams);

+			return CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)this->launchparams);

 		}

 	}

 

diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index 99be8112ac..1f85205c15 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1990,7 +1990,7 @@ static INT_PTR GotoProfile(WPARAM hContact, LPARAM lParam)
 	strcat_s(temp, 64, dbv.pszVal);

 	db_free(&dbv);

 

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

+	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)temp);

 

 	return 0;

 }

@@ -2010,7 +2010,7 @@ static INT_PTR GotoXFireClanSite(WPARAM hContact, LPARAM lParam)
 	strcat_s(temp, 64, dbv.pszVal);

 	db_free(&dbv);

 

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

+	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)temp);

 

 	return 0;

 }

@@ -2026,7 +2026,7 @@ static INT_PTR GotoProfile2(WPARAM wParam, LPARAM lParam)
 	strcat_s(temp, 64, dbv.pszVal);

 	db_free(&dbv);

 

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

+	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)temp);

 	return 0;

 }

 

@@ -2042,7 +2042,7 @@ static INT_PTR GotoProfileAct(WPARAM wParam, LPARAM lParam)
 	strcat_s(temp, 64, dbv.pszVal);

 	db_free(&dbv);

 

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

+	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)temp);

 	return 0;

 }

 

diff --git a/protocols/Xfire/src/options.cpp b/protocols/Xfire/src/options.cpp
index 858683a167..c790906dfd 100644
--- a/protocols/Xfire/src/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -239,11 +239,11 @@ static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 			EnableDlgItem(hwndDlg, IDC_KONFIG_3, TRUE);
 		}
 		if (LOWORD(wParam) == IDC_URLNEWACC) {
-			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://www.xfire.com/register/");
+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://www.xfire.com/register/");
 			return TRUE;
 		}
 		if (LOWORD(wParam) == IDC_LOSTPW) {
-			CallService(MS_UTILS_OPENURL, 1, (LPARAM)"https://secure.xfire.com/lost_password/");
+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"https://secure.xfire.com/lost_password/");
 			return TRUE;
 		}
 
diff --git a/protocols/Yahoo/src/options.cpp b/protocols/Yahoo/src/options.cpp
index 3dc9c9fbd6..8ca0eef48a 100644
--- a/protocols/Yahoo/src/options.cpp
+++ b/protocols/Yahoo/src/options.cpp
@@ -65,7 +65,7 @@ static INT_PTR CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam,
 
 		switch ( LOWORD( wParam )) {
 		case IDC_NEWYAHOOACCOUNTLINK:
-			CallService(MS_UTILS_OPENURL, 1, 
+			CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, 
 				ppro->getByte("YahooJapan", 0) ?
 				(LPARAM)"http://edit.yahoo.co.jp/config/eval_register" :
 			(LPARAM)"http://edit.yahoo.com/config/eval_register");
diff --git a/protocols/Yahoo/src/proto.cpp b/protocols/Yahoo/src/proto.cpp
index cb5194a555..4b75b0355c 100644
--- a/protocols/Yahoo/src/proto.cpp
+++ b/protocols/Yahoo/src/proto.cpp
@@ -744,7 +744,7 @@ INT_PTR CALLBACK first_run_dialog(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NEWYAHOOACCOUNTLINK) {

 			CallService(MS_UTILS_OPENURL,

-				1,

+				OUF_NEWWINDOW,

 				((BYTE)IsDlgButtonChecked(hwndDlg, IDC_YAHOO_JAPAN) == 1) ?

 				(LPARAM) "http://edit.yahoo.co.jp/config/eval_register" :

 				(LPARAM) "http://edit.yahoo.com/config/eval_register"

diff --git a/protocols/Yahoo/src/services.cpp b/protocols/Yahoo/src/services.cpp
index efc52a9484..f6d46d54eb 100644
--- a/protocols/Yahoo/src/services.cpp
+++ b/protocols/Yahoo/src/services.cpp
@@ -238,7 +238,7 @@ void CYahooProto::OpenURL(const char *url, int autoLogin)
 

 	debugLogA("[YahooOpenURL] url: %s Final URL: %s", url, tUrl);

 

-	CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)tUrl);

+	CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)tUrl);

 }

 

 //=======================================================

diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp
index 68b10aac50..7a3da1782f 100644
--- a/protocols/Yahoo/src/util.cpp
+++ b/protocols/Yahoo/src/util.cpp
@@ -78,7 +78,7 @@ static LRESULT CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam,
 		if ( HIWORD(wParam) == STN_CLICKED) {

 			char *szURL = (char*)PUGetPluginData(hWnd);

 			if (szURL != NULL)

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

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

 

 			PUDeletePopup(hWnd);

 			return 0;