From a85d3756ce4eb0257025b005deb795ba05fd4fda Mon Sep 17 00:00:00 2001 From: Rozhuk Ivan Date: Sat, 13 Dec 2014 08:40:22 +0000 Subject: arg fixes for MS_UTILS_OPENURL service git-svn-id: http://svn.miranda-ng.org/main/trunk@11362 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BASS_interface/src/Main.cpp | 2 +- plugins/Clist_nicer/src/clui.cpp | 2 +- plugins/HTTPServer/src/GuiElements.cpp | 2 +- plugins/HistoryLinkListPlus/src/linklist_dlg.cpp | 9 ++++++--- plugins/Msg_Export/src/FileViewer.cpp | 2 +- plugins/Non-IM Contact/src/main.cpp | 4 ++-- plugins/PackUpdater/Src/Notifications.cpp | 4 ++-- plugins/Scriver/src/utils.cpp | 2 +- plugins/SimpleStatusMsg/src/awaymsg.cpp | 2 +- plugins/SimpleStatusMsg/src/msgbox.cpp | 4 ++-- plugins/SpellChecker/src/options.cpp | 2 +- plugins/TabSRMM/src/generic_msghandlers.cpp | 2 +- plugins/TabSRMM/src/msgdialog.cpp | 2 +- plugins/TabSRMM/src/msgoptions.cpp | 8 ++++---- plugins/UserInfoEx/src/ctrl_edit.cpp | 4 ++-- plugins/UserInfoEx/src/svc_email.cpp | 2 +- plugins/UserInfoEx/src/svc_homepage.cpp | 2 +- plugins/WebView/src/webview_datawnd.cpp | 2 +- plugins/YAMN/src/proto/pop3/pop3opt.cpp | 2 +- protocols/AimOscar/src/ui.cpp | 2 +- protocols/IcqOscarJ/src/icq_firstrun.cpp | 2 +- protocols/IcqOscarJ/src/icq_menu.cpp | 2 +- protocols/IcqOscarJ/src/icq_opts.cpp | 4 ++-- protocols/JabberG/src/jabber_chat.cpp | 2 +- protocols/MRA/src/MraMPop.cpp | 6 +++--- protocols/MSN/src/msn_auth.cpp | 2 +- protocols/MSN/src/msn_misc.cpp | 4 ++-- protocols/MSN/src/msn_opts.cpp | 4 ++-- protocols/Tlen/src/tlen.cpp | 2 +- protocols/Tlen/src/tlen_opt.cpp | 2 +- protocols/Twitter/src/connection.cpp | 2 +- protocols/Twitter/src/proto.cpp | 2 +- protocols/Twitter/src/ui.cpp | 2 +- protocols/VKontakte/src/vk_options.cpp | 4 ++-- protocols/Xfire/src/Xfire_game.cpp | 2 +- protocols/Xfire/src/main.cpp | 8 ++++---- protocols/Xfire/src/options.cpp | 4 ++-- protocols/Yahoo/src/options.cpp | 2 +- protocols/Yahoo/src/proto.cpp | 2 +- protocols/Yahoo/src/services.cpp | 2 +- protocols/Yahoo/src/util.cpp | 2 +- src/core/stdurl/urldialogs.cpp | 2 +- src/core/stduserinfo/stdinfo.cpp | 4 ++-- src/modules/icolib/skin2opts.cpp | 2 +- src/modules/langpack/lpopts.cpp | 4 ++-- src/modules/protocols/protoopts.cpp | 2 +- src/modules/skin/sounds.cpp | 2 +- src/modules/utils/enterstring.cpp | 2 +- 48 files changed, 72 insertions(+), 69 deletions(-) diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 351a48b868..f9c3fdf188 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -286,7 +286,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara break; case IDC_GETBASS: - CallService(MS_UTILS_OPENURL , 1, (LPARAM)"http://www.un4seen.com/"); + CallService(MS_UTILS_OPENURL , OUF_NEWWINDOW, (LPARAM)"http://www.un4seen.com/"); break; } break; diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 17e455a182..be3f3fedf4 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -1869,7 +1869,7 @@ INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar DestroyWindow(hwndDlg); return TRUE; case IDC_SUPPORT: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda-ng.org/"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda-ng.org/"); break; } break; diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 53334e5b9b..446e5bcaea 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -931,7 +931,7 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara CloseClipboard(); } else { - CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)sLink.c_str()); + CallService(MS_UTILS_OPENURL, 0, (LPARAM)sLink.c_str()); } } else { MessageBox(hwndDlg, TranslateT("ListView_GetItem failed"), MSG_BOX_TITEL, MB_OK); diff --git a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp index 2836925d22..5e48513c0b 100644 --- a/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist_dlg.cpp @@ -129,7 +129,10 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) openNewWindow = db_get_b(NULL, LINKLIST_MODULE, LINKLIST_OPEN_WINDOW, 0xFF); if (openNewWindow == 0xFF) openNewWindow = 0; - CallService(MS_UTILS_OPENURL, openNewWindow, (LPARAM)link); + else + openNewWindow = OUF_NEWWINDOW; + + CallService(MS_UTILS_OPENURL, openNewWindow | OUF_TCHAR, (LPARAM)link); } mir_free(link); break; @@ -159,13 +162,13 @@ INT_PTR CALLBACK MainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) if (_tcsstr(link, _T("mailto:")) != NULL) ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL); else - CallService(MS_UTILS_OPENURL, 0, (LPARAM)link); + CallService(MS_UTILS_OPENURL, OUF_TCHAR, (LPARAM)link); break; case IDM_LINK_OPENNEW: if (_tcsstr(link, _T("mailto:")) != NULL) ShellExecute(HWND_TOP, NULL, link, NULL, NULL, SW_SHOWNORMAL); else - CallService(MS_UTILS_OPENURL, 1, (LPARAM)link); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)link); break; case IDM_LINK_COPY: { size_t dataLen; diff --git a/plugins/Msg_Export/src/FileViewer.cpp b/plugins/Msg_Export/src/FileViewer.cpp index b807e71557..c9d868dc49 100755 --- a/plugins/Msg_Export/src/FileViewer.cpp +++ b/plugins/Msg_Export/src/FileViewer.cpp @@ -1204,7 +1204,7 @@ static INT_PTR CALLBACK DlgProcFileViewer(HWND hwndDlg, UINT msg, WPARAM wParam, stToGet.chrg = pstLink->chrg; stToGet.lpstrText = szUrl; if (SendMessage( pstLink->nmhdr.hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)&stToGet) > 0 ) - CallService(MS_UTILS_OPENURL,1,(LPARAM)szUrl); + CallService(MS_UTILS_OPENURL,OUF_NEWWINDOW,(LPARAM)szUrl); return TRUE; } diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 3962379e05..0d5247dc58 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -37,10 +37,10 @@ INT_PTR doubleClick(WPARAM wParam,LPARAM lParam) if (!db_get_static(wParam, MODNAME, "ProgramParams", params) ) strcpy(params, ""); if (strstr(program, "http://") || strstr(program, "https://")) - CallService(MS_UTILS_OPENURL,1,(LPARAM)program); + CallService(MS_UTILS_OPENURL,OUF_NEWWINDOW,(LPARAM)program); else shellEXEerror = (int)ShellExecuteA(NULL, NULL, program, params, NULL, SW_SHOW); //ignore the warning, its M$'s backwards compatabilty screwup :) if (shellEXEerror == ERROR_FILE_NOT_FOUND || shellEXEerror == ERROR_PATH_NOT_FOUND) - CallService(MS_UTILS_OPENURL,1,(LPARAM)program); + CallService(MS_UTILS_OPENURL,OUF_NEWWINDOW,(LPARAM)program); } else editContact((WPARAM)(HANDLE)wParam, (LPARAM)NULL); return 1; diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp index 76f687eaee..25ea203e73 100644 --- a/plugins/PackUpdater/Src/Notifications.cpp +++ b/plugins/PackUpdater/Src/Notifications.cpp @@ -381,7 +381,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam tszExt = &todo[i].File.tszDownloadURL[mir_tstrlen(todo[i].File.tszDownloadURL)-5]; if (mir_tstrcmp(tszExt, _T(".html")) == 0) { char* szUrl = mir_t2a(todo[i].File.tszDownloadURL); - CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)szUrl); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szUrl); mir_free(szUrl); } else { @@ -530,7 +530,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam int sel = ListView_GetSelectionMark(hwndList); vector &todo = *(vector *)GetWindowLongPtr(hDlg, GWLP_USERDATA); char* szUrl = mir_t2a(todo[sel].tszInfoURL); - CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)szUrl); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szUrl); mir_free(szUrl); } break; diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index 1f6b99e682..0ac1589bc7 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -414,7 +414,7 @@ void SearchWord(TCHAR * word, int engine) break; } - CallService(MS_UTILS_OPENURL, 1, (LPARAM)szURL); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szURL); } } diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 3f7c677730..0a3f41e755 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -352,7 +352,7 @@ static INT_PTR GoToURLMsgCommand(WPARAM wParam, LPARAM lParam) char *szMsgURL = (char *)mir_alloc(i + 1); if (szMsgURL) { mir_strncpy(szMsgURL, szURL, i + 1); - CallService(MS_UTILS_OPENURL, 1, (LPARAM)szMsgURL); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szMsgURL); mir_free(szMsgURL); } } diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp index 77079b465e..7777fdfc71 100644 --- a/plugins/SimpleStatusMsg/src/msgbox.cpp +++ b/plugins/SimpleStatusMsg/src/msgbox.cpp @@ -445,11 +445,11 @@ VOID APIENTRY HandlePopupMenu(HWND hwnd, POINT pt, HWND edit_control) break; case ID__FORTUNEAWAYMSG: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda-ng.org/"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda-ng.org/"); break; case ID__VARIABLES: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda-ng.org/"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda-ng.org/"); break; case ID__VARIABLES_MOREVARIABLES: diff --git a/plugins/SpellChecker/src/options.cpp b/plugins/SpellChecker/src/options.cpp index 9325387e43..a9ab63df8b 100644 --- a/plugins/SpellChecker/src/options.cpp +++ b/plugins/SpellChecker/src/options.cpp @@ -197,7 +197,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_COMMAND: if (LOWORD(wParam) == IDC_GETMORE) - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://wiki.services.openoffice.org/wiki/Dictionaries"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://wiki.services.openoffice.org/wiki/Dictionaries"); if (LOWORD(wParam) == IDC_DEF_LANG && (HIWORD(wParam) == CBN_SELCHANGE && (HWND)lParam == GetFocus())) { SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 2ddf7b3d2a..1fe0c33f41 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -636,7 +636,7 @@ static INT_PTR CALLBACK DlgProcAbout(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR DestroyWindow(hwndDlg); return TRUE; case IDC_SUPPORT: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda.or.at/"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda.or.at/"); break; } break; diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index cb1bf3e719..a7218aa491 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -2100,7 +2100,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP ClientToScreen(((NMHDR*)lParam)->hwndFrom, &pt); switch (TrackPopupMenu(hSubMenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL)) { case IDM_OPENNEW: - CallService(MS_UTILS_OPENURL, 1 + OUF_TCHAR, (LPARAM)tr.lpstrText); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW | OUF_TCHAR, (LPARAM)tr.lpstrText); break; case IDM_OPENEXISTING: diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 6a1071ae89..8278c24e7b 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -337,7 +337,7 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L break; case IDC_HELP_GENERAL: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/UsingSkins"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/UsingSkins"); break; case IDC_SKIN_CLOSENOW: @@ -448,7 +448,7 @@ static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LP break; case IDC_HELP_GENERAL: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/GeneralSettings"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/GeneralSettings"); break; case IDC_RESETWARNINGS: @@ -912,7 +912,7 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam (IsDlgButtonChecked(hwndDlg, IDC_TYPEWIN) || IsDlgButtonChecked(hwndDlg, IDC_TYPENOWIN))); break; case IDC_MTN_HELP: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/TypingNotifications"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/TypingNotifications"); return 0; } SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); @@ -1150,7 +1150,7 @@ static INT_PTR CALLBACK DlgProcContainerSettings(HWND hwndDlg, UINT msg, WPARAM Utils::enableDlgControl(hwndDlg, IDC_TABLIMIT, IsDlgButtonChecked(hwndDlg, IDC_LIMITTABS)); break; case IDC_HELP_CONTAINERS: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/Containers"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://wiki.miranda.or.at/TabSRMM/Containers"); break; } SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp index 2a7d65fede..837517c7ab 100644 --- a/plugins/UserInfoEx/src/ctrl_edit.cpp +++ b/plugins/UserInfoEx/src/ctrl_edit.cpp @@ -303,7 +303,7 @@ void CEditCtrl::OpenUrl() } if (szUrl && (GetWindowTextA(_hwnd, szUrl, lenUrl) > 0)) { - CallService(MS_UTILS_OPENURL, 1, (LPARAM)szUrl); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szUrl); } if (need_free) { @@ -356,7 +356,7 @@ LRESULT CEditCtrl::LinkNotificationHandler(ENLINK* lnk) LPSTR pszUrl = mir_t2a(tr.lpstrText); if (pszUrl) { - CallService(MS_UTILS_OPENURL, 1, (LPARAM)pszUrl); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)pszUrl); mir_free(pszUrl); } } diff --git a/plugins/UserInfoEx/src/svc_email.cpp b/plugins/UserInfoEx/src/svc_email.cpp index dec21cfcf4..b32516bd20 100644 --- a/plugins/UserInfoEx/src/svc_email.cpp +++ b/plugins/UserInfoEx/src/svc_email.cpp @@ -96,7 +96,7 @@ static INT_PTR MenuCommand(WPARAM wParam,LPARAM lParam) mir_snprintf(szUrl, len + 1, "mailto:%s", val); mir_free(val); - result = CallService(MS_UTILS_OPENURL, 1, (LPARAM)szUrl); + result = CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szUrl); } else { result = 1; diff --git a/plugins/UserInfoEx/src/svc_homepage.cpp b/plugins/UserInfoEx/src/svc_homepage.cpp index 63c6f6afb2..1d3d9205dc 100644 --- a/plugins/UserInfoEx/src/svc_homepage.cpp +++ b/plugins/UserInfoEx/src/svc_homepage.cpp @@ -70,7 +70,7 @@ static INT_PTR MenuCommand(WPARAM wParam, LPARAM lParam) { LPSTR szUrl = Get(wParam); if (szUrl) { - CallService(MS_UTILS_OPENURL, 1, (LPARAM)szUrl); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szUrl); mir_free(szUrl); } else MessageBox((HWND)lParam, TranslateT("User has no valid homepage"), TranslateT("View Homepage"), MB_OK); diff --git a/plugins/WebView/src/webview_datawnd.cpp b/plugins/WebView/src/webview_datawnd.cpp index 5af34f604a..77d4a3d325 100644 --- a/plugins/WebView/src/webview_datawnd.cpp +++ b/plugins/WebView/src/webview_datawnd.cpp @@ -325,7 +325,7 @@ INT_PTR CALLBACK DlgProcDisplayData(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA CopyMemory(tr.lpstrText, "mailto:", 7); } - CallService(MS_UTILS_OPENURL, 1, (LPARAM) tr.lpstrText); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM) tr.lpstrText); SetFocus(GetDlgItem(hwndDlg, IDC_DATA)); free(tr.lpstrText); diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index 83fc6b93ce..0f580ad863 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -120,7 +120,7 @@ INT_PTR CALLBACK DlgProcPluginOpt(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam { char str[1024]; GetDlgItemTextA(hDlg,IDC_STWWW,str,SIZEOF(str)); - CallService(MS_UTILS_OPENURL,1,(LPARAM)str); + CallService(MS_UTILS_OPENURL,OUF_NEWWINDOW,(LPARAM)str); break; } 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(url->c_str())); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, reinterpret_cast(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(url.c_str())); + CallService(MS_UTILS_OPENURL,OUF_NEWWINDOW,reinterpret_cast(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("https://twitter.com/signup")); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, reinterpret_cast("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; diff --git a/src/core/stdurl/urldialogs.cpp b/src/core/stdurl/urldialogs.cpp index 0bd93f1190..ff965a9ef0 100644 --- a/src/core/stdurl/urldialogs.cpp +++ b/src/core/stdurl/urldialogs.cpp @@ -170,7 +170,7 @@ INT_PTR CALLBACK DlgProcUrlRecv(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP GetDlgItemTextA(hwndDlg, IDC_URL, url, SIZEOF(url)); switch(TrackPopupMenu(hSubMenu, TPM_RETURNCMD, rc.left, rc.bottom, 0, hwndDlg, NULL)) { case IDM_OPENNEW: - CallService(MS_UTILS_OPENURL, 1, (LPARAM)url); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)url); break; case IDM_OPENEXISTING: CallService(MS_UTILS_OPENURL, 0, (LPARAM)url); diff --git a/src/core/stduserinfo/stdinfo.cpp b/src/core/stduserinfo/stdinfo.cpp index 3c407ee726..44b81671a5 100644 --- a/src/core/stduserinfo/stdinfo.cpp +++ b/src/core/stduserinfo/stdinfo.cpp @@ -345,7 +345,7 @@ static INT_PTR CALLBACK WorkDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_WEBPAGE))) { char szPage[256]; GetDlgItemTextA(hwndDlg, IDC_WEBPAGE, szPage, SIZEOF(szPage)); - CallService(MS_UTILS_OPENURL, 1, (LPARAM)szPage); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szPage); } } break; @@ -483,7 +483,7 @@ static INT_PTR CALLBACK BackgroundDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, if (IsWindowEnabled(GetDlgItem(hwndDlg, IDC_WEBPAGE))) { char szPage[256]; GetDlgItemTextA(hwndDlg, IDC_WEBPAGE, szPage, SIZEOF(szPage)); - CallService(MS_UTILS_OPENURL, 1, (LPARAM)szPage); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)szPage); } break; } diff --git a/src/modules/icolib/skin2opts.cpp b/src/modules/icolib/skin2opts.cpp index 18f40a2215..bc5be1396a 100644 --- a/src/modules/icolib/skin2opts.cpp +++ b/src/modules/icolib/skin2opts.cpp @@ -233,7 +233,7 @@ void UndoSubItemChanges(HWND htv, HTREEITEM hItem, int cmd) static void OpenIconsPage() { - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda-ng.org/"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda-ng.org/"); } static int OpenPopupMenu(HWND hwndDlg) diff --git a/src/modules/langpack/lpopts.cpp b/src/modules/langpack/lpopts.cpp index 1ecdf11e8e..cb1a8d5a0b 100644 --- a/src/modules/langpack/lpopts.cpp +++ b/src/modules/langpack/lpopts.cpp @@ -126,12 +126,12 @@ INT_PTR CALLBACK DlgLangpackOpt(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP char buf[512]; mir_strcpy(buf, "mailto:"); if (GetWindowTextA(GetDlgItem(hwndDlg, LOWORD(wParam)), &buf[7], SIZEOF(buf)-7)) - CallService(MS_UTILS_OPENURL, FALSE, (LPARAM)buf); + CallService(MS_UTILS_OPENURL, 0, (LPARAM)buf); } break; case IDC_MORELANG: - CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)"http://wiki.miranda-ng.org/index.php?title=Langpacks/en#Download"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://wiki.miranda-ng.org/index.php?title=Langpacks/en#Download"); break; case IDC_LANGUAGES: diff --git a/src/modules/protocols/protoopts.cpp b/src/modules/protocols/protoopts.cpp index c4b8ed5dd3..9114486fa2 100644 --- a/src/modules/protocols/protoopts.cpp +++ b/src/modules/protocols/protoopts.cpp @@ -914,7 +914,7 @@ INT_PTR CALLBACK AccMgrDlgProc(HWND hwndDlg, UINT message, WPARAM wParam, LPARAM break; case IDC_LNK_ADDONS: - CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)"http://miranda-ng.org/"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda-ng.org/"); break; case IDOK: diff --git a/src/modules/skin/sounds.cpp b/src/modules/skin/sounds.cpp index 67a92df35a..2ab0c21b51 100644 --- a/src/modules/skin/sounds.cpp +++ b/src/modules/skin/sounds.cpp @@ -332,7 +332,7 @@ INT_PTR CALLBACK DlgProcSoundOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM SetDlgItemText(hwndDlg, IDC_LOCATION, strFull); } if (LOWORD(wParam) == IDC_GETMORE) { - CallService(MS_UTILS_OPENURL, 1, (LPARAM)"http://miranda-ng.org/addons/category/14"); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)"http://miranda-ng.org/addons/category/14"); break; } if (LOWORD(wParam) == IDC_LOCATION) diff --git a/src/modules/utils/enterstring.cpp b/src/modules/utils/enterstring.cpp index 66bdbbbf32..942ba3fc20 100644 --- a/src/modules/utils/enterstring.cpp +++ b/src/modules/utils/enterstring.cpp @@ -209,7 +209,7 @@ static INT_PTR CALLBACK sttEnterStringDlgProc(HWND hwndDlg, UINT msg, WPARAM wPa SendMessage(param->nmhdr.hwndFrom, EM_GETTEXTRANGE, 0, (LPARAM)& tr); char *tmp = mir_t2a(tr.lpstrText); - CallService(MS_UTILS_OPENURL, 1, (LPARAM)tmp); + CallService(MS_UTILS_OPENURL, OUF_NEWWINDOW, (LPARAM)tmp); mir_free(tmp); mir_free(tr.lpstrText); } -- cgit v1.2.3