OLD | NEW |
1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
2 | 2 |
3 #include "PluginClass.h" | 3 #include "PluginClass.h" |
4 #include "PluginSettings.h" | 4 #include "PluginSettings.h" |
5 #include "PluginSystem.h" | 5 #include "PluginSystem.h" |
6 #include "PluginFilter.h" | 6 #include "PluginFilter.h" |
7 #include "PluginMimeFilterClient.h" | 7 #include "PluginMimeFilterClient.h" |
8 #include "PluginClient.h" | 8 #include "PluginClient.h" |
9 #include "PluginClientFactory.h" | 9 #include "PluginClientFactory.h" |
10 #include "PluginMutex.h" | 10 #include "PluginMutex.h" |
(...skipping 1213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1224 break; | 1224 break; |
1225 case ID_MENU_SETTINGS: | 1225 case ID_MENU_SETTINGS: |
1226 { | 1226 { |
1227 CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser(); | 1227 CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser(); |
1228 if (browser) | 1228 if (browser) |
1229 { | 1229 { |
1230 VARIANT vFlags; | 1230 VARIANT vFlags; |
1231 vFlags.vt = VT_I4; | 1231 vFlags.vt = VT_I4; |
1232 vFlags.intVal = navOpenInNewTab; | 1232 vFlags.intVal = navOpenInNewTab; |
1233 | 1233 |
1234 BSTR urlToNavigate = BString(UserSettingsFileUrl()); | 1234 auto userSettingsFileUrl = UserSettingsFileUrl(); |
| 1235 ATL::CComBSTR urlToNavigate(static_cast<int>(userSettingsFileUrl.length(
)), userSettingsFileUrl.c_str()); |
1235 HRESULT hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL)
; | 1236 HRESULT hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL)
; |
1236 if (FAILED(hr)) | 1237 if (FAILED(hr)) |
1237 { | 1238 { |
1238 vFlags.intVal = navOpenInNewWindow; | 1239 vFlags.intVal = navOpenInNewWindow; |
1239 | 1240 |
1240 hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL); | 1241 hr = browser->Navigate(urlToNavigate, &vFlags, NULL, NULL, NULL); |
1241 if (FAILED(hr)) | 1242 if (FAILED(hr)) |
1242 { | 1243 { |
1243 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION
_SETTINGS, "Navigation::Failed") | 1244 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION
_SETTINGS, "Navigation::Failed") |
1244 } | 1245 } |
(...skipping 619 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1864 } | 1865 } |
1865 } | 1866 } |
1866 } | 1867 } |
1867 | 1868 |
1868 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 1869 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); |
1869 } | 1870 } |
1870 | 1871 |
1871 return hTabWnd; | 1872 return hTabWnd; |
1872 | 1873 |
1873 } | 1874 } |
OLD | NEW |