wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-08 00:07:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

De-firefox many things

Browse source
This commit is contained in:
NTD 2018-02-05 06:25:10 -05:00 • committed by Roy Tam
commit f2cea39d0d
9 changed files with 90 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

2
browser/app/firefox.exe.manifest → browser/app/basilisk.exe.manifest
View file

@ -3,7 +3,7 @@
<assemblyIdentity <assemblyIdentity
version="1.0.0.0" version="1.0.0.0"
processorArchitecture="*" processorArchitecture="*"
name="Firefox" name="Basilisk"
type="win32" type="win32"
/> />
<description>Firefox</description> <description>Firefox</description>

6
browser/app/module.ver
View file

@ -1,8 +1,8 @@
WIN32_MODULE_COMPANYNAME=Mozilla Corporation WIN32_MODULE_COMPANYNAME=Moonchild Productions
WIN32_MODULE_COPYRIGHT=©Firefox and Mozilla Developers; available under the MPL 2 license. WIN32_MODULE_COPYRIGHT=©Basilisk and Mozilla Developers; available under the MPL 2 license.
WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@ WIN32_MODULE_PRODUCTVERSION=@MOZ_APP_WINVERSION@
WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@ WIN32_MODULE_PRODUCTVERSION_STRING=@MOZ_APP_VERSION@
WIN32_MODULE_TRADEMARKS=Firefox is a Trademark of The Mozilla Foundation. WIN32_MODULE_TRADEMARKS=Basilisk is a Trademark of Moonchild Productions.
WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_DESCRIPTION=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_PRODUCTNAME=@MOZ_APP_DISPLAYNAME@
WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@ WIN32_MODULE_NAME=@MOZ_APP_DISPLAYNAME@

6
browser/app/nsBrowserApp.cpp
View file

@ -25,7 +25,7 @@
#ifdef XP_WIN #ifdef XP_WIN
#ifdef MOZ_ASAN #ifdef MOZ_ASAN
// ASAN requires firefox.exe to be built with -MD, and it's OK if we don't // ASAN requires basilisk.exe to be built with -MD, and it's OK if we don't
// support Windows XP SP2 in ASAN builds. // support Windows XP SP2 in ASAN builds.
#define XRE_DONT_SUPPORT_XPSP2 #define XRE_DONT_SUPPORT_XPSP2
#endif #endif
@ -84,7 +84,7 @@ static void Output(const char *fmt, ... )
decltype(MessageBoxW)* messageBoxW = decltype(MessageBoxW)* messageBoxW =
(decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW"); (decltype(MessageBoxW)*) GetProcAddress(user32, "MessageBoxW");
if (messageBoxW) { if (messageBoxW) {
messageBoxW(nullptr, wide_msg, L"Firefox", MB_OK messageBoxW(nullptr, wide_msg, L"Basilisk", MB_OK
| MB_ICONERROR | MB_ICONERROR
| MB_SETFOREGROUND); | MB_SETFOREGROUND);
} }
@ -170,7 +170,7 @@ static int do_main(int argc, char* argv[], char* envp[], nsIFile *xreDirectory)
nsresult rv; nsresult rv;
uint32_t mainFlags = 0; uint32_t mainFlags = 0;
// Allow firefox.exe to launch XULRunner apps via -app <application.ini> // Allow basilisk.exe to launch XULRunner apps via -app <application.ini>
// Note that -app must be the *first* argument. // Note that -app must be the *first* argument.
const char *appDataFile = getenv("XUL_APP_FILE"); const char *appDataFile = getenv("XUL_APP_FILE");
if (appDataFile && *appDataFile) { if (appDataFile && *appDataFile) {

2
browser/app/splash.rc
View file

@ -6,7 +6,7 @@
#include <windows.h> #include <windows.h>
#include "nsNativeAppSupportWin.h" #include "nsNativeAppSupportWin.h"
1 24 "firefox.exe.manifest" 1 24 "basilisk.exe.manifest"
IDI_APPICON ICON FIREFOX_ICO IDI_APPICON ICON FIREFOX_ICO
IDI_DOCUMENT ICON DOCUMENT_ICO IDI_DOCUMENT ICON DOCUMENT_ICO

56
browser/components/shell/nsWindowsShellService.cpp
View file

@ -102,18 +102,18 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// .htm .html .shtml .xht .xhtml // .htm .html .shtml .xht .xhtml
// are mapped like so: // are mapped like so:
// //
// HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ FirefoxHTML // HKCU\SOFTWARE\Classes\.<ext>\ (default) REG_SZ BasiliskHTML
// //
// as aliases to the class: // as aliases to the class:
// //
// HKCU\SOFTWARE\Classes\FirefoxHTML\ // HKCU\SOFTWARE\Classes\BasiliskHTML\
// DefaultIcon (default) REG_SZ <apppath>,1 // DefaultIcon (default) REG_SZ <apppath>,1
// shell\open\command (default) REG_SZ <apppath> -osint -url "%1" // shell\open\command (default) REG_SZ <apppath> -osint -url "%1"
// shell\open\ddeexec (default) REG_SZ <empty string> // shell\open\ddeexec (default) REG_SZ <empty string>
// //
// - Windows Vista and above Protocol Handler // - Windows Vista and above Protocol Handler
// //
// HKCU\SOFTWARE\Classes\FirefoxURL\ (default) REG_SZ <appname> URL // HKCU\SOFTWARE\Classes\BasiliskURL\ (default) REG_SZ <appname> URL
// EditFlags REG_DWORD 2 // EditFlags REG_DWORD 2
// FriendlyTypeName REG_SZ <appname> URL // FriendlyTypeName REG_SZ <appname> URL
// DefaultIcon (default) REG_SZ <apppath>,1 // DefaultIcon (default) REG_SZ <apppath>,1
@ -133,7 +133,7 @@ OpenKeyForReading(HKEY aKeyRoot, const nsAString& aKeyName, HKEY* aKey)
// //
// - Windows Start Menu (XP SP1 and newer) // - Windows Start Menu (XP SP1 and newer)
// ------------------------------------------------- // -------------------------------------------------
// The following keys are set to make Firefox appear in the Start Menu as the // The following keys are set to make Basilisk appear in the Start Menu as the
// browser: // browser:
// //
// HKCU\SOFTWARE\Clients\StartMenuInternet\FIREFOX.EXE\ // HKCU\SOFTWARE\Clients\StartMenuInternet\FIREFOX.EXE\
@ -157,7 +157,7 @@ typedef struct {
const char* oldValueData; const char* oldValueData;
} SETTING; } SETTING;
#define APP_REG_NAME L"Firefox" #define APP_REG_NAME L"Basilisk"
#define VAL_FILE_ICON "%APPPATH%,1" #define VAL_FILE_ICON "%APPPATH%,1"
#define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\"" #define VAL_OPEN "\"%APPPATH%\" -osint -url \"%1\""
#define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\"" #define OLD_VAL_OPEN "\"%APPPATH%\" -requestPending -osint -url \"%1\""
@ -171,11 +171,11 @@ typedef struct {
PREFIX MID PREFIX MID
// The DefaultIcon registry key value should never be used when checking if // The DefaultIcon registry key value should never be used when checking if
// Firefox is the default browser for file handlers since other applications // Basilisk is the default browser for file handlers since other applications
// (e.g. MS Office) may modify the DefaultIcon registry key value to add Icon // (e.g. MS Office) may modify the DefaultIcon registry key value to add Icon
// Handlers. see http://msdn2.microsoft.com/en-us/library/aa969357.aspx for // Handlers. see http://msdn2.microsoft.com/en-us/library/aa969357.aspx for
// more info. The FTP protocol is not checked so advanced users can set the FTP // more info. The FTP protocol is not checked so advanced users can set the FTP
// handler to another application and still have Firefox check if it is the // handler to another application and still have Basilisk check if it is the
// default HTTP and HTTPS handler. // default HTTP and HTTPS handler.
// *** Do not add additional checks here unless you skip them when aForAllTypes // *** Do not add additional checks here unless you skip them when aForAllTypes
// is false below***. // is false below***.
@ -183,10 +183,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("FirefoxHTML", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("BasiliskHTML", SOC), VAL_OPEN, OLD_VAL_OPEN },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("FirefoxURL", SOC), VAL_OPEN, OLD_VAL_OPEN }, { MAKE_KEY_NAME1("BasiliskURL", 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 },
@ -196,14 +196,14 @@ static SETTING gSettings[] = {
}; };
// The settings to disable DDE are separate from the default browser settings // The settings to disable DDE are separate from the default browser settings
// since they are only checked when Firefox is the default browser and if they // since they are only checked when Basilisk is the default browser and if they
// 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\\FirefoxHTML", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\BasiliskHTML", SOD) },
// Protocol Handler Class - for Vista and above // Protocol Handler Class - for Vista and above
{ MAKE_KEY_NAME1("Software\\Classes\\FirefoxURL", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\BasiliskURL", SOD) },
// Protocol Handlers // Protocol Handlers
{ MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) }, { MAKE_KEY_NAME1("Software\\Classes\\FTP", SOD) },
@ -340,7 +340,7 @@ IsAARDefault(const RefPtr<IApplicationAssociationRegistration>& pAAR,
return false; return false;
} }
LPCWSTR progID = isProtocol ? L"FirefoxURL" : L"FirefoxHTML"; LPCWSTR progID = isProtocol ? L"BasiliskURL" : L"BasiliskHTML";
bool isDefault = !wcsicmp(registeredApp, progID); bool isDefault = !wcsicmp(registeredApp, progID);
CoTaskMemFree(registeredApp); CoTaskMemFree(registeredApp);
@ -372,9 +372,9 @@ IsDefaultBrowserWin8(bool aCheckAllTypes, bool* aIsDefaultBrowser)
/* /*
* Query's the AAR for the default status. * Query's the AAR for the default status.
* This only checks for FirefoxURL and if aCheckAllTypes is set, then * This only checks for BasiliskURL and if aCheckAllTypes is set, then
* it also checks for FirefoxHTML. Note that those ProgIDs are shared * it also checks for BasiliskHTML. Note that those ProgIDs are shared
* by all Firefox browsers. * by all Basilisk browsers.
*/ */
bool bool
nsWindowsShellService::IsDefaultBrowserVista(bool aCheckAllTypes, nsWindowsShellService::IsDefaultBrowserVista(bool aCheckAllTypes,
@ -417,7 +417,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
// Convert the path to a long path since GetModuleFileNameW returns the path // Convert the path to a long path since GetModuleFileNameW returns the path
// that was used to launch Firefox which is not necessarily a long path. // that was used to launch Basilisk which is not necessarily a long path.
if (!::GetLongPathNameW(exePath, exePath, MAX_BUF)) if (!::GetLongPathNameW(exePath, exePath, MAX_BUF))
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@ -470,7 +470,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
0, KEY_SET_VALUE, &theKey); 0, KEY_SET_VALUE, &theKey);
if (REG_FAILED(res)) { if (REG_FAILED(res)) {
// If updating the open command fails try to update it using the helper // If updating the open command fails try to update it using the helper
// application when setting Firefox as the default browser. // application when setting Basilisk as the default browser.
*aIsDefaultBrowser = false; *aIsDefaultBrowser = false;
return NS_OK; return NS_OK;
} }
@ -482,15 +482,15 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
::RegCloseKey(theKey); ::RegCloseKey(theKey);
if (REG_FAILED(res)) { if (REG_FAILED(res)) {
// If updating the open command fails try to update it using the helper // If updating the open command fails try to update it using the helper
// application when setting Firefox as the default browser. // application when setting Basilisk as the default browser.
*aIsDefaultBrowser = false; *aIsDefaultBrowser = false;
return NS_OK; return NS_OK;
} }
} }
} }
// Only check if Firefox is the default browser on Vista and above if the // Only check if Basilisk is the default browser on Vista and above if the
// previous checks show that Firefox is the default browser. // previous checks show that Basilisk is the default browser.
if (*aIsDefaultBrowser) { if (*aIsDefaultBrowser) {
IsDefaultBrowserVista(aForAllTypes, aIsDefaultBrowser); IsDefaultBrowserVista(aForAllTypes, aIsDefaultBrowser);
if (IsWin8OrLater()) { if (IsWin8OrLater()) {
@ -499,9 +499,9 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
} }
// To handle the case where DDE isn't disabled due for a user because there // To handle the case where DDE isn't disabled due for a user because there
// account didn't perform a Firefox update this will check if Firefox is the // account didn't perform a Basilisk update this will check if Basilisk is the
// default browser and if dde is disabled for each handler // default browser and if dde is disabled for each handler
// and if it isn't disable it. When Firefox is not the default browser the // and if it isn't disable it. When Basilisk is not the default browser the
// helper application will disable dde for each handler. // helper application will disable dde for each handler.
if (*aIsDefaultBrowser && aForAllTypes) { if (*aIsDefaultBrowser && aForAllTypes) {
// Check ftp settings // Check ftp settings
@ -515,7 +515,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
::RegCloseKey(theKey); ::RegCloseKey(theKey);
// If disabling DDE fails try to disable it using the helper // If disabling DDE fails try to disable it using the helper
// application when setting Firefox as the default browser. // application when setting Basilisk as the default browser.
*aIsDefaultBrowser = false; *aIsDefaultBrowser = false;
return NS_OK; return NS_OK;
} }
@ -535,7 +535,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
nullptr, &theKey, nullptr); nullptr, &theKey, nullptr);
if (REG_FAILED(res)) { if (REG_FAILED(res)) {
// If disabling DDE fails try to disable it using the helper // If disabling DDE fails try to disable it using the helper
// application when setting Firefox as the default browser. // application when setting Basilisk as the default browser.
*aIsDefaultBrowser = false; *aIsDefaultBrowser = false;
return NS_OK; return NS_OK;
} }
@ -546,7 +546,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
::RegCloseKey(theKey); ::RegCloseKey(theKey);
if (REG_FAILED(res)) { if (REG_FAILED(res)) {
// If disabling DDE fails try to disable it using the helper // If disabling DDE fails try to disable it using the helper
// application when setting Firefox as the default browser. // application when setting Basilisk as the default browser.
*aIsDefaultBrowser = false; *aIsDefaultBrowser = false;
return NS_OK; return NS_OK;
} }
@ -588,7 +588,7 @@ nsWindowsShellService::IsDefaultBrowser(bool aStartupCheck,
// Close the key that was created. // Close the key that was created.
::RegCloseKey(theKey); ::RegCloseKey(theKey);
// If updating the FTP protocol handlers shell open command fails try to // If updating the FTP protocol handlers shell open command fails try to
// update it using the helper application when setting Firefox as the // update it using the helper application when setting Basilisk as the
// default browser. // default browser.
if (REG_FAILED(res)) { if (REG_FAILED(res)) {
*aIsDefaultBrowser = false; *aIsDefaultBrowser = false;
@ -1005,7 +1005,7 @@ nsWindowsShellService::SetDesktopBackground(nsIDOMElement* aElement,
getter_AddRefs(file)); getter_AddRefs(file));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
// eventually, the path is "%APPDATA%\Mozilla\Firefox\Desktop Background.bmp" // eventually, the path is "%APPDATA%\Mozilla\Basilisk\Desktop Background.bmp"
rv = file->Append(fileLeafName); rv = file->Append(fileLeafName);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);

24
browser/installer/windows/nsis/installer.nsi
View file

@ -253,7 +253,7 @@ Section "-InstallStartCleanup"
${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs" ${InitHashAppModelId} "$INSTDIR" "Software\Mozilla\${AppName}\TaskBarIDs"
; Remove the updates directory for Vista and above ; Remove the updates directory for Vista and above
${CleanUpdateDirectories} "Mozilla\Firefox" "Mozilla\updates" ${CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates"
${RemoveDeprecatedFiles} ${RemoveDeprecatedFiles}
${RemovePrecompleteEntries} "false" ${RemovePrecompleteEntries} "false"
@ -374,17 +374,17 @@ Section "-Application" APP_IDX
; it doesn't cause problems always add them. ; it doesn't cause problems always add them.
${SetUninstallKeys} ${SetUninstallKeys}
; On install always add the FirefoxHTML and FirefoxURL keys. ; On install always add the BasiliskHTML and BasiliskURL keys.
; An empty string is used for the 5th param because FirefoxHTML is not a ; An empty string is used for the 5th param because BasiliskHTML is not a
; protocol handler. ; protocol handler.
${GetLongPath} "$INSTDIR\${FileMainEXE}" $8 ${GetLongPath} "$INSTDIR\${FileMainEXE}" $8
StrCpy $2 "$\"$8$\" -osint -url $\"%1$\"" StrCpy $2 "$\"$8$\" -osint -url $\"%1$\""
; In Win8, the delegate execute handler picks up the value in FirefoxURL and ; In Win8, the delegate execute handler picks up the value in BasiliskURL and
; FirefoxHTML to launch the desktop browser when it needs to. ; BasiliskHTML to launch the desktop browser when it needs to.
${AddDisabledDDEHandlerValues} "FirefoxHTML" "$2" "$8,1" \ ${AddDisabledDDEHandlerValues} "BasiliskHTML" "$2" "$8,1" \
"${AppRegName} Document" "" "${AppRegName} Document" ""
${AddDisabledDDEHandlerValues} "FirefoxURL" "$2" "$8,1" "${AppRegName} URL" \ ${AddDisabledDDEHandlerValues} "BasiliskURL" "$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.
@ -620,7 +620,7 @@ Section "-InstallEndCleanup"
; If we have something other than empty string now, write the value. ; If we have something other than empty string now, write the value.
${If} "$0" != "" ${If} "$0" != ""
ClearErrors ClearErrors
WriteRegStr HKCU "Software\Mozilla\Firefox" "OldDefaultBrowserCommand" "$0" WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0"
${EndIf} ${EndIf}
${LogHeader} "Setting as the default browser" ${LogHeader} "Setting as the default browser"
@ -636,7 +636,7 @@ Section "-InstallEndCleanup"
${ElseIfNot} ${Errors} ${ElseIfNot} ${Errors}
${LogHeader} "Writing default-browser opt-out" ${LogHeader} "Writing default-browser opt-out"
ClearErrors ClearErrors
WriteRegStr HKCU "Software\Mozilla\Firefox" "DefaultBrowserOptOut" "True" WriteRegStr HKCU "Software\Mozilla\Basilisk" "DefaultBrowserOptOut" "True"
${If} ${Errors} ${If} ${Errors}
${LogMsg} "Error writing default-browser opt-out" ${LogMsg} "Error writing default-browser opt-out"
${EndIf} ${EndIf}
@ -1049,14 +1049,14 @@ Function preSummary
WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test"
${Unless} ${Errors} ${Unless} ${Errors}
DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest"
; Check if Firefox is the http handler for this user. ; Check if Basilisk is the http handler for this user.
SetShellVarContext current ; Set SHCTX to the current user SetShellVarContext current ; Set SHCTX to the current user
${IsHandlerForInstallDir} "http" $R9 ${IsHandlerForInstallDir} "http" $R9
${If} $TmpVal == "HKLM" ${If} $TmpVal == "HKLM"
SetShellVarContext all ; Set SHCTX to all users SetShellVarContext all ; Set SHCTX to all users
${EndIf} ${EndIf}
; If Firefox isn't the http handler for this user show the option to set ; If Basilisk isn't the http handler for this user show the option to set
; Firefox as the default browser. ; Basilisk as the default browser.
${If} "$R9" != "true" ${If} "$R9" != "true"
${AndIf} ${AtMostWin2008R2} ${AndIf} ${AtMostWin2008R2}
WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4" WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4"

2
browser/installer/windows/nsis/maintenanceservice_installer.nsi
View file

@ -78,7 +78,7 @@ SetOverwrite on
"Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService" "Software\Microsoft\Windows\CurrentVersion\Uninstall\MozillaMaintenanceService"
; Always install into the 32-bit location even if we have a 64-bit build. ; Always install into the 32-bit location even if we have a 64-bit build.
; This is because we use only 1 service for all Firefox channels. ; This is because we use only 1 service for all Basilisk channels.
; Allow either x86 and x64 builds to exist at this location, depending on ; Allow either x86 and x64 builds to exist at this location, depending on
; what is the latest build. ; what is the latest build.
InstallDir "$PROGRAMFILES32\${MaintFullName}\" InstallDir "$PROGRAMFILES32\${MaintFullName}\"

38
browser/installer/windows/nsis/stub.nsi
View file

@ -76,7 +76,7 @@ Var ProgressTotal
Var TmpVal Var TmpVal
Var ExitCode Var ExitCode
Var FirefoxLaunchCode Var BasiliskLaunchCode
; The first three tick counts are for the start of a phase and equate equate to ; The first three tick counts are for the start of a phase and equate equate to
; the display of individual installer pages. ; the display of individual installer pages.
@ -457,7 +457,7 @@ Function .onInit
StrCpy $EndInstallPhaseTickCount "0" StrCpy $EndInstallPhaseTickCount "0"
StrCpy $InitialInstallRequirementsCode "" StrCpy $InitialInstallRequirementsCode ""
StrCpy $IsDownloadFinished "" StrCpy $IsDownloadFinished ""
StrCpy $FirefoxLaunchCode "0" StrCpy $BasiliskLaunchCode "0"
StrCpy $CheckboxShortcutOnBar "1" StrCpy $CheckboxShortcutOnBar "1"
StrCpy $CheckboxShortcutInStartMenu "1" StrCpy $CheckboxShortcutInStartMenu "1"
StrCpy $CheckboxShortcutOnDesktop "1" StrCpy $CheckboxShortcutOnDesktop "1"
@ -674,17 +674,17 @@ Function SendPing
${GetParent} "$R2" $R3 ${GetParent} "$R2" $R3
${GetLongPath} "$R3" $R3 ${GetLongPath} "$R3" $R3
${If} $R3 == $INSTDIR ${If} $R3 == $INSTDIR
StrCpy $R2 "1" ; This Firefox install is set as default. StrCpy $R2 "1" ; This Basilisk install is set as default.
${Else} ${Else}
StrCpy $R2 "$R2" "" -11 # length of firefox.exe StrCpy $R2 "$R2" "" -11 # length of firefox.exe
${If} "$R2" == "${FileMainEXE}" ${If} "$R2" == "${FileMainEXE}"
StrCpy $R2 "2" ; Another Firefox install is set as default. StrCpy $R2 "2" ; Another Basilisk install is set as default.
${Else} ${Else}
StrCpy $R2 "0" StrCpy $R2 "0"
${EndIf} ${EndIf}
${EndIf} ${EndIf}
${Else} ${Else}
StrCpy $R2 "0" ; Firefox is not set as default. StrCpy $R2 "0" ; Basilisk is not set as default.
${EndIf} ${EndIf}
${If} "$R2" == "0" ${If} "$R2" == "0"
@ -704,17 +704,17 @@ Function SendPing
${GetParent} "$R2" $R3 ${GetParent} "$R2" $R3
${GetLongPath} "$R3" $R3 ${GetLongPath} "$R3" $R3
${If} $R3 == $INSTDIR ${If} $R3 == $INSTDIR
StrCpy $R2 "1" ; This Firefox install is set as default. StrCpy $R2 "1" ; This Basilisk install is set as default.
${Else} ${Else}
StrCpy $R2 "$R2" "" -11 # length of firefox.exe StrCpy $R2 "$R2" "" -11 # length of firefox.exe
${If} "$R2" == "${FileMainEXE}" ${If} "$R2" == "${FileMainEXE}"
StrCpy $R2 "2" ; Another Firefox install is set as default. StrCpy $R2 "2" ; Another Basilisk install is set as default.
${Else} ${Else}
StrCpy $R2 "0" StrCpy $R2 "0"
${EndIf} ${EndIf}
${EndIf} ${EndIf}
${Else} ${Else}
StrCpy $R2 "0" ; Firefox is not set as default. StrCpy $R2 "0" ; Basilisk is not set as default.
${EndIf} ${EndIf}
${EndIf} ${EndIf}
${EndUnless} ${EndUnless}
@ -740,7 +740,7 @@ Function SendPing
$\nBuild Channel = ${Channel} \ $\nBuild Channel = ${Channel} \
$\nUpdate Channel = ${UpdateChannel} \ $\nUpdate Channel = ${UpdateChannel} \
$\nLocale = ${AB_CD} \ $\nLocale = ${AB_CD} \
$\nFirefox x64 = $R0 \ $\nBasilisk x64 = $R0 \
$\nRunning x64 Windows = $R1 \ $\nRunning x64 Windows = $R1 \
$\nMajor = $5 \ $\nMajor = $5 \
$\nMinor = $6 \ $\nMinor = $6 \
@ -748,7 +748,7 @@ Function SendPing
$\nServicePack = $8 \ $\nServicePack = $8 \
$\nIsServer = $9 \ $\nIsServer = $9 \
$\nExit Code = $ExitCode \ $\nExit Code = $ExitCode \
$\nFirefox Launch Code = $FirefoxLaunchCode \ $\nBasilisk Launch Code = $BasiliskLaunchCode \
$\nDownload Retry Count = $DownloadRetryCount \ $\nDownload Retry Count = $DownloadRetryCount \
$\nDownloaded Bytes = $DownloadedBytes \ $\nDownloaded Bytes = $DownloadedBytes \
$\nDownload Size Bytes = $DownloadSizeBytes \ $\nDownload Size Bytes = $DownloadSizeBytes \
@ -779,7 +779,7 @@ Function SendPing
Call RelativeGotoPage Call RelativeGotoPage
!else !else
${NSD_CreateTimer} OnPing ${DownloadIntervalMS} ${NSD_CreateTimer} OnPing ${DownloadIntervalMS}
InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$FirefoxLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData" \ InetBgDL::Get "${BaseURLStubPing}/${StubURLVersion}${StubURLVersionAppend}/${Channel}/${UpdateChannel}/${AB_CD}/$R0/$R1/$5/$6/$7/$8/$9/$ExitCode/$BasiliskLaunchCode/$DownloadRetryCount/$DownloadedBytes/$DownloadSizeBytes/$IntroPhaseSeconds/$OptionsPhaseSeconds/$0/$1/$DownloadFirstTransferSeconds/$2/$3/$4/$InitialInstallRequirementsCode/$OpenedDownloadPage/$ExistingProfile/$ExistingVersion/$ExistingBuildID/$R5/$R6/$R7/$R8/$R2/$R3/$DownloadServerIP/$PostSigningData" \
"$PLUGINSDIR\_temp" /END "$PLUGINSDIR\_temp" /END
!endif !endif
${Else} ${Else}
@ -805,10 +805,10 @@ Function createIntro
nsDialogs::OnBack /NOUNLOAD $0 nsDialogs::OnBack /NOUNLOAD $0
!ifdef ${AB_CD}_rtl !ifdef ${AB_CD}_rtl
; For RTL align the text with the top of the F in the Firefox bitmap ; For RTL align the text with the top of the F in the Basilisk bitmap
StrCpy $0 "${INTRO_BLURB_RTL_TOP_DU}" StrCpy $0 "${INTRO_BLURB_RTL_TOP_DU}"
!else !else
; For LTR align the text with the top of the x in the Firefox bitmap ; For LTR align the text with the top of the x in the Basilisk bitmap
StrCpy $0 "${INTRO_BLURB_LTR_TOP_DU}" StrCpy $0 "${INTRO_BLURB_LTR_TOP_DU}"
!endif !endif
${NSD_CreateLabel} ${INTRO_BLURB_EDGE_DU} $0 ${INTRO_BLURB_WIDTH_DU} 76u "${INTRO_BLURB}" ${NSD_CreateLabel} ${INTRO_BLURB_EDGE_DU} $0 ${INTRO_BLURB_WIDTH_DU} 76u "${INTRO_BLURB}"
@ -1337,7 +1337,7 @@ Function createInstall
StrCpy $ExistingBuildID "0" StrCpy $ExistingBuildID "0"
${EndIf} ${EndIf}
${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Firefox" ${If} ${FileExists} "$LOCALAPPDATA\Mozilla\Basilisk"
StrCpy $ExistingProfile "1" StrCpy $ExistingProfile "1"
${Else} ${Else}
StrCpy $ExistingProfile "0" StrCpy $ExistingProfile "0"
@ -1771,7 +1771,7 @@ Function FinishInstall
; If we have something other than empty string now, write the value. ; If we have something other than empty string now, write the value.
${If} "$0" != "" ${If} "$0" != ""
ClearErrors ClearErrors
WriteRegStr HKCU "Software\Mozilla\Firefox" "OldDefaultBrowserCommand" "$0" WriteRegStr HKCU "Software\Mozilla\Basilisk" "OldDefaultBrowserCommand" "$0"
${EndIf} ${EndIf}
${GetParameters} $0 ${GetParameters} $0
@ -2017,13 +2017,13 @@ Function LaunchApp
!ifndef DEV_EDITION !ifndef DEV_EDITION
FindWindow $0 "${WindowClass}" FindWindow $0 "${WindowClass}"
${If} $0 <> 0 ; integer comparison ${If} $0 <> 0 ; integer comparison
StrCpy $FirefoxLaunchCode "1" StrCpy $BasiliskLaunchCode "1"
MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)" MessageBox MB_OK|MB_ICONQUESTION "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)"
Return Return
${EndIf} ${EndIf}
!endif !endif
StrCpy $FirefoxLaunchCode "2" StrCpy $BasiliskLaunchCode "2"
; Set the current working directory to the installation directory ; Set the current working directory to the installation directory
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
@ -2056,8 +2056,8 @@ Function CopyPostSigningData
ClearErrors ClearErrors
StrCpy $PostSigningData "0" StrCpy $PostSigningData "0"
${Else} ${Else}
CreateDirectory "$LOCALAPPDATA\Mozilla\Firefox" CreateDirectory "$LOCALAPPDATA\Mozilla\Basilisk"
CopyFiles /SILENT "$EXEDIR\postSigningData" "$LOCALAPPDATA\Mozilla\Firefox" CopyFiles /SILENT "$EXEDIR\postSigningData" "$LOCALAPPDATA\Mozilla\Basilisk"
${Endif} ${Endif}
FunctionEnd FunctionEnd

44
browser/installer/windows/nsis/uninstaller.nsi
View file

@ -258,7 +258,7 @@ Section "Uninstall"
${EndIf} ${EndIf}
; Remove the updates directory for Vista and above ; Remove the updates directory for Vista and above
${un.CleanUpdateDirectories} "Mozilla\Firefox" "Mozilla\updates" ${un.CleanUpdateDirectories} "Mozilla\Basilisk" "Mozilla\updates"
; Remove any app model id's stored in the registry for this install path ; Remove any app model id's stored in the registry for this install path
DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR" DeleteRegValue HKCU "Software\Mozilla\${AppName}\TaskBarIDs" "$INSTDIR"
@ -278,27 +278,27 @@ Section "Uninstall"
${un.SetAppLSPCategories} ${un.SetAppLSPCategories}
${EndIf} ${EndIf}
${un.RegCleanAppHandler} "FirefoxURL" ${un.RegCleanAppHandler} "BasiliskURL"
${un.RegCleanAppHandler} "FirefoxHTML" ${un.RegCleanAppHandler} "BasiliskHTML"
${un.RegCleanProtocolHandler} "ftp" ${un.RegCleanProtocolHandler} "ftp"
${un.RegCleanProtocolHandler} "http" ${un.RegCleanProtocolHandler} "http"
${un.RegCleanProtocolHandler} "https" ${un.RegCleanProtocolHandler} "https"
ClearErrors ClearErrors
ReadRegStr $R9 HKCR "FirefoxHTML" "" ReadRegStr $R9 HKCR "BasiliskHTML" ""
; Don't clean up the file handlers if the FirefoxHTML key still exists since ; Don't clean up the file handlers if the BasiliskHTML key still exists since
; there should be a second installation that may be the default file handler ; there should be a second installation that may be the default file handler
${If} ${Errors} ${If} ${Errors}
${un.RegCleanFileHandler} ".htm" "FirefoxHTML" ${un.RegCleanFileHandler} ".htm" "BasiliskHTML"
${un.RegCleanFileHandler} ".html" "FirefoxHTML" ${un.RegCleanFileHandler} ".html" "BasiliskHTML"
${un.RegCleanFileHandler} ".shtml" "FirefoxHTML" ${un.RegCleanFileHandler} ".shtml" "BasiliskHTML"
${un.RegCleanFileHandler} ".xht" "FirefoxHTML" ${un.RegCleanFileHandler} ".xht" "BasiliskHTML"
${un.RegCleanFileHandler} ".xhtml" "FirefoxHTML" ${un.RegCleanFileHandler} ".xhtml" "BasiliskHTML"
${un.RegCleanFileHandler} ".oga" "FirefoxHTML" ${un.RegCleanFileHandler} ".oga" "BasiliskHTML"
${un.RegCleanFileHandler} ".ogg" "FirefoxHTML" ${un.RegCleanFileHandler} ".ogg" "BasiliskHTML"
${un.RegCleanFileHandler} ".ogv" "FirefoxHTML" ${un.RegCleanFileHandler} ".ogv" "BasiliskHTML"
${un.RegCleanFileHandler} ".pdf" "FirefoxHTML" ${un.RegCleanFileHandler} ".pdf" "BasiliskHTML"
${un.RegCleanFileHandler} ".webm" "FirefoxHTML" ${un.RegCleanFileHandler} ".webm" "BasiliskHTML"
${EndIf} ${EndIf}
SetShellVarContext all ; Set SHCTX to HKLM SetShellVarContext all ; Set SHCTX to HKLM
@ -317,7 +317,7 @@ Section "Uninstall"
; The StartMenuInternet registry key is independent of the default browser ; The StartMenuInternet registry key is independent of the default browser
; settings. The XPInstall base un-installer always removes this key if it is ; settings. The XPInstall base un-installer always removes this key if it is
; uninstalling the default browser and it will always replace the keys when ; uninstalling the default browser and it will always replace the keys when
; installing even if there is another install of Firefox that is set as the ; installing even if there is another install of Basilisk that is set as the
; default browser. Now the key is always updated on install but it is only ; default browser. Now the key is always updated on install but it is only
; removed if it refers to this install location. ; removed if it refers to this install location.
${If} "$INSTDIR" == "$R1" ${If} "$INSTDIR" == "$R1"
@ -333,7 +333,7 @@ Section "Uninstall"
; The StartMenuInternet registry key is independent of the default browser ; The StartMenuInternet registry key is independent of the default browser
; settings. The XPInstall base un-installer always removes this key if it is ; settings. The XPInstall base un-installer always removes this key if it is
; uninstalling the default browser and it will always replace the keys when ; uninstalling the default browser and it will always replace the keys when
; installing even if there is another install of Firefox that is set as the ; installing even if there is another install of Basilisk that is set as the
; default browser. Now the key is always updated on install but it is only ; default browser. Now the key is always updated on install but it is only
; removed if it refers to this install location. ; removed if it refers to this install location.
${If} "$INSTDIR" == "$R1" ${If} "$INSTDIR" == "$R1"
@ -443,12 +443,12 @@ Section "Uninstall"
; clients registry key by the OS under some conditions. ; clients registry key by the OS under some conditions.
System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i 0, i 0, i 0)" System::Call "shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i 0, i 0, i 0)"
; Users who uninstall then reinstall expecting Firefox to use a clean profile ; Users who uninstall then reinstall expecting Basilisk to use a clean profile
; may be surprised during first-run. This key is checked during startup of Firefox and ; may be surprised during first-run. This key is checked during startup of Basilisk and
; subsequently deleted after checking. If the value is found during startup ; subsequently deleted after checking. If the value is found during startup
; the browser will offer to Reset Firefox. We use the UpdateChannel to match ; the browser will offer to Reset Basilisk. We use the UpdateChannel to match
; uninstalls of Firefox-release with reinstalls of Firefox-release, for example. ; uninstalls of Basilisk-release with reinstalls of Basilisk-release, for example.
WriteRegStr HKCU "Software\Mozilla\Firefox" "Uninstalled-${UpdateChannel}" "True" WriteRegStr HKCU "Software\Mozilla\Basilisk" "Uninstalled-${UpdateChannel}" "True"
!ifdef MOZ_MAINTENANCE_SERVICE !ifdef MOZ_MAINTENANCE_SERVICE
; Get the path the allowed cert is at and remove it ; Get the path the allowed cert is at and remove it