diff --git a/ThunkLibs/libwayland-client/Guest.cpp b/ThunkLibs/libwayland-client/Guest.cpp index 48514dd171..b108146887 100644 --- a/ThunkLibs/libwayland-client/Guest.cpp +++ b/ThunkLibs/libwayland-client/Guest.cpp @@ -327,17 +327,17 @@ extern "C" void wl_log_set_handler_client(wl_log_func_t handler) { void OnInit() { - fex_wl_exchange_interface_pointer(const_cast(&wl_output_interface), "wl_output"); - fex_wl_exchange_interface_pointer(const_cast(&wl_shm_pool_interface), "wl_shm_pool"); - fex_wl_exchange_interface_pointer(const_cast(&wl_pointer_interface), "wl_pointer"); - fex_wl_exchange_interface_pointer(const_cast(&wl_compositor_interface), "wl_compositor"); - fex_wl_exchange_interface_pointer(const_cast(&wl_shm_interface), "wl_shm"); - fex_wl_exchange_interface_pointer(const_cast(&wl_registry_interface), "wl_registry"); - fex_wl_exchange_interface_pointer(const_cast(&wl_buffer_interface), "wl_buffer"); - fex_wl_exchange_interface_pointer(const_cast(&wl_seat_interface), "wl_seat"); - fex_wl_exchange_interface_pointer(const_cast(&wl_surface_interface), "wl_surface"); - fex_wl_exchange_interface_pointer(const_cast(&wl_keyboard_interface), "wl_keyboard"); - fex_wl_exchange_interface_pointer(const_cast(&wl_callback_interface), "wl_callback"); + fex_wl_exchange_interface_pointer(const_cast(&wl_output_interface), "wl_output_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_shm_pool_interface), "wl_shm_pool_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_pointer_interface), "wl_pointer_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_compositor_interface), "wl_compositor_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_shm_interface), "wl_shm_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_registry_interface), "wl_registry_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_buffer_interface), "wl_buffer_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_seat_interface), "wl_seat_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_surface_interface), "wl_surface_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_keyboard_interface), "wl_keyboard_interface"); + fex_wl_exchange_interface_pointer(const_cast(&wl_callback_interface), "wl_callback_interface"); } LOAD_LIB_INIT(libwayland-client, OnInit) diff --git a/ThunkLibs/libwayland-client/Host.cpp b/ThunkLibs/libwayland-client/Host.cpp index 88c115900c..1fd5cfb394 100644 --- a/ThunkLibs/libwayland-client/Host.cpp +++ b/ThunkLibs/libwayland-client/Host.cpp @@ -437,7 +437,7 @@ extern "C" int fexfn_impl_libwayland_client_wl_proxy_add_listener(struct wl_prox void fexfn_impl_libwayland_client_fex_wl_exchange_interface_pointer(guest_layout guest_interface_raw, const char* name) { auto& guest_interface = *guest_interface_raw.get_pointer(); auto& host_interface = guest_to_host_interface[reinterpret_cast*>(&guest_interface)]; - host_interface = reinterpret_cast(dlsym(fexldr_ptr_libwayland_client_so, (std::string { name } + "_interface").c_str())); + host_interface = reinterpret_cast(dlsym(fexldr_ptr_libwayland_client_so, name)); if (!host_interface) { fprintf(stderr, "Could not find host interface corresponding to %p (%s)\n", &guest_interface, name); std::abort();