From d7c88780e1df54f34563d60bd7fa01011d2eef03 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 23:17:17 +0800
Subject: [PATCH] 1.CSVData.cpp 里 unserialize 用了 8*2、125*2，但 serialize 只写 8 + 125 字节。 m_svRawData.insert 的 end 指针是 pszBuffer + 125*2，没有用 index 计算，可能把无效区域一起拷进去。 一旦 size 实际是 133（不是 266），就会直接越界，堆会被破坏，m_svDatas.clear() 在销毁元素时崩。
---
SourceCode/Bond/BondEq/TopToolbar.cpp | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/TopToolbar.cpp b/SourceCode/Bond/BondEq/TopToolbar.cpp
index bda0e52..eff0bb2 100644
--- a/SourceCode/Bond/BondEq/TopToolbar.cpp
+++ b/SourceCode/Bond/BondEq/TopToolbar.cpp
@@ -28,6 +28,7 @@
CDialogEx::DoDataExchange(pDX);
DDX_Control(pDX, IDC_BUTTON_RUN, m_btnRun);
DDX_Control(pDX, IDC_BUTTON_STOP, m_btnStop);
+ DDX_Control(pDX, IDC_BUTTON_ALARM, m_btnAlarm);
DDX_Control(pDX, IDC_BUTTON_SETTINGS, m_btnSettings);
DDX_Control(pDX, IDC_BUTTON_OPERATOR, m_btnOperator);
}
@@ -50,6 +51,7 @@
InitBtn(m_btnRun, "Run_High_32.ico", "Run_Gray_32.ico");
InitBtn(m_btnStop, "Stop_High_32.ico", "Stop_Gray_32.ico");
+ InitBtn(m_btnAlarm, "Alarm_o_32.ico", "Alarm_gray_32.ico");
InitBtn(m_btnSettings, "Settings_High_32.ico", "Settings_Gray_32.ico");
InitBtn(m_btnOperator, "Operator_High_32.ico", "Operator_Gray_32.ico");
HMENU hMenu = LoadMenu(AfxGetInstanceHandle(), MAKEINTRESOURCEA(IDR_MENU_OPEATOR));
@@ -115,6 +117,11 @@
x += BTN_WIDTH;
x += 2;
+ pItem = GetDlgItem(IDC_BUTTON_ALARM);
+ pItem->MoveWindow(x, y, BTN_WIDTH, nBthHeight);
+ x += BTN_WIDTH;
+ x += 2;
+
pItem = GetDlgItem(IDC_TOOLBAR_LINE1);
pItem->MoveWindow(x, y + 6, 2, nBthHeight - 12);
x += 4;
@@ -170,6 +177,7 @@
switch (LOWORD(wParam)) {
case IDC_BUTTON_RUN:
case IDC_BUTTON_STOP:
+ case IDC_BUTTON_ALARM:
case IDC_BUTTON_SETTINGS:
GetParent()->SendMessage(ID_MSG_TOOLBAR_BTN_CLICKED, 0, LOWORD(wParam));
break;
@@ -187,3 +195,16 @@
*pResult = 0;
}
+HMENU CTopToolbar::GetOperatorMenu()
+{
+ return m_btnOperator.GetMenu();
+}
+
+BOOL CTopToolbar::PreTranslateMessage(MSG* pMsg)
+{
+ if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+ return TRUE;
+ }
+
+ return CDialogEx::PreTranslateMessage(pMsg);
+}
--
Gitblit v1.9.3