Feodor2
/
Mypal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#208 Fix default browser setting not recognized.

master
Fedor 2020-07-16 15:13:16 +03:00
parent 4d641f33b6
commit 8f0710f4b5
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
application/basilisk/components/shell/nsWindowsShellService.cpp
View File

@ -182,10 +182,10 @@ static SETTING gSettings[] = {
// File Handler Class // File Handler Class
// ***keep this as the first entry because when aForAllTypes is not set below // ***keep this as the first entry because when aForAllTypes is not set below
// it will skip over this check.*** // it will skip over this check.***
{ MAKE_KEY_NAME1("BasiliskHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("CentauryHTML", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("BasiliskURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("CentauryURL", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON }, { MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON },
@ -199,10 +199,10 @@ static SETTING gSettings[] = {
// are incorrect they are fixed without notifying the user. // are incorrect they are fixed without notifying the user.
static SETTING gDDESettings[] = { static SETTING gDDESettings[] = {
// File Handler Class // File Handler Class
{ MAKE_KEY_NAME1("Software\\Classes\\BasiliskHTML", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\CentauryHTML", SOD) },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("Software\\Classes\\BasiliskURL", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\CentauryURL", SOD) },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) },
@ -339,7 +339,7 @@ IsAARDefault(const RefPtr<IApplicationAssociationRegistration>& pAAR,
return false; return false;
} }
LPCWSTR progID = isProtocol ? L"BasiliskURL" : L"BasiliskHTML"; LPCWSTR progID = isProtocol ? L"CentauryURL" : L"CentauryHTML";
bool isDefault = !wcsicmp(registeredApp, progID); bool isDefault = !wcsicmp(registeredApp, progID);
CoTaskMemFree(registeredApp); CoTaskMemFree(registeredApp);

10
application/palemoon/components/shell/nsWindowsShellService.cpp
View File

@ -182,10 +182,10 @@ static SETTING gSettings[] = {
// File Handler Class // File Handler Class
// ***keep this as the first entry because when aForAllTypes is not set below // ***keep this as the first entry because when aForAllTypes is not set below
// it will skip over this check.*** // it will skip over this check.***
{ MAKE_KEY_NAME1("PaleMoonHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("MypalHTML", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("PaleMoonURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("MypalURL", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON }, { MAKE_KEY_NAME1("HTTP", DI), VAL_FILE_ICON },
@ -199,10 +199,10 @@ static SETTING gSettings[] = {
// are incorrect they are fixed without notifying the user. // are incorrect they are fixed without notifying the user.
static SETTING gDDESettings[] = { static SETTING gDDESettings[] = {
// File Handler Class // File Handler Class
{ MAKE_KEY_NAME1("Software\\Classes\\PaleMoonHTML", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\MypalHTML", SOD) },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("Software\\Classes\\PaleMoonURL", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\MypalURL", SOD) },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) },
@ -339,7 +339,7 @@ IsAARDefault(const RefPtr<IApplicationAssociationRegistration>& pAAR,
return false; return false;
} }
LPCWSTR progID = isProtocol ? L"PaleMoonURL" : L"PaleMoonHTML"; LPCWSTR progID = isProtocol ? L"MypalURL" : L"MypalHTML";
bool isDefault = !wcsicmp(registeredApp, progID); bool isDefault = !wcsicmp(registeredApp, progID);
CoTaskMemFree(registeredApp); CoTaskMemFree(registeredApp);

4
application/palemoon/installer/windows/nsis/installer.nsi
View File

@ -385,9 +385,9 @@ Section "-Application" APP_IDX
; In Win8, the delegate execute handler picks up the value in PaleMoonURL and ; In Win8, the delegate execute handler picks up the value in PaleMoonURL and
; PaleMoonHTML to launch the desktop browser when it needs to. ; PaleMoonHTML to launch the desktop browser when it needs to.
${AddDisabledDDEHandlerValues} "PaleMoonHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "MypalHTML" "$2" "$8,1" \
"${AppRegName} Document" "" "${AppRegName} Document" ""
${AddDisabledDDEHandlerValues} "PaleMoonURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "MypalURL" "$2" "$8,1" "${AppRegName} URL" \
"true" "true"
; For pre win8, the following keys should only be set if we can write to HKLM. ; For pre win8, the following keys should only be set if we can write to HKLM.