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/ServoGraph.h | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ServoGraph.h b/SourceCode/Bond/Servo/ServoGraph.h
index a5ca74f..398c638 100644
--- a/SourceCode/Bond/Servo/ServoGraph.h
+++ b/SourceCode/Bond/Servo/ServoGraph.h
@@ -75,6 +75,7 @@
HBITMAP hBitmap;
int bmWidth;
int bmHeight;
+ float angle;
} IMAGE;
@@ -93,6 +94,7 @@
this->box2BackgroundColor = RGB(0, 255, 255);;
this->box2FrameColor = RGB(255, 255, 0);;
this->bBox2Visible = FALSE;
+ this->m_pData = nullptr;
};
~INDICATEBOX() {};
@@ -109,6 +111,7 @@
COLORREF box2FrameColor;
BOOL bBox2Visible;
std::vector<void*> m_contexts;
+ void* m_pData;
};
class INDICATEBKGND
@@ -141,9 +144,11 @@
LRESULT OnTimer(WPARAM wParam, LPARAM lParam);
LRESULT OnPaint(WPARAM wParam, LPARAM lParam);
LRESULT OnMouseMove(WPARAM wParam, LPARAM lParam);
+ LRESULT OnSize(WPARAM wParam, LPARAM lParam);
LRESULT OnLButtonDown(WPARAM wParam, LPARAM lParam);
public:
+ void Invalidata();
void AddImage(int id, char* pszPath, int x, int y);
void AddIndicateBox(int id, int x, int y, int width);
void AddIndicateBox(int id, int x, int y, int width,
@@ -153,6 +158,8 @@
BOOL RemoveIndicateBoxAllContext(int id);
const std::vector<void*>& GetIndicateBoxContexts(int id);
bool IsIndicateBoxContextsEmpty(int id);
+ void SetIndicateBoxData(int id, void* pData);
+ void* GetIndicateBoxData(int id);
void ShowIndicateBoxInterior(int id, COLORREF color);
void HideIndicateBoxInterior(int id);
CServoGraph::INDICATEBOX* GetIndicateBox(int id);
@@ -166,6 +173,14 @@
BOOL GetIndicateBoxRect(int id, LPRECT lprcBox);
void SetBoxText(int id, const char* pszText, const char* pszTooltip);
HWND GetSafeWnd();
+ void UpdateImageCoordinates(int id, int newX, int newY);
+ void UpdateIndicateBoxCoordinates(int id, int newX, int newY);
+ void UpdateImageAngle(int id, float angle);
+ void UpdateIndicateBox1Colors(int id, COLORREF newBackgroundColor, COLORREF newFrameColor1, COLORREF newFrameColor2);
+ void UpdateIndicateBox2Colors(int id, COLORREF newBackgroundColor, COLORREF newFrameColor);
+
+private:
+ void DrawImage(HDC hMemDC, IMAGE& item);
private:
HWND m_hWnd;
--
Gitblit v1.9.3