OLD | NEW |
1 #include "PluginStdAfx.h" | 1 #include "PluginStdAfx.h" |
2 | 2 |
3 #include "PluginClass.h" | 3 #include "PluginClass.h" |
4 #include "PluginDictionary.h" | 4 #include "PluginDictionary.h" |
5 #include "PluginSettings.h" | 5 #include "PluginSettings.h" |
6 #include "PluginSystem.h" | 6 #include "PluginSystem.h" |
7 #ifdef SUPPORT_FILTER | 7 #ifdef SUPPORT_FILTER |
8 #include "PluginFilter.h" | 8 #include "PluginFilter.h" |
9 #endif | 9 #endif |
10 #include "PluginMimeFilterClient.h" | 10 #include "PluginMimeFilterClient.h" |
(...skipping 1393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1404 s_criticalSectionLocal.Unlock(); | 1404 s_criticalSectionLocal.Unlock(); |
1405 | 1405 |
1406 #ifdef SUPPORT_WHITELIST | 1406 #ifdef SUPPORT_WHITELIST |
1407 client->ClearWhiteListCache(); | 1407 client->ClearWhiteListCache(); |
1408 #endif | 1408 #endif |
1409 } | 1409 } |
1410 break; | 1410 break; |
1411 #ifndef ENTERPRISE | 1411 #ifndef ENTERPRISE |
1412 case ID_SETTINGS: | 1412 case ID_SETTINGS: |
1413 { | 1413 { |
1414 url = UserSettingsFileUrl(); | 1414 url = CString(UserSettingsFileUrl().c_str()); |
1415 } | 1415 } |
1416 break; | 1416 break; |
1417 #endif | 1417 #endif |
1418 case ID_INVITEFRIENDS: | 1418 case ID_INVITEFRIENDS: |
1419 { | 1419 { |
1420 url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_INVITATION); | 1420 url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_INVITATION); |
1421 navigationErrorId = PLUGIN_ERROR_NAVIGATION_INVITATION; | 1421 navigationErrorId = PLUGIN_ERROR_NAVIGATION_INVITATION; |
1422 } | 1422 } |
1423 break; | 1423 break; |
1424 | 1424 |
(...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1953 | 1953 |
1954 pClass->DisplayPluginMenu(hMenu, -1, pt, TPM_LEFTALIGN|TPM_BOTTOMALIGN); | 1954 pClass->DisplayPluginMenu(hMenu, -1, pt, TPM_LEFTALIGN|TPM_BOTTOMALIGN); |
1955 #else | 1955 #else |
1956 CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser(); | 1956 CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser(); |
1957 if (browser) | 1957 if (browser) |
1958 { | 1958 { |
1959 VARIANT vFlags; | 1959 VARIANT vFlags; |
1960 vFlags.vt = VT_I4; | 1960 vFlags.vt = VT_I4; |
1961 vFlags.intVal = navOpenInNewTab; | 1961 vFlags.intVal = navOpenInNewTab; |
1962 | 1962 |
1963 HRESULT hr = browser->Navigate(CComBSTR(UserSettingsFileUrl()), &vFlags,
NULL, NULL, NULL); | 1963 HRESULT hr = browser->Navigate(BString(UserSettingsFileUrl()), &vFlags,
NULL, NULL, NULL); |
1964 if (FAILED(hr)) | 1964 if (FAILED(hr)) |
1965 { | 1965 { |
1966 vFlags.intVal = navOpenInNewWindow; | 1966 vFlags.intVal = navOpenInNewWindow; |
1967 | 1967 |
1968 hr = browser->Navigate(CComBSTR(UserSettingsFileUrl()), &vFlags, NULL,
NULL, NULL); | 1968 hr = browser->Navigate(BString(UserSettingsFileUrl()), &vFlags, NULL,
NULL, NULL); |
1969 if (FAILED(hr)) | 1969 if (FAILED(hr)) |
1970 { | 1970 { |
1971 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION
_SETTINGS, "Navigation::Failed") | 1971 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION
_SETTINGS, "Navigation::Failed") |
1972 } | 1972 } |
1973 } | 1973 } |
1974 } | 1974 } |
1975 #endif | 1975 #endif |
1976 } | 1976 } |
1977 break; | 1977 break; |
1978 | 1978 |
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2213 } | 2213 } |
2214 } | 2214 } |
2215 } | 2215 } |
2216 | 2216 |
2217 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); | 2217 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); |
2218 } | 2218 } |
2219 | 2219 |
2220 return hTabWnd; | 2220 return hTabWnd; |
2221 | 2221 |
2222 } | 2222 } |
OLD | NEW |