Skip to content

Fix windows startup freeze when geode fails to load #2082

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
pipe1os wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix windows startup freeze when geode fails to load #2082

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e307d37
fix(windows): avoid ui calls inside dllmain
pipe1os May 23, 2026
92c6ecb
fix(windows): show early error dialog in a thread to avoid loader lock
pipe1os May 24, 2026
72d0111
fix merge conflict in earlyError
pipe1os May 24, 2026
9066ab7
Merge upstream/main into fix/dllmain-loader-lock
pipe1os Jul 21, 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
21 changes: 19 additions & 2 deletions loader/src/platform/windows/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,23 @@ DWORD WINAPI upgradeThread(void*) {
return 0;
}

DWORD WINAPI earlyErrorThread(void* param) {
auto* msg = reinterpret_cast<std::string*>(param);
console::messageBox("Unable to Load Geode!", *msg);
delete msg;
return 0;
}

void earlyError(std::string message) {
// try to write a file and display a message box
// wine might not display the message box but *should* write a file
(void) utils::file::writeString("_geode_early_error.txt", message);
console::messageBox("Unable to Load Geode!", message);

// show the error after dllmain returns and the loader lock releases
CreateThread(
nullptr, 0, earlyErrorThread,
new std::string(message), 0, nullptr
);
}

BOOL WINAPI DllMain(HINSTANCE module, DWORD reason, LPVOID) {
Expand All @@ -392,7 +404,12 @@ BOOL WINAPI DllMain(HINSTANCE module, DWORD reason, LPVOID) {
std::error_code error;
bool oldBootstrapperExists = std::filesystem::exists(workingDir / "GeodeBootstrapper.dll", error);
if (error) {
earlyError("There was an error checking whether the old GeodeBootstrapper.dll exists: " + error.message());
// can't use a thread here, dll is about to unload
console::messageBox(
"Unable to Load Geode!",
"There was an error checking whether the old "
"GeodeBootstrapper.dll exists: " + error.message()
);
return FALSE;
}
else if (oldBootstrapperExists)
Expand Down