3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-03-04 17:44:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

FIX: fix studio not launch issue on windows-7

Browse source 
jira: no-jira
Change-Id: I531e009c0547d3a5d86d48e990d930eb8fa6ba00
(cherry picked from commit 3d02f03ef4ba229ebf9e28cd99a5d871916994dd)
This commit is contained in:
lane.wei 2025-04-16 14:50:18 +08:00 • committed by Noisyfox
parent 285bbeceb7
commit 2d7259623f
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/slic3r/GUI/GUI_App.cpp
View file

@ -2286,23 +2286,31 @@ bool GUI_App::on_init_inner()
#endif
BOOST_LOG_TRIVIAL(info) << boost::format("gui mode, Current OrcaSlicer Version %1%")%SoftFever_VERSION;
#if defined(__WINDOWS__)
USHORT processMachine = 0;
USHORT nativeMachine = 0;
if (IsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine)) {
switch (nativeMachine) {
case IMAGE_FILE_MACHINE_ARM64:
m_is_arm64 = true;
break;
case IMAGE_FILE_MACHINE_AMD64:
default:
m_is_arm64 = false;
break;
HMODULE hKernel32 = GetModuleHandleW(L"kernel32.dll");
m_is_arm64 = false;
if (hKernel32) {
auto fnIsWow64Process2 = (decltype(&IsWow64Process2))GetProcAddress(hKernel32, "IsWow64Process2");
if (fnIsWow64Process2) {
USHORT processMachine = 0;
USHORT nativeMachine = 0;
if (IsWow64Process2(GetCurrentProcess(), &processMachine, &nativeMachine)) {
if (nativeMachine == IMAGE_FILE_MACHINE_ARM64) {
m_is_arm64 = true;
}
BOOST_LOG_TRIVIAL(info) << boost::format("processMachine architecture %1%, nativeMachine %2% m_is_arm64 %3%")%(int)(processMachine) %(int) nativeMachine %m_is_arm64;
}
else {
BOOST_LOG_TRIVIAL(info) << boost::format("IsWow64Process2 failed, set m_is_arm64 to %1%") %m_is_arm64;
}
}
else {
BOOST_LOG_TRIVIAL(info) << boost::format("can not find IsWow64Process2, set m_is_arm64 to %1%") %m_is_arm64;
}
BOOST_LOG_TRIVIAL(info) << boost::format("processMachine architecture %1%, nativeMachine %2% m_is_arm64 %3%")%(int)(processMachine) %(int) nativeMachine %m_is_arm64;
}
else {
BOOST_LOG_TRIVIAL(info) << boost::format("IsWow64Process2 failed, m_is_arm64 %1%") %m_is_arm64;
BOOST_LOG_TRIVIAL(info) << boost::format("can not find kernel32, set m_is_arm64 to %1%") %m_is_arm64;
}
#endif
// Enable this to get the default Win32 COMCTRL32 behavior of static boxes.