Update file(s): 2024-12-20

horsicq · Dec 19, 2024 · 7e92e6e · 7e92e6e
1 parent 3f2c38f
commit 7e92e6e
Show file tree

Hide file tree

Showing 13 changed files with 109 additions and 94 deletions.
diff --git a/AbstractWidgets/Structs/xmach_defs.cpp b/AbstractWidgets/Structs/xmach_defs.cpp
diff --git a/AbstractWidgets/abstractwidgets.cmake b/AbstractWidgets/abstractwidgets.cmake
@@ -33,6 +33,9 @@ set(ABSTRACTWIDGETS_SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/xgenericheaderwidget.cpp
     ${CMAKE_CURRENT_LIST_DIR}/xgenericheaderwidget.h
     ${CMAKE_CURRENT_LIST_DIR}/xgenericheaderwidget.ui
+    ${CMAKE_CURRENT_LIST_DIR}/xgenerichexwidget.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/xgenerichexwidget.h
+    ${CMAKE_CURRENT_LIST_DIR}/xgenerichexwidget.ui
     ${CMAKE_CURRENT_LIST_DIR}/xgenerictablewidget.cpp
     ${CMAKE_CURRENT_LIST_DIR}/xgenerictablewidget.h
     ${CMAKE_CURRENT_LIST_DIR}/xgenerictablewidget.ui

diff --git a/AbstractWidgets/abstractwidgets.pri b/AbstractWidgets/abstractwidgets.pri
@@ -17,6 +17,7 @@ HEADERS += \
     $$PWD/xformatwidget.h \
     $$PWD/xformatwidget_def.h \
     $$PWD/xgenericheaderwidget.h \
+    $$PWD/xgenerichexwidget.h \
     $$PWD/xgenerictablewidget.h \
     $$PWD/xmainwidget.h \
     $$PWD/xmainwidgetadvanced.h \
@@ -37,6 +38,7 @@ SOURCES += \
     $$PWD/xdialogprocessdata.cpp \
     $$PWD/xformatwidget.cpp \
     $$PWD/xgenericheaderwidget.cpp \
+    $$PWD/xgenerichexwidget.cpp \
     $$PWD/xgenerictablewidget.cpp \
     $$PWD/xmainwidget.cpp \
     $$PWD/xmainwidgetadvanced.cpp \
@@ -46,6 +48,7 @@ FORMS += \
     $$PWD/dialogsetgenericwidget.ui \
     $$PWD/dialogxmainwidget.ui \
     $$PWD/xgenericheaderwidget.ui \
+    $$PWD/xgenerichexwidget.ui \
     $$PWD/xgenerictablewidget.ui \
     $$PWD/xmainwidget.ui
 

diff --git a/AbstractWidgets/xformatwidget.cmake b/AbstractWidgets/xformatwidget.cmake
@@ -33,8 +33,11 @@ if (NOT DEFINED XTABLEVIEW_SOURCES)
     include(${CMAKE_CURRENT_LIST_DIR}/../../Controls/xtableview.cmake)
     set(XFORMATWIDGET_SOURCES ${XFORMATWIDGET_SOURCES} ${XTABLEVIEW_SOURCES})
 endif()
+if (NOT DEFINED XDATETIMEEDITX_SOURCES)
+    include(${CMAKE_CURRENT_LIST_DIR}/../../Controls/xdatetimeeditx.cmake)
+    set(XFORMATWIDGET_SOURCES ${XFORMATWIDGET_SOURCES} ${XDATETIMEEDITX_SOURCES})
+endif()
 
-include(${CMAKE_CURRENT_LIST_DIR}/../../Controls/xdatetimeeditx.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../../XHexView/xhexview.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../../XMemoryMapWidget/xmemorymapwidget.cmake)
 include(${CMAKE_CURRENT_LIST_DIR}/../../XEntropyWidget/xentropywidget.cmake)

diff --git a/AbstractWidgets/xformatwidget.cpp b/AbstractWidgets/xformatwidget.cpp
@@ -314,7 +314,7 @@ QString XFormatWidget::getTypeTitle(XFW_DEF::TYPE type, XBinary::MODE mode, XBin
         sResult = QString("atom_info_command");
     } else if (type == XFW_DEF::TYPE_function_starts_command) {
         sResult = QString("function_starts_command");
-    } else if (type == XFW_DEF::TYPE_dyld_exports_trie_command) {
+    } else if (type == XFW_DEF::TYPE_MACH_dyld_exports_trie_command) {
         sResult = QString("dyld_exports_trie_command");
     } else if (type == XFW_DEF::TYPE_dyld_chained_fixups_command) {
         sResult = QString("dyld_chained_fixups_command");
@@ -362,6 +362,8 @@ QString XFormatWidget::getTypeTitle(XFW_DEF::TYPE type, XBinary::MODE mode, XBin
         sResult = QString("section");
     } else if (type == XFW_DEF::TYPE_MACH_section_64) {
         sResult = QString("section_64");
+    } else if (type == XFW_DEF::TYPE_MACH_trie_export) {
+        sResult = tr("Export");
     } else if (type == XFW_DEF::TYPE_DEX_HEADER) {
         sResult = QString("HEADER");
     }
@@ -432,7 +434,7 @@ QList<XFW_DEF::HEADER_RECORD> XFormatWidget::getHeaderRecords(const XFW_DEF::CWO
     } else if (pCwOptions->_type == XFW_DEF::TYPE_function_starts_command) {
         pRecords = XTYPE_MACH::X_linkedit_data_command::records;
         nNumberOfRecords = XTYPE_MACH::X_linkedit_data_command::__data_size;
-    } else if (pCwOptions->_type == XFW_DEF::TYPE_dyld_exports_trie_command) {
+    } else if (pCwOptions->_type == XFW_DEF::TYPE_MACH_dyld_exports_trie_command) {
         pRecords = XTYPE_MACH::X_linkedit_data_command::records;
         nNumberOfRecords = XTYPE_MACH::X_linkedit_data_command::__data_size;
     } else if (pCwOptions->_type == XFW_DEF::TYPE_dyld_chained_fixups_command) {
@@ -574,7 +576,7 @@ qint64 XFormatWidget::getStructSize(XFW_DEF::TYPE type)
         nResult = sizeof(XMACH_DEF::linkedit_data_command);
     } else if (type == XFW_DEF::TYPE_function_starts_command) {
         nResult = sizeof(XMACH_DEF::linkedit_data_command);
-    } else if (type == XFW_DEF::TYPE_dyld_exports_trie_command) {
+    } else if (type == XFW_DEF::TYPE_MACH_dyld_exports_trie_command) {
         nResult = sizeof(XMACH_DEF::linkedit_data_command);
     } else if (type == XFW_DEF::TYPE_dyld_chained_fixups_command) {
         nResult = sizeof(XMACH_DEF::linkedit_data_command);
@@ -676,18 +678,6 @@ void XFormatWidget::setValue(QVariant vValue, qint32 nPosition, qint64 nOffset,
 
             _adjustRecWidget(&recWidget, vValue);
 
-            SV sv = _setValue(vValue, nPosition);
-            // if (sv == SV_EDITED) {
-            //     reset();
-            // } else if (sv == SV_RELOADDATA) {
-            //     reset();
-            //     reloadData(true);
-            // } else if (sv == SV_RELOADALL) {
-            //     reset();
-            //     reload();
-            //     reloadData(false);
-            // }
-
             emit dataChanged(nOffset, nSize);
         }
     } else {
@@ -1107,8 +1097,13 @@ void XFormatWidget::updateRecWidgets(QIODevice *pDevice, QList<RECWIDGET> *pList
         if (pListRecWidget->at(i).pWidget) {
             bool bIsSize = false;
 
-            if ((pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_SIZE) && (pListRecWidget->at(i).nSubPosition != -1)) {
-                bIsSize = true;
+            if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_SIZE) {
+                if (pListRecWidget->at(i).nSubPosition != -1) {
+                    bIsSize = true;
+                }
+                else if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_RELTOSTRUCT) {
+                    bIsSize = true;
+                }
             }
 
             QList<QToolButton *> listWidgets = pListRecWidget->at(i).pWidget->findChildren<QToolButton *>();
@@ -1118,7 +1113,12 @@ void XFormatWidget::updateRecWidgets(QIODevice *pDevice, QList<RECWIDGET> *pList
             for (qint32 j = 0; j < nNumberOfWidgets; j++) {
                 qint64 nDelta = listWidgets.at(j)->property("DELTA").toLongLong();
                 if (bIsSize) {
-                    listWidgets.at(j)->setProperty("LOCATION", listVariants.at(pListRecWidget->at(i).nSubPosition).toULongLong() + nDelta);
+                    if (pListRecWidget->at(i).nSubPosition != -1) {
+                        listWidgets.at(j)->setProperty("LOCATION", listVariants.at(pListRecWidget->at(i).nSubPosition).toULongLong() + nDelta);
+                    } else {
+                        listWidgets.at(j)->setProperty("LOCATION", nDelta);
+                    }
+
                     listWidgets.at(j)->setProperty("SIZE", listVariants.at(i));
                 } else {
                     listWidgets.at(j)->setProperty("LOCATION", listVariants.at(i).toULongLong() + nDelta);
@@ -1141,13 +1141,17 @@ void XFormatWidget::_adjustRecWidget(RECWIDGET *pRecWidget, QVariant varValue)
 
     if (pRecWidget->pLineEdit) bBlockLineEdit = pRecWidget->pLineEdit->blockSignals(true);
 
-    QList<XComboBoxEx *> listWidgets = pRecWidget->pWidget->findChildren<XComboBoxEx *>();
+    qint32 nNumberOfWidgets = 0;
+    QList<XComboBoxEx *> listWidgets;
 
-    qint32 nNumberOfWidgets = listWidgets.count();
+    if (pRecWidget->pWidget) {
+        listWidgets = pRecWidget->pWidget->findChildren<XComboBoxEx *>();
+        nNumberOfWidgets = listWidgets.count();
 
-    for (qint32 i = 0; i < nNumberOfWidgets; i++) {
-        bool bState = listWidgets.at(i)->blockSignals(true);
-        listBlockComboBoxes.append(bState);
+        for (qint32 i = 0; i < nNumberOfWidgets; i++) {
+            bool bState = listWidgets.at(i)->blockSignals(true);
+            listBlockComboBoxes.append(bState);
+        }
     }
 
     if (pRecWidget->pLineEdit) {
@@ -1713,6 +1717,20 @@ void XFormatWidget::_addStruct(const SPSTRUCT &spStruct)
                     _spStructRecord.widgetMode = XFW_DEF::WIDGETMODE_TABLE;
                     _spStructRecord.type = XFW_DEF::TYPE_GENERIC_STRINGTABLE_ANSI;
 
+                    _addStruct(_spStructRecord);
+                }
+            } else if ((_spStruct.widgetMode == XFW_DEF::WIDGETMODE_HEADER) && (_spStruct.type == XFW_DEF::TYPE_MACH_dyld_exports_trie_command)) {
+                XMACH_DEF::linkedit_data_command _command = mach._read_linkedit_data_command(_spStruct.nStructOffset);
+
+                if (_command.dataoff && _command.datasize) {
+                    SPSTRUCT _spStructRecord = _spStruct;
+                    _spStructRecord.pTreeWidgetItem = pTreeWidgetItem;
+                    _spStructRecord.nStructOffset = _spStruct.nOffset + _command.dataoff;
+                    _spStructRecord.nStructSize = _command.datasize;
+                    _spStructRecord.nStructCount = 0;
+                    _spStructRecord.widgetMode = XFW_DEF::WIDGETMODE_HEX;
+                    _spStructRecord.type = XFW_DEF::TYPE_MACH_trie_export;
+
                     _addStruct(_spStructRecord);
                 }
             } else if ((_spStruct.widgetMode == XFW_DEF::WIDGETMODE_HEADER) && (_spStruct.type == XFW_DEF::TYPE_segment_command)) {
@@ -1848,7 +1866,7 @@ XFW_DEF::TYPE XFormatWidget::load_commandIdToType(qint32 nCommandId)
     } else if (nCommandId == XMACH_DEF::S_LC_FUNCTION_STARTS) {
         result = XFW_DEF::TYPE_function_starts_command;
     } else if (nCommandId == XMACH_DEF::S_LC_DYLD_EXPORTS_TRIE) {
-        result = XFW_DEF::TYPE_dyld_exports_trie_command;
+        result = XFW_DEF::TYPE_MACH_dyld_exports_trie_command;
     } else if (nCommandId == XMACH_DEF::S_LC_DYLD_CHAINED_FIXUPS) {
         result = XFW_DEF::TYPE_dyld_chained_fixups_command;
     } else if (nCommandId == XMACH_DEF::S_LC_ENCRYPTION_INFO) {
@@ -2206,8 +2224,25 @@ bool XFormatWidget::createHeaderTable(QTableWidget *pTableWidget, const QList<XF
     }
 
     for (qint32 i = 0; i < nNumberOfRecords; i++) {
-        if ((pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_OFFSET) || (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_ADDRESS) ||
-            ((pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_SIZE) && (pListRecWidget->at(i).nSubPosition != -1))) {
+        if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_RELTOPARENT) {
+            (*pListRecWidget)[i].varDelta = var1.toULongLong();
+        } else if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_RELTOSTRUCT) {
+            (*pListRecWidget)[i].varDelta = nOffset;
+        }
+
+        bool bValid = false;
+
+        if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_OFFSET) {
+            bValid = true;
+        } else if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_ADDRESS) {
+            bValid = true;
+        } else if ((pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_SIZE) && (pListRecWidget->at(i).nSubPosition != -1)) {
+            bValid = true;
+        } else if ((pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_SIZE) && (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_RELTOSTRUCT)) {
+            bValid = true;
+        }
+
+        if (bValid) {
             _adjustCellWidget(pListRecWidget, pTableWidget, i, HEADER_COLUMN_INFO);
 
             XBinary::LT locType = XBinary::LT_UNKNOWN;
@@ -2224,15 +2259,11 @@ bool XFormatWidget::createHeaderTable(QTableWidget *pTableWidget, const QList<XF
                     } else if (pListRecWidget->at(nSubPosition).nVType & XFW_DEF::VAL_TYPE_ADDRESS) {
                         locType = XBinary::LT_ADDRESS;
                     }
+                } else if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_RELTOSTRUCT) {
+                    locType = XBinary::LT_OFFSET;
                 }
             }
 
-            if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_RELTOPARENT) {
-                (*pListRecWidget)[i].varDelta = var1.toULongLong();
-            } else if (pListRecWidget->at(i).nVType & XFW_DEF::VAL_TYPE_RELTOSTRUCT) {
-                (*pListRecWidget)[i].varDelta = nOffset;
-            }
-
             if (locType != XBinary::LT_UNKNOWN) {
                 QToolButton *pButton = new QToolButton(0);
                 pButton->setProperty("LOCATIONTYPE", locType);

diff --git a/AbstractWidgets/xformatwidget.h b/AbstractWidgets/xformatwidget.h
@@ -246,7 +246,6 @@ class XFormatWidget : public XShortcutsWidget {
         SV_RELOADDATA
     };
 
-    virtual SV _setValue(QVariant vValue, qint32 nPosition) = 0;
     void adjustGenericHeader(QTableWidget *pTableWidget, const QList<XFW_DEF::HEADER_RECORD> *pListHeaderRecords);
     void adjustGenericTable(QTableView *pTableView, const QList<XFW_DEF::HEADER_RECORD> *pListHeaderRecords);
     virtual void adjustListTable(qint32 nType, QTableWidget *pTableWidget);

diff --git a/AbstractWidgets/xformatwidget_def.h b/AbstractWidgets/xformatwidget_def.h
@@ -76,7 +76,7 @@ enum TYPE {
     TYPE_segment_split_info_command,
     TYPE_atom_info_command,
     TYPE_function_starts_command,
-    TYPE_dyld_exports_trie_command,
+    TYPE_MACH_dyld_exports_trie_command,
     TYPE_dyld_chained_fixups_command,
     TYPE_encryption_info_command,
     TYPE_encryption_info_command_64,
@@ -100,6 +100,7 @@ enum TYPE {
     TYPE_MACH_CS_CodeDirectory,
     TYPE_MACH_section,
     TYPE_MACH_section_64,
+    TYPE_MACH_trie_export,
     TYPE_MACH_END,
     TYPE_NE_START,
     TYPE_NE_IMAGE_DOS_HEADER,
@@ -122,7 +123,8 @@ enum WIDGETMODE {
     WIDGETMODE_UNKNOWN = 0,
     WIDGETMODE_HEADER,
     WIDGETMODE_TABLE,
-    WIDGETMODE_DIALOG_HEADER
+    WIDGETMODE_DIALOG_HEADER,
+    WIDGETMODE_HEX
 };
 
 struct OPTIONS {

diff --git a/AbstractWidgets/xgenericheaderwidget.cpp b/AbstractWidgets/xgenericheaderwidget.cpp
@@ -41,14 +41,6 @@ XGenericHeaderWidget::~XGenericHeaderWidget()
     delete ui;
 }
 
-XFormatWidget::SV XGenericHeaderWidget::_setValue(QVariant vValue, qint32 nPosition)
-{
-    Q_UNUSED(vValue)
-    Q_UNUSED(nPosition)
-
-    return SV_NONE;
-}
-
 void XGenericHeaderWidget::reloadData(bool bSaveSelection)
 {
     qint32 nCurrentRow = 0;
@@ -104,7 +96,7 @@ void XGenericHeaderWidget::reloadData(bool bSaveSelection)
         (getCwOptions()->_type == XFW_DEF::TYPE_sub_client_command) || (getCwOptions()->_type == XFW_DEF::TYPE_sub_library_command) ||
         (getCwOptions()->_type == XFW_DEF::TYPE_symtab_command) || (getCwOptions()->_type == XFW_DEF::TYPE_dysymtab_command) ||
         (getCwOptions()->_type == XFW_DEF::TYPE_segment_split_info_command) || (getCwOptions()->_type == XFW_DEF::TYPE_atom_info_command) ||
-        (getCwOptions()->_type == XFW_DEF::TYPE_function_starts_command) || (getCwOptions()->_type == XFW_DEF::TYPE_dyld_exports_trie_command) ||
+        (getCwOptions()->_type == XFW_DEF::TYPE_function_starts_command) || (getCwOptions()->_type == XFW_DEF::TYPE_MACH_dyld_exports_trie_command) ||
         (getCwOptions()->_type == XFW_DEF::TYPE_dyld_chained_fixups_command) || (getCwOptions()->_type == XFW_DEF::TYPE_encryption_info_command) ||
         (getCwOptions()->_type == XFW_DEF::TYPE_encryption_info_command_64) || (getCwOptions()->_type == XFW_DEF::TYPE_dyld_info_command) ||
         (getCwOptions()->_type == XFW_DEF::TYPE_version_min_command) || (getCwOptions()->_type == XFW_DEF::TYPE_uuid_command) ||

diff --git a/AbstractWidgets/xgenericheaderwidget.h b/AbstractWidgets/xgenericheaderwidget.h
@@ -36,9 +36,6 @@ class XGenericHeaderWidget : public XFormatWidget {
     virtual void reloadData(bool bSaveSelection);
     virtual void adjustView();
 
-protected:
-    virtual SV _setValue(QVariant vValue, qint32 nPosition);
-
 private slots:
     void on_tableWidgetMain_currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn);
     void on_tableWidgetMain_customContextMenuRequested(const QPoint &pos);

diff --git a/AbstractWidgets/xgenerictablewidget.cpp b/AbstractWidgets/xgenerictablewidget.cpp
@@ -40,14 +40,6 @@ XGenericTableWidget::~XGenericTableWidget()
     delete ui;
 }
 
-XFormatWidget::SV XGenericTableWidget::_setValue(QVariant vValue, qint32 nPosition)
-{
-    Q_UNUSED(vValue)
-    Q_UNUSED(nPosition)
-
-    return SV_NONE;
-}
-
 void XGenericTableWidget::reloadData(bool bSaveSelection)
 {
     qint32 nRow = 0;

diff --git a/AbstractWidgets/xgenerictablewidget.h b/AbstractWidgets/xgenerictablewidget.h
@@ -36,9 +36,6 @@ class XGenericTableWidget : public XFormatWidget {
     virtual void reloadData(bool bSaveSelection);
     virtual void adjustView();
 
-protected:
-    virtual SV _setValue(QVariant vValue, qint32 nPosition);
-
 private slots:
     void on_tableViewMain_customContextMenuRequested(const QPoint &pos);
     void onTableView_currentRowChanged(const QModelIndex &current, const QModelIndex &previous);

diff --git a/AbstractWidgets/xmainwidget.cpp b/AbstractWidgets/xmainwidget.cpp
@@ -164,14 +164,6 @@ void XMainWidget::reload()
     // setTreeItem(ui->treeWidgetNavi, getOptions().nStartType);
 }
 
-XFormatWidget::SV XMainWidget::_setValue(QVariant vValue, qint32 nPosition)
-{
-    Q_UNUSED(vValue)
-    Q_UNUSED(nPosition)
-
-    return SV_NONE;
-}
-
 void XMainWidget::setReadonly(bool bState)
 {
     XFormatWidget::setReadonly(bState);
@@ -258,7 +250,7 @@ void XMainWidget::reloadData(bool bSaveSelection)
             connect(pWidget, SIGNAL(dataChanged(qint64, qint64)), this, SLOT(dataChangedSlot(qint64, qint64)));
             connect(pWidget, SIGNAL(followLocation(quint64, qint32, qint64, qint32)), this, SLOT(followLocationSlot(quint64, qint32, qint64, qint32)));
 
-            if ((cwOptions.widgetMode == XFW_DEF::WIDGETMODE_HEADER) || (cwOptions.widgetMode == XFW_DEF::WIDGETMODE_TABLE)) {
+            if ((cwOptions.widgetMode == XFW_DEF::WIDGETMODE_HEADER) || (cwOptions.widgetMode == XFW_DEF::WIDGETMODE_TABLE) || (cwOptions.widgetMode == XFW_DEF::WIDGETMODE_HEX)) {
                 XFormatWidget *_pXFormatWidget = dynamic_cast<XFormatWidget *>(pWidget);
 
                 if (_pXFormatWidget) {
@@ -318,6 +310,10 @@ XShortcutsWidget *XMainWidget::createWidget(const XFW_DEF::CWOPTIONS &cwOptions)
         XGenericTableWidget *_pWidget = new XGenericTableWidget(cwOptions.pParent);
         _pWidget->setCwOptions(cwOptions, false);
         pResult = _pWidget;
+    } else if (cwOptions.widgetMode == XFW_DEF::WIDGETMODE_HEX) {
+        XGenericHexWidget *_pWidget = new XGenericHexWidget(cwOptions.pParent);
+        _pWidget->setCwOptions(cwOptions, false);
+        pResult = _pWidget;
     }
 
     return pResult;
@@ -473,7 +469,7 @@ void XMainWidget::showCwWidgetSlot(QString sInitString, bool bNewWindow)
         connect(pWidget, SIGNAL(dataChanged(qint64, qint64)), this, SLOT(dataChangedSlot(qint64, qint64)));
         connect(pWidget, SIGNAL(followLocation(quint64, qint32, qint64, qint32)), this, SLOT(followLocationSlot(quint64, qint32, qint64, qint32)));
 
-        if ((cwOptions.widgetMode == XFW_DEF::WIDGETMODE_HEADER) || (cwOptions.widgetMode == XFW_DEF::WIDGETMODE_TABLE)) {
+        if ((cwOptions.widgetMode == XFW_DEF::WIDGETMODE_HEADER) || (cwOptions.widgetMode == XFW_DEF::WIDGETMODE_TABLE) || (cwOptions.widgetMode == XFW_DEF::WIDGETMODE_HEX)) {
             connect(pWidget, SIGNAL(showCwWidget(QString, bool)), this, SLOT(showCwWidgetSlot(QString, bool)));
         }
 

diff --git a/AbstractWidgets/xmainwidget.h b/AbstractWidgets/xmainwidget.h
@@ -25,6 +25,7 @@
 
 #include "xgenericheaderwidget.h"
 #include "xgenerictablewidget.h"
+#include "xgenerichexwidget.h"
 #include "xformatwidget.h"
 #include "dialogdemangle.h"
 #include "dialogwidget.h"
@@ -51,7 +52,6 @@ class XMainWidget : public XFormatWidget {
     virtual void cleanup();
     virtual void reload();
 
-    virtual SV _setValue(QVariant vValue, qint32 nPosition);
     virtual void setReadonly(bool bState);
     virtual void adjustView();
     virtual void reloadData(bool bSaveSelection);