Skip to content

Commit ca04b07

Browse files
authored
Fix CEF crashing on wine (PR #2875)
1 parent af30d18 commit ca04b07

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Client/ceflauncher_DLL/Main.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*****************************************************************************/
1010
#define WIN32_LEAN_AND_MEAN
1111
#include <Windows.h>
12+
#include <delayimp.h>
1213
#include "CCefApp.h"
1314
#include <string>
1415
#include <cef3/cef/include/cef_sandbox_win.h>
@@ -30,6 +31,9 @@ int _declspec(dllexport) InitCEF()
3031
std::wstring mtaPath = currentFileName.substr(0, pos - 3); // Strip "CEF"
3132
SetDllDirectory(mtaPath.c_str());
3233

34+
// Load libcef.dll from the DLL directory
35+
assert(SUCCEEDED(__HrLoadAllImportsForDll("libcef.dll")));
36+
3337
// Load CEF
3438
CefMainArgs mainArgs(GetModuleHandle(NULL));
3539
CefRefPtr<CCefApp> app{new CCefApp};

Client/ceflauncher_DLL/premake5.lua

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ project "CEFLauncher DLL"
2222
"*.cpp"
2323
}
2424

25-
links { "CEF", "libcef.lib", "Psapi.lib", "version.lib", "Winmm.lib", "Ws2_32.lib", "DbgHelp.lib" }
25+
links { "delayimp", "CEF", "libcef.lib", "Psapi.lib", "version.lib", "Winmm.lib", "Ws2_32.lib", "DbgHelp.lib" }
26+
linkoptions { "/DELAYLOAD:libcef.dll" }
2627

2728
filter "architecture:not x86"
2829
flags { "ExcludeFromBuild" }

0 commit comments

Comments
 (0)