Skip to content

fix(launcher/citicore): fall back to Win32 UI and downlevel SEH handling under Wine #4095

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RatPrez wants to merge 2 commits into
base: master
Choose a base branch
from
+12 −1
Open

fix(launcher/citicore): fall back to Win32 UI and downlevel SEH handling under Wine #4095

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ac6929
fix(launcher): fallback to Win32 UI under Wine
RatPrez Jul 29, 2026
7c8a049
fix(core): linux win downlevel for SEH lookup
RatPrez Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion code/client/citicore/SEHTableHandler.Win32.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

#include <udis86.h>

#include <LaunchMode.h>

static void* FindCallFromAddress(void* methodPtr, ud_mnemonic_code mnemonic = UD_Icall, bool breakOnFirst = false)
{
// return value holder
Expand Down Expand Up @@ -210,7 +212,8 @@ extern "C" void DLL_EXPORT CoreRT_SetupSEHHandler(void* moduleBase, void* module
if (!internalAddress)
{
// and 2k3 to 7 don't even _have_ Rtlpx - so we directly hook the Rtl* function
if (IsWindows8OrGreater())
// (Wine's ntdll doesn't match real ntdll's binary layout, so it never finds RtlpxLookupFunctionTable there either. Treat it like a downlevel OS)
if (IsWindows8OrGreater() && !CfxIsWine())
{
FatalError("Could not find RtlpxLookupFunctionTable - hooking RtlLookupFunctionTable directly. This will break on a Win8+ system since RtlpxLookupFunctionTable is supposed to exist!\n");
}
Expand Down
8 changes: 8 additions & 0 deletions code/client/launcher/UpdaterUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#include "launcher.rc.h"

#include <../citicore/LaunchMode.h>

#include <ShellScalingApi.h>

#include <winrt/Windows.Storage.Streams.h>
Expand Down Expand Up @@ -1333,6 +1335,12 @@ std::unique_ptr<TenUIBase> UI_InitTen()
forceOff = true;
}

if (CfxIsWine())
{
// WinRT XAML Islands not implemented in Wine/Proton, fall back to the plain Win32 controls UI.
forceOff = true;
}

#ifdef IS_LAUNCHER
forceOff = true;
#endif
Expand Down
Loading