From 0db8c0caf0a01a8f8dfdd908f5ae96826b3c144c Mon Sep 17 00:00:00 2001 From: Basilisk-Dev Date: Wed, 10 Aug 2022 15:26:20 -0400 Subject: Issue #20 - Remove Windows XP Firewall logic from installer --- basilisk/components/migration/IEProfileMigrator.js | 2 +- basilisk/installer/windows/nsis/shared.nsh | 11 ----------- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/basilisk/components/migration/IEProfileMigrator.js b/basilisk/components/migration/IEProfileMigrator.js index 53c1323..ad5274d 100644 --- a/basilisk/components/migration/IEProfileMigrator.js +++ b/basilisk/components/migration/IEProfileMigrator.js @@ -477,7 +477,7 @@ IEProfileMigrator.prototype.getResources = function IE_getResources() { MSMigrationUtils.getCookiesMigrator(), new Settings(), ]; - // Only support the form password migrator for Windows XP to 7. + // Only support the form password migrator for Windows 7. if (AppConstants.isPlatformAndVersionAtMost("win", "6.1")) { resources.push(new IE7FormPasswords()); } diff --git a/basilisk/installer/windows/nsis/shared.nsh b/basilisk/installer/windows/nsis/shared.nsh index 1996fb9..0ab40b7 100644 --- a/basilisk/installer/windows/nsis/shared.nsh +++ b/basilisk/installer/windows/nsis/shared.nsh @@ -1116,17 +1116,6 @@ System::Call 'advapi32::CloseServiceHandle(i R7) n' ; Open the service with SERVICE_QUERY_CONFIG so its status can be queried. System::Call 'advapi32::OpenServiceW(i R6, t "MpsSvc", i ${SERVICE_QUERY_STATUS}) i.R7' - ${Else} - ; SharedAccess is the Firewall service on Windows XP. - ; When opening the service with SERVICE_QUERY_CONFIG the return value will - ; be 0 if the service is not installed. - System::Call 'advapi32::OpenServiceW(i R6, t "SharedAccess", i ${SERVICE_QUERY_CONFIG}) i.R7' - ${If} $R7 != 0 - System::Call 'advapi32::CloseServiceHandle(i R7) n' - ; Open the service with SERVICE_QUERY_CONFIG so its status can be - ; queried. - System::Call 'advapi32::OpenServiceW(i R6, t "SharedAccess", i ${SERVICE_QUERY_STATUS}) i.R7' - ${EndIf} ${EndIf} ; Did the calls to OpenServiceW succeed? ${If} $R7 != 0 -- cgit v1.2.3