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/CEquipmentPage2.cpp | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index 14b46ac..aef0b77 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -34,6 +34,7 @@
ON_WM_SIZE()
ON_NOTIFY(LVN_ITEMCHANGED, IDC_LIST1, &CEquipmentPage2::OnLvnItemchangedList1)
ON_BN_CLICKED(IDC_BUTTON_REMOVE, &CEquipmentPage2::OnBnClickedButtonRemove)
+ ON_BN_CLICKED(IDC_BUTTON_PUT, &CEquipmentPage2::OnBnClickedButtonPut)
END_MESSAGE_MAP()
@@ -125,10 +126,17 @@
GetClientRect(&rcClient);
int x = 12;
+ int x1 = x;
int y2 = rcClient.bottom - 12;
pItem = GetDlgItem(IDC_BUTTON_REMOVE);
pItem->GetWindowRect(&rcItem);
pItem->MoveWindow(x, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
+ x1 += rcItem.Width();
+ x1 += 12;
+
+ pItem = GetDlgItem(IDC_BUTTON_PUT);
+ pItem->GetWindowRect(&rcItem);
+ pItem->MoveWindow(x1, y2 - rcItem.Height(), rcItem.Width(), rcItem.Height());
y2 -= rcItem.Height();
y2 -= 8;
@@ -160,9 +168,24 @@
if (index >= 0) {
SERVO::CSlot* pSlot = (SERVO::CSlot*)m_listCtrl.GetItemData(index);
ASSERT(pSlot);
- int bRet = m_pEquipment->removeGlass(pSlot->getNo());
- if (bRet == 0) {
+ if (theApp.m_model.getMaster().moveGlassToBuf(m_pEquipment->getID(),
+ pSlot->getNo())) {
UpdateSlots();
+ AfxMessageBox("鐗╂枡宸插彇鍑哄埌Buffer涓紒");
+ }
+ }
+}
+
+void CEquipmentPage2::OnBnClickedButtonPut()
+{
+ int index = GetSelectedItemIndex();
+ if (index >= 0) {
+ SERVO::CSlot* pSlot = (SERVO::CSlot*)m_listCtrl.GetItemData(index);
+ ASSERT(pSlot);
+ if (theApp.m_model.getMaster().moveGlassToSlot(m_pEquipment->getID(),
+ pSlot->getNo())) {
+ UpdateSlots();
+ AfxMessageBox("鐗╂枡宸叉斁鍏ユ寚瀹氫綅缃紒");
}
}
}
@@ -180,7 +203,17 @@
SERVO::CGlass* pGlass = (SERVO::CGlass*)pSlot->getContext();
if (pGlass != nullptr) {
- m_listCtrl.SetItemText(index, 3, pGlass->getID().c_str());
+ CString strText;
+ if (pGlass->getType() == SERVO::MaterialsType::G1) {
+ strText.Format(_T("(G1)%s"), pGlass->getID().c_str());
+ }
+ else if (pGlass->getType() == SERVO::MaterialsType::G2) {
+ strText.Format(_T("(G2)%s"), pGlass->getID().c_str());
+ }
+ else {
+ strText.Format(_T("(%s"), pGlass->getID().c_str());
+ }
+ m_listCtrl.SetItemText(index, 3, strText);
SERVO::CGlass* pBuddy = pGlass->getBuddy();
if (pBuddy != nullptr) {
m_listCtrl.SetItemText(index, 4, pBuddy->getID().c_str());
@@ -189,4 +222,3 @@
}
}
}
-
--
Gitblit v1.9.3