mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Warn users running non-ARM version on ARM CPU (#4473)

Browse source
This commit is contained in:
Tom Najdek 2024-08-01 07:22:03 +02:00 • committed by GitHub
parent 41fe1e4aea
commit 7c3d04e03a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 92 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

46
chrome/content/zotero/xpcom/zotero.js
View file

@ -43,7 +43,7 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
/*
* Core functions
*/
(function(){
(function() {
// Privileged (public) methods
this.getStorageDirectory = getStorageDirectory;
this.debug = debug;
@ -1349,6 +1349,48 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
return errors;
}
this.isWin64EmulatedOnArm = function () {
if (!this.isWin) {
return false;
}
if (Services.sysinfo.getProperty("build") < 22000) {
// GetMachineTypeAttributes is only available on Windows 11 and later
return false;
}
if (this.arch !== "x86_64") {
// We only check if x86_64 build is running on ARM
return false;
}
// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/ne-processthreadsapi-machine_attributes
const userEnabled = 0x00000001;
let { ctypes } = ChromeUtils.importESModule(
"resource://gre/modules/ctypes.sys.mjs"
);
try {
// https://learn.microsoft.com/en-us/windows/win32/api/processthreadsapi/nf-processthreadsapi-getmachinetypeattributes
let kernel32 = ctypes.open("Kernel32");
let getMachineTypeAttributesC = kernel32.declare(
"GetMachineTypeAttributes",
ctypes.winapi_abi,
ctypes.int,
ctypes.unsigned_short,
ctypes.int.ptr
);
let aa64 = 0xaa64;
let output = ctypes.int();
getMachineTypeAttributesC(aa64, output.address());
kernel32.close();
return !!(output.value & userEnabled);
}
catch (e) {
Zotero.logError(e);
return false;
}
}
/**
* Get versions, platform, etc.
@ -1367,7 +1409,7 @@ Services.scriptloader.loadSubScript("resource://zotero/polyfill.js");
if (Zotero.isWin) {
let info = await Services.sysinfo.processInfo;
if (info.isWowARM64) {
if (info.isWowARM64 || this.isWin64EmulatedOnArm()) {
version += " on ARM64";
}
else if (info.isWow64) {

17
chrome/content/zotero/zoteroPane.js
View file

@ -6115,19 +6115,30 @@ var ZoteroPane = new function()
this.showArchitectureWarning = async function () {
const remindInterval = 60 * 60 * 24 * 30;
const isWow64 = (await Services.sysinfo.processInfo).isWow64;
const is32bitBuild = Zotero.arch === 'x86';
const lastDisplayed = Zotero.Prefs.get('architecture.warning.lastDisplayed') ?? 0;
if (lastDisplayed > Math.round(Date.now() / 1000) - remindInterval) {
return;
}
if (Zotero.isWin && isWow64 && is32bitBuild) {
const isWow64 = (await Services.sysinfo.processInfo).isWow64;
const isX64OnArm = Zotero.isWin64EmulatedOnArm();
if (Zotero.isWin && (isWow64 || isX64OnArm)) {
let panel = document.getElementById('architecture-warning-container');
let action = document.getElementById('architecture-warning-action');
let close = document.getElementById('architecture-warning-close');
let remind = document.getElementById('architecture-warning-remind');
let message = document.getElementById('architecture-warning-message');
if (isWow64) {
message.dataset.l10nId = 'architecture-win32-warning-message';
action.dataset.l10nId = 'architecture-warning-action';
}
else if (isX64OnArm) {
message.dataset.l10nId = 'architecture-x64-on-arm64-message';
action.dataset.l10nId = 'architecture-x64-on-arm64-action';
}
panel.removeAttribute('collapsed');
action.onclick = function () {

10
chrome/content/zotero/zoteroPane.xhtml
View file

@ -1141,12 +1141,12 @@
</vbox>
<vbox id="architecture-warning-container" collapsed="true" role="status">
<html:div id="architecture-warning-banner" class="banner">
<html:div id="architecture-win32-warning-message" class="message" data-l10n-id="architecture-win32-warning-message" />
<html:a id="architecture-warning-action" data-l10n-id="architecture-warning-action" />
<html:div id="architecture-warning-banner">
<html:div id="architecture-warning-message" class="message" data-l10n-id="architecture-win32-warning-message" />
<html:a id="architecture-warning-action" data-l10n-id="architecture-warning-action" class="link" />
<html:div class="spacer" />
<html:a id="architecture-warning-remind" data-l10n-id="general-remind-me-later" />
<label is="text-link" id="architecture-warning-close">×</label>
<label is="text-link" id="architecture-warning-remind" data-l10n-id="general-remind-me-later" />
<label is="text-link" id="architecture-warning-close" class="close-link">×</label>
</html:div>
</vbox>

2
chrome/locale/en-US/zotero/zotero.ftl
View file

@ -630,6 +630,8 @@ locate-library-lookup-no-resolver = You must choose a resolver from the { $pane
architecture-win32-warning-message = { -app-name } is running in 32-bit mode on a 64-bit version of Windows. { -app-name } will run more efficiently in 64-bit mode.
architecture-warning-action = Download 64-bit { -app-name }
architecture-x64-on-arm64-message = { -app-name } is running in emulated mode. A native version of { -app-name } will run more efficiently.
architecture-x64-on-arm64-action = Download { -app-name } for ARM64
first-run-guidance-quickFormat = Type a title, author, and/or year to search for a reference.

4
scss/_zotero.scss
View file

@ -23,7 +23,7 @@
@import "components/advancedSearch";
@import "components/annotation";
@import "components/autosuggest";
@import "components/banner";
@import "components/banners";
@import "components/button";
@import "components/clicky";
@import "components/contextPane";
@ -64,7 +64,7 @@
@import "components/tabsMenu";
@import "components/newCollectionDialog";
@import "components/reader";
@import "components/banners";
// Elements
// --------------------------------------------------

50
scss/components/_banner.scss
View file

@ -1,50 +0,0 @@
.banner {
border-bottom: var(--color-panedivider) .5px solid;
display: flex;
font-size: 1.03846154em;
font-weight: 600;
justify-content: center;
line-height: 2.07692308em;
overflow: hidden;
padding: 0 2em;
.message {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
> .spacer {
flex: 1;
}
> a {
border: none;
color: inherit;
margin: 0;
padding: 0 .5em;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
// extra space after the last link after spacer, i.e., the one immediately before the X button
.spacer ~ a:last-of-type {
padding-right: 1em;
}
> label {
color: inherit;
cursor: pointer;
font-size: 1.69230769em;
position: absolute;
right: 9px;
text-decoration: none;
top: -3px;
}
}
#architecture-warning-container {
background-color: var(--accent-red);
color: white;
}

25
scss/components/_banners.scss
View file

@ -1,4 +1,4 @@
#post-upgrade-banner, #retracted-items-banner, #sync-reminder-banner {
#post-upgrade-banner, #retracted-items-banner, #sync-reminder-banner, #architecture-warning-banner {
@include macOS-normalize-controls;
display: flex;
@ -60,7 +60,7 @@
}
}
#retracted-items-banner, #sync-reminder-banner {
#retracted-items-banner, #sync-reminder-banner, #architecture-warning-banner {
line-height: 2.2em;
font-size: 13.5px;
padding: 0 2em;
@ -110,3 +110,24 @@
}
}
}
#architecture-warning-container {
background-color: var(--accent-red);
color: white;
.message {
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
a {
border: none;
color: inherit;
margin: 0;
padding: 0 .5em;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
}
}