From d1a32df54b44c7a9fd9021518bd3387f7981b13f Mon Sep 17 00:00:00 2001
From: Zero Fanker <zcyfksn@vip.qq.com>
Date: Thu, 25 Apr 2024 22:12:25 -0400
Subject: [PATCH] safe compile .

---
 MissionEditor/Structs.h       | 8 ++++----
 MissionEditor/ViewObjects.cpp | 2 +-
 MissionEditor/inlines.h       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MissionEditor/Structs.h b/MissionEditor/Structs.h
index e2d8d86..f6a5a27 100644
--- a/MissionEditor/Structs.h
+++ b/MissionEditor/Structs.h
@@ -323,10 +323,10 @@ struct XCString
 
 		bUsedDefault = FALSE;
 		wString = new(WCHAR[len + 1]);
-		memset(wString, 0, (len + 1) * 2);
+		memset(wString, 0, (len + 1) * sizeof(WCHAR));
 
-		//MultiByteToWideChar(CP_ACP, WC_COMPOSITECHECK, cString, len, wString, len+1);
-		mbstowcs(wString, cString, len);
+		size_t convertedSize = 0;
+		mbstowcs_s(&convertedSize, wString, len + 1, cString, len);
 
 	}
 	void SetString(const WCHAR* wString, int len)
@@ -358,7 +358,7 @@ struct XCString
 	CString cString;
 	WCHAR* wString;
 	BOOL bUsedDefault;
-	int len;
+	size_t len;
 };
 
 
diff --git a/MissionEditor/ViewObjects.cpp b/MissionEditor/ViewObjects.cpp
index 635bbfa..8eef05d 100644
--- a/MissionEditor/ViewObjects.cpp
+++ b/MissionEditor/ViewObjects.cpp
@@ -42,7 +42,7 @@ static char THIS_FILE[] = __FILE__;
 /////////////////////////////////////////////////////////////////////////////
 // CViewObjects
 
-const int valadded = 10000;
+const size_t valadded = 10000;
 
 IMPLEMENT_DYNCREATE(CViewObjects, CTreeView)
 
diff --git a/MissionEditor/inlines.h b/MissionEditor/inlines.h
index 91b92d2..960aa89 100644
--- a/MissionEditor/inlines.h
+++ b/MissionEditor/inlines.h
@@ -78,7 +78,7 @@ inline CString GetUnitPictureFilename(LPCTSTR lpUnitName, DWORD dwPicIndex)
 	}
 
 	char n[50];
-	itoa(dwPicIndex, n, 10);
+	_itoa_s(dwPicIndex, n, 10);
 
 
 	if (pics.find(artname + n) != pics.end()) {