3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2026-01-02 21:10:29 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

FIX: GUI: use another api to get process type

Browse source 
jira: no-jira
Change-Id: I43fb1738b9b0173704c17c0d92df06f3c78fcde6
(cherry picked from commit af8926ea396480ea06222d421a2ecb704df04218)
This commit is contained in:
lane.wei 2025-04-11 11:07:43 +08:00 • committed by Noisyfox
parent ebc072b141
commit 285bbeceb7
2 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/slic3r/GUI/AboutDialog.cpp
View file

@ -328,7 +328,7 @@ AboutDialog::AboutDialog()
copyright_hor_sizer->Add(copyright_ver_sizer, 0, wxLEFT, FromDIP(20));
wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright(C) 2022-2024 Li Jiang All Rights Reserved", wxDefaultPosition, wxDefaultSize);
wxStaticText *html_text = new wxStaticText(this, wxID_ANY, "Copyright(C) 2022-2025 Li Jiang All Rights Reserved", wxDefaultPosition, wxDefaultSize);
html_text->SetForegroundColour(wxColour(107, 107, 107));
copyright_ver_sizer->Add(html_text, 0, wxALL , 0);

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

@ -2287,18 +2287,23 @@ bool GUI_App::on_init_inner()
BOOST_LOG_TRIVIAL(info) << boost::format("gui mode, Current OrcaSlicer Version %1%")%SoftFever_VERSION;
#if defined(__WINDOWS__)
SYSTEM_INFO sysInfo;
GetNativeSystemInfo(&sysInfo);
switch (sysInfo.wProcessorArchitecture) {
case PROCESSOR_ARCHITECTURE_ARM64:
m_is_arm64 = true;
break;
case PROCESSOR_ARCHITECTURE_AMD64:
default:
m_is_arm64 = false;
break;
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;
}
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("process architecture %1%, m_is_arm64 %2%")%(int)(sysInfo.wProcessorArchitecture) %m_is_arm64;
#endif
// Enable this to get the default Win32 COMCTRL32 behavior of static boxes.
// wxSystemOptions::SetOption("msw.staticbox.optimized-paint", 0);