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/Servo/CPagePortStatus.cpp | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPagePortStatus.cpp b/SourceCode/Bond/Servo/CPagePortStatus.cpp
index 198e904..a360f4e 100644
--- a/SourceCode/Bond/Servo/CPagePortStatus.cpp
+++ b/SourceCode/Bond/Servo/CPagePortStatus.cpp
@@ -97,6 +97,17 @@
pComboBox->SetCurSel(cassetteStatus - 1);
}
+ // 鍒涘缓Job Existence Slots鎺т欢
+ m_ctrlJobSlotGrid.Create(AfxRegisterWndClass(0), _T("JobSlotGrid"),
+ WS_CHILD | WS_VISIBLE, CRect(0, 0, 88, 32), this, 1001);
+ m_ctrlJobSlotGrid.SetGridSize(1, 8);
+ m_ctrlJobSlotGrid.SetColors(RGB(34, 177, 76), RGB(200, 200, 200));
+
+ auto statusMap = m_pPort->getScanCassetteMap();
+ for (int i = 0; i < 8; ++i) {
+ bool isSet = (statusMap >> i) & 1;
+ m_ctrlJobSlotGrid.SetSlotStatus(0, i, isSet);
+ }
return TRUE; // return TRUE unless you set the focus to a control
// 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
@@ -122,6 +133,17 @@
void CPagePortStatus::OnSize(UINT nType, int cx, int cy)
{
CHMPropertyPage::OnSize(nType, cx, cy);
+ if (GetDlgItem(IDC_COMBO_PORT_STATUS) == nullptr) return;
- // TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
+
+ // 鍒涘缓Job Existence Slots鎺т欢
+ CRect rcLabel, rcComboBox, rcClient;
+ GetDlgItem(IDC_LABEL_JOB_EXISTENCE_SLOTS)->GetWindowRect(&rcLabel);
+ ScreenToClient(rcLabel);
+ GetDlgItem(IDC_COMBO_CASSETTE_STATUS)->GetWindowRect(&rcComboBox);
+ ScreenToClient(rcComboBox);
+ GetClientRect(rcClient);
+
+ m_ctrlJobSlotGrid.MoveWindow(rcComboBox.left, rcLabel.top,
+ 34 * 8, 32);
}
\ No newline at end of file
--
Gitblit v1.9.3