From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CSlot.cpp | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSlot.cpp b/SourceCode/Bond/Servo/CSlot.cpp
index 74a1e57..8972986 100644
--- a/SourceCode/Bond/Servo/CSlot.cpp
+++ b/SourceCode/Bond/Servo/CSlot.cpp
@@ -10,11 +10,15 @@
m_pContext = nullptr;
m_bEnable = FALSE;
m_bLock = FALSE;
+ m_pContext = nullptr;
}
CSlot::~CSlot()
{
-
+ if (m_pContext != nullptr) {
+ m_pContext->release();
+ m_pContext = nullptr;
+ }
}
BOOL CSlot::isEnable()
@@ -92,23 +96,57 @@
return m_pContext == nullptr;
}
+ void CSlot::setContext(CContext* pContext)
+ {
+ if (pContext != nullptr) {
+ pContext->release();
+ }
+
+ m_pContext = pContext;
+ if (m_pContext != nullptr) {
+ m_pContext->addRef();
+ }
+ }
+
CContext* CSlot::getContext()
{
return m_pContext;
}
- void CSlot::setContext(CContext* pContext)
- {
- m_pContext = pContext;
- }
-
void CSlot::serialize(CArchive& ar)
{
if (ar.IsStoring()) {
-
+ ar << m_nPosition;
+ ar << m_nNo;
+ ar << (int)m_materialsType;
+ WriteString(ar, m_strName);
+ ar << (__int64)m_pContext;
+ ar << m_bEnable;
+ ar << m_bLock;
}
else {
-
+ int i32;
+ __int64 i64;
+ ar >> m_nPosition;
+ ar >> m_nNo;
+ ar >> i32; m_materialsType = (MaterialsType)i32;
+ ReadString(ar, m_strName);
+ ar >> i64; m_pContext = (CContext*)i64;
+ ar >> m_bEnable;
+ ar >> m_bLock;
}
}
+
+ void CSlot::WriteString(CArchive& ar, std::string& string)
+ {
+ CString strTemp = string.c_str();
+ ar << strTemp;
+ }
+
+ void CSlot::ReadString(CArchive& ar, std::string& string)
+ {
+ CString strTemp;
+ ar >> strTemp;
+ string = (LPTSTR)(LPCTSTR)strTemp;
+ }
}
--
Gitblit v1.9.3