wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-28 11:27:32 +09:00
Code Issues Projects Releases Packages Wiki Activity

restore pre-vista logic that is deleted in 3c02dbad94

Browse source
This commit is contained in:
Roy Tam 2019-03-24 07:24:27 +08:00
commit aa7849b372
1 changed files with 88 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

144
uriloader/exthandler/win/nsOSHelperAppService.cpp
View file

@ -81,39 +81,34 @@ nsresult nsOSHelperAppService::OSProtocolHandlerExists(const char * aProtocolSch
*aHandlerExists = false; *aHandlerExists = false;
if (aProtocolScheme && *aProtocolScheme) if (aProtocolScheme && *aProtocolScheme)
{ {
NS_ENSURE_TRUE(mAppAssoc, NS_ERROR_NOT_AVAILABLE); // Vista: use new application association interface
wchar_t * pResult = nullptr; if (mAppAssoc) {
NS_ConvertASCIItoUTF16 scheme(aProtocolScheme); wchar_t * pResult = nullptr;
// We are responsible for freeing returned strings. NS_ConvertASCIItoUTF16 scheme(aProtocolScheme);
HRESULT hr = mAppAssoc->QueryCurrentDefault(scheme.get(), // We are responsible for freeing returned strings.
AT_URLPROTOCOL, AL_EFFECTIVE, HRESULT hr = mAppAssoc->QueryCurrentDefault(scheme.get(),
&pResult); AT_URLPROTOCOL, AL_EFFECTIVE,
if (SUCCEEDED(hr)) { &pResult);
CoTaskMemFree(pResult); if (SUCCEEDED(hr)) {
// Check the registry to see if it's a valid handler. CoTaskMemFree(pResult);
nsCOMPtr<nsIWindowsRegKey> regKey = do_CreateInstance("@mozilla.org/windows-registry-key;1"); *aHandlerExists = true;
if (!regKey) {
return NS_ERROR_NOT_AVAILABLE;
} }
return NS_OK;
}
nsresult rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CLASSES_ROOT, HKEY hKey;
nsDependentString(scheme.get()), LONG err = ::RegOpenKeyExW(HKEY_CLASSES_ROOT,
nsIWindowsRegKey::ACCESS_QUERY_VALUE); NS_ConvertASCIItoUTF16(aProtocolScheme).get(),
if (NS_FAILED(rv)) { 0,
// Open will fail if the registry key path doesn't exist. KEY_QUERY_VALUE,
return NS_OK; &hKey);
} if (err == ERROR_SUCCESS)
{
bool hasValue; err = ::RegQueryValueExW(hKey, L"URL Protocol",
rv = regKey->HasValue(NS_LITERAL_STRING("URL Protocol"), &hasValue); nullptr, nullptr, nullptr, nullptr);
if (NS_FAILED(rv)) { *aHandlerExists = (err == ERROR_SUCCESS);
return NS_ERROR_FAILURE; // close the key
} ::RegCloseKey(hKey);
if (!hasValue) {
return NS_OK;
}
*aHandlerExists = true;
} }
} }
@ -144,21 +139,40 @@ NS_IMETHODIMP nsOSHelperAppService::GetApplicationDescription(const nsACString&
} }
} }
NS_ENSURE_TRUE(mAppAssoc, NS_ERROR_NOT_AVAILABLE); if (mAppAssoc) {
wchar_t * pResult = nullptr; // Vista: use new application association interface
// We are responsible for freeing returned strings. wchar_t * pResult = nullptr;
HRESULT hr = mAppAssoc->QueryCurrentDefault(buf.get(), // We are responsible for freeing returned strings.
AT_URLPROTOCOL, AL_EFFECTIVE, HRESULT hr = mAppAssoc->QueryCurrentDefault(buf.get(),
&pResult); AT_URLPROTOCOL, AL_EFFECTIVE,
if (SUCCEEDED(hr)) { &pResult);
nsCOMPtr<nsIFile> app; if (SUCCEEDED(hr)) {
nsAutoString appInfo(pResult); nsCOMPtr<nsIFile> app;
CoTaskMemFree(pResult); nsAutoString appInfo(pResult);
if (NS_SUCCEEDED(GetDefaultAppInfo(appInfo, _retval, getter_AddRefs(app)))) CoTaskMemFree(pResult);
return NS_OK; if (NS_SUCCEEDED(GetDefaultAppInfo(appInfo, _retval, getter_AddRefs(app))))
return NS_OK;
}
return NS_ERROR_NOT_AVAILABLE;
} }
return NS_ERROR_NOT_AVAILABLE; nsCOMPtr<nsIFile> app;
GetDefaultAppInfo(buf, _retval, getter_AddRefs(app));
if (!_retval.Equals(buf))
return NS_OK;
// Fall back to full path
buf.AppendLiteral("\\shell\\open\\command");
nsresult rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CLASSES_ROOT,
buf,
nsIWindowsRegKey::ACCESS_QUERY_VALUE);
if (NS_FAILED(rv))
return NS_ERROR_NOT_AVAILABLE;
rv = regKey->ReadStringValue(EmptyString(), _retval);
return NS_SUCCEEDED(rv) ? NS_OK : NS_ERROR_NOT_AVAILABLE;
} }
// GetMIMEInfoFromRegistry: This function obtains the values of some of the nsIMIMEInfo // GetMIMEInfoFromRegistry: This function obtains the values of some of the nsIMIMEInfo
@ -366,18 +380,36 @@ already_AddRefed<nsMIMEInfoWin> nsOSHelperAppService::GetByExtension(const nsAFl
bool found; bool found;
// Retrieve the default application for this extension // Retrieve the default application for this extension
NS_ENSURE_TRUE(mAppAssoc, nullptr); if (mAppAssoc) {
nsString assocType(fileExtToUse); // Vista: use the new application association COM interfaces
wchar_t * pResult = nullptr; // for resolving helpers.
HRESULT hr = mAppAssoc->QueryCurrentDefault(assocType.get(), nsString assocType(fileExtToUse);
AT_FILEEXTENSION, AL_EFFECTIVE, wchar_t * pResult = nullptr;
&pResult); HRESULT hr = mAppAssoc->QueryCurrentDefault(assocType.get(),
if (SUCCEEDED(hr)) { AT_FILEEXTENSION, AL_EFFECTIVE,
found = true; &pResult);
appInfo.Assign(pResult); if (SUCCEEDED(hr)) {
CoTaskMemFree(pResult); found = true;
} else { appInfo.Assign(pResult);
found = false; CoTaskMemFree(pResult);
}
else {
found = false;
}
}
else
{
nsCOMPtr<nsIWindowsRegKey> regKey =
do_CreateInstance("@mozilla.org/windows-registry-key;1");
if (!regKey)
return nullptr;
nsresult rv = regKey->Open(nsIWindowsRegKey::ROOT_KEY_CLASSES_ROOT,
fileExtToUse,
nsIWindowsRegKey::ACCESS_QUERY_VALUE);
if (NS_SUCCEEDED(rv)) {
found = NS_SUCCEEDED(regKey->ReadStringValue(EmptyString(),
appInfo));
}
} }
// Bug 358297 - ignore the default handler, force the user to choose app // Bug 358297 - ignore the default handler, force the user to choose app