Fix accidental static import of IsWow64Process2() and tweak message text

This commit is contained in:
Cameron Gutman 2020-12-28 13:32:02 -06:00
parent 565bba6e55
commit 44b61d9252
2 changed files with 3 additions and 3 deletions

View file

@ -24,8 +24,8 @@ SystemProperties::SystemProperties()
USHORT processArch, machineArch; USHORT processArch, machineArch;
// Use IsWow64Process2 on TH2 and later, because it supports ARM64 // Use IsWow64Process2 on TH2 and later, because it supports ARM64
auto isWow64Process2 = (decltype(IsWow64Process2)*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process2"); auto fnIsWow64Process2 = (decltype(IsWow64Process2)*)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process2");
if (isWow64Process2 != nullptr && IsWow64Process2(GetCurrentProcess(), &processArch, &machineArch)) { if (fnIsWow64Process2 != nullptr && fnIsWow64Process2(GetCurrentProcess(), &processArch, &machineArch)) {
switch (machineArch) { switch (machineArch) {
case IMAGE_FILE_MACHINE_I386: case IMAGE_FILE_MACHINE_I386:
nativeArch = "i386"; nativeArch = "i386";

View file

@ -405,7 +405,7 @@ ApplicationWindow {
NavigableMessageDialog { NavigableMessageDialog {
id: wow64Dialog id: wow64Dialog
standardButtons: Dialog.Ok | Dialog.Cancel standardButtons: Dialog.Ok | Dialog.Cancel
text: qsTr("This PC is running the %1 version of Windows. Please download the %1 version of Moonlight for the best streaming performance.").arg(SystemProperties.friendlyNativeArchName) text: qsTr("This version of Moonlight isn't optimized for your PC. Please download the '%1' version of Moonlight for the best streaming performance.").arg(SystemProperties.friendlyNativeArchName)
onAccepted: { onAccepted: {
Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-qt/releases"); Qt.openUrlExternally("https://github.com/moonlight-stream/moonlight-qt/releases");
} }