nico/NickelMenu-custom
1
0
Fork 0
Code Releases 1 Activity

Fixed symbol resolution

Browse Source
This commit is contained in:
Patrick Gaskin
2020-04-22 00:55:06 -04:00
parent f6b2463eb4
commit 6908d89e67
2 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/menu.cc
View File

@@ -4,6 +4,7 @@
#include <QWidget>
#include <cstdlib>
#include <dlfcn.h>
#include "dlhook.h"
#include "menu.h"
@@ -40,9 +41,9 @@ extern "C" MenuTextItem* AbstractNickelMenuController_createMenuTextItem_hook(vo
extern "C" int nmi_menu_hook(void *libnickel, nmi_menu_entry_t *entries, size_t entries_n, char **err_out) {
#define NMI_ERR_RET 1
NMI_SYM(AbstractNickelMenuController_createMenuTextItem, "_ZN28AbstractNickelMenuController18createMenuTextItemEP5QMenuRK7QStringbbS4_");
NMI_SYM(AbstractNickelMenuController_createAction, "_ZN22AbstractMenuController12createActionEP5QMenuP7QWidgetbbb");
NMI_SYM(ConfirmationDialogFactory_showOKDialog, "_ZN25ConfirmationDialogFactory12showOKDialogERK7QStringS2_");
reinterpret_cast<void*&>(AbstractNickelMenuController_createMenuTextItem) = dlsym(libnickel, "_ZN28AbstractNickelMenuController18createMenuTextItemEP5QMenuRK7QStringbbS4_");
reinterpret_cast<void*&>(AbstractNickelMenuController_createAction) = dlsym(libnickel, "_ZN22AbstractMenuController12createActionEP5QMenuP7QWidgetbbb");
reinterpret_cast<void*&>(ConfirmationDialogFactory_showOKDialog) = dlsym(libnickel, "_ZN25ConfirmationDialogFactory12showOKDialogERK7QStringS2_");
NMI_ASSERT(AbstractNickelMenuController_createMenuTextItem, "unsupported firmware: could not find AbstractNickelMenuController::createMenuTextItem(void* _this, QMenu*, QString, bool, bool, QString const&)");
NMI_ASSERT(AbstractNickelMenuController_createAction, "unsupported firmware: could not find AbstractNickelMenuController::createAction(void* _this, QMenu*, QWidget*, bool, bool, bool)");

8
src/util.h
View File

@@ -44,13 +44,5 @@ extern "C" {
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
#include <dlfcn.h>
// NMI_SYM loads a symbol from the global scope.
#define NMI_SYM(var, sym) reinterpret_cast<void*&>(var) = dlsym(RTLD_DEFAULT, sym)
#endif
#endif