Bug 1366133 - Part 0: remove support for Windows Vista and earlier versions; r?bagder
In Windows Vista or earlier versions of Windows, it requires to call
InternetOptionQuery again with INTERNET_PER_CONN_FLAGS (see [1] for more
information). Since we're not going to support those Windows versions,
it is safe to remove this query.
[1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa385145(v=vs.85).aspx
MozReview-Commit-ID: DQFxYZsb3MW
--- a/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
+++ b/toolkit/system/windowsproxy/nsWindowsSystemProxySettings.cpp
@@ -88,30 +88,17 @@ static nsresult ReadInternetOption(uint3
connName : nullptr;
list.dwOptionCount = mozilla::ArrayLength(options);
list.dwOptionError = 0;
list.pOptions = options;
unsigned long size = sizeof(INTERNET_PER_CONN_OPTION_LISTW);
if (!InternetQueryOptionW(nullptr, INTERNET_OPTION_PER_CONNECTION_OPTION,
&list, &size)) {
- if (GetLastError() != ERROR_INVALID_PARAMETER) {
- return NS_ERROR_FAILURE;
- }
- options[0].dwOption = INTERNET_PER_CONN_FLAGS;
- size = sizeof(INTERNET_PER_CONN_OPTION_LISTW);
- MOZ_SEH_TRY {
- if (!InternetQueryOptionW(nullptr,
- INTERNET_OPTION_PER_CONNECTION_OPTION,
- &list, &size)) {
- return NS_ERROR_FAILURE;
- }
- } MOZ_SEH_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {
- return NS_ERROR_FAILURE;
- }
+ return NS_ERROR_FAILURE;
}
aFlags = options[0].Value.dwValue;
aValue.Assign(options[1].Value.pszValue);
GlobalFree(options[1].Value.pszValue);
return NS_OK;
}