Merge branch 'master' of github.com:Fluorohydride/ygopro

gframe/bufferio.h

@@ -6,40 +6,36 @@
 
 class BufferIO {
 public:
-	inline static int ReadInt32(unsigned char*& p) {
+	static int ReadInt32(unsigned char*& p) {
 		return buffer_read<int32_t>(p);
 	}
-	inline static unsigned int ReadUInt32(unsigned char*& p) {
-		unsigned int ret = *(unsigned int*)p;
-		p += 4;
-		return ret;
+	static unsigned int ReadUInt32(unsigned char*& p) {
+		return buffer_read<uint32_t>(p);
 	}
-	inline static short ReadInt16(unsigned char*& p) {
+	static short ReadInt16(unsigned char*& p) {
 		return buffer_read<int16_t>(p);
 	}
-	inline static unsigned short ReadUInt16(unsigned char*& p) {
-		unsigned short ret = *(unsigned short*)p;
-		p += 2;
-		return ret;
+	static unsigned short ReadUInt16(unsigned char*& p) {
+		return buffer_read<uint16_t>(p);
 	}
-	inline static char ReadInt8(unsigned char*& p) {
+	static char ReadInt8(unsigned char*& p) {
 		return buffer_read<char>(p);
 	}
-	inline static unsigned char ReadUInt8(unsigned char*& p) {
+	static unsigned char ReadUInt8(unsigned char*& p) {
 		return buffer_read<unsigned char>(p);
 	}
-	inline static void WriteInt32(unsigned char*& p, int val) {
+	static void WriteInt32(unsigned char*& p, int val) {
 		buffer_write<int32_t>(p, val);
 	}
-	inline static void WriteInt16(unsigned char*& p, short val) {
+	static void WriteInt16(unsigned char*& p, short val) {
 		buffer_write<int16_t>(p, val);
 	}
-	inline static void WriteInt8(unsigned char*& p, char val) {
+	static void WriteInt8(unsigned char*& p, char val) {
 		buffer_write<char>(p, val);
 	}
 	// return: string length
 	template<typename T1, typename T2>
-	inline static int CopyWStr(const T1* src, T2* pstr, int bufsize) {
+	static int CopyWStr(const T1* src, T2* pstr, int bufsize) {
 		int l = 0;
 		while(src[l] && l < bufsize - 1) {
 			pstr[l] = (T2)src[l];
@@ -49,7 +45,7 @@ public:
 		return l;
 	}
 	template<typename T1, typename T2>
-	inline static int CopyWStrRef(const T1* src, T2*& pstr, int bufsize) {
+	static int CopyWStrRef(const T1* src, T2*& pstr, int bufsize) {
 		int l = 0;
 		while(src[l] && l < bufsize - 1) {
 			pstr[l] = (T2)src[l];
@@ -59,22 +55,117 @@ public:
 		*pstr = 0;
 		return l;
 	}
+	template<typename T>
+	static bool CheckUTF8Byte(const T* str, int len) {
+		for (int i = 1; i < len; ++i) {
+			if ((str[i] & 0xc0U) != 0x80U)
+				return false;
+		}
+		return true;
+	}
+	static unsigned int ConvertUTF8(const char*& p) {
+		unsigned int cur = 0;
+		if ((p[0] & 0x80U) == 0) {
+			cur = p[0] & 0xffU;
+			p++;
+		}
+		else if ((p[0] & 0xe0U) == 0xc0U) {
+			if (!CheckUTF8Byte(p, 2)) {
+				p++;
+				return UINT32_MAX;
+			}
+			cur = ((p[0] & 0x1fU) << 6) | (p[1] & 0x3fU);
+			p += 2;
+			if(cur < 0x80U)
+				return UINT32_MAX;
+		}
+		else if ((p[0] & 0xf0U) == 0xe0U) {
+			if (!CheckUTF8Byte(p, 3)) {
+				p++;
+				return UINT32_MAX;
+			}
+			cur = ((p[0] & 0xfU) << 12) | ((p[1] & 0x3fU) << 6) | (p[2] & 0x3fU);
+			p += 3;
+			if (cur < 0x800U)
+				return UINT32_MAX;
+		}
+		else if ((p[0] & 0xf8U) == 0xf0U) {
+			if (!CheckUTF8Byte(p, 4)) {
+				p++;
+				return UINT32_MAX;
+			}
+			cur = ((p[0] & 0x7U) << 18) | ((p[1] & 0x3fU) << 12) | ((p[2] & 0x3fU) << 6) | (p[3] & 0x3fU);
+			p += 4;
+			if (cur < 0x10000U)
+				return UINT32_MAX;
+		}
+		else {
+			p++;
+			return UINT32_MAX;
+		}
+		return cur;
+	}
+	static bool IsHighSurrogate(unsigned int c) {
+		return (c >= 0xd800U && c <= 0xdbffU);
+	}
+	static bool IsLowSurrogate(unsigned int c) {
+		return (c >= 0xdc00U && c <= 0xdfffU);
+	}
+	static bool IsUnicodeChar(unsigned int c) {
+		if(IsHighSurrogate(c))
+			return false;
+		if (IsLowSurrogate(c))
+			return false;
+		if (c > 0x10ffffU)
+			return false;
+		return true;
+	}
 	// UTF-16/UTF-32 to UTF-8
 	// return: string length
 	static int EncodeUTF8String(const wchar_t* wsrc, char* str, int size) {
-		char* pstr = str;
-		while (*wsrc != 0) {
-			unsigned cur = *wsrc;
+		auto pw = wsrc;
+		auto pstr = str;
+		while (*pw != 0) {
+			unsigned cur = 0;
 			int codepoint_size = 0;
+			if (sizeof(wchar_t) == 2) {
+				if (IsHighSurrogate(pw[0])) {
+					if (pw[1] == 0)
+						break;
+					if (IsLowSurrogate(pw[1])) {
+						cur = ((pw[0] & 0x3ffU) << 10) | (pw[1] & 0x3ffU);
+						cur += 0x10000;
+						pw += 2;
+					}
+					else {
+						pw++;
+						continue;
+					}
+				}
+				else if (IsLowSurrogate(pw[0])) {
+					pw++;
+					continue;
+				}
+				else {
+					cur = *pw;
+					pw++;
+				}
+			}
+			else {
+				cur = *pw;
+				pw++;
+			}
+			if (!IsUnicodeChar(cur))
+				continue;
 			if (cur < 0x80U)
 				codepoint_size = 1;
 			else if (cur < 0x800U)
 				codepoint_size = 2;
-			else if (cur < 0x10000U && (cur < 0xd800U || cur > 0xdfffU))
+			else if (cur < 0x10000U)
 				codepoint_size = 3;
 			else
 				codepoint_size = 4;
-			if (pstr - str + codepoint_size > size - 1)
+			if ((int)(pstr - str) + codepoint_size > size - 1)
 				break;
 			switch (codepoint_size) {
 			case 1:
@@ -90,13 +181,6 @@ public:
 				pstr[2] = (cur & 0x3f) | 0x80;
 				break;
 			case 4:
-				if (sizeof(wchar_t) == 2) {
-					cur = 0;
-					cur |= (*wsrc & 0x3ffU) << 10;
-					++wsrc;
-					cur |= *wsrc & 0x3ffU;
-					cur += 0x10000;
-				}
 				pstr[0] = ((cur >> 18) & 0x7) | 0xf0;
 				pstr[1] = ((cur >> 12) & 0x3f) | 0x80;
 				pstr[2] = ((cur >> 6) & 0x3f) | 0x80;
@@ -106,10 +190,9 @@ public:
 				break;
 			}
 			pstr += codepoint_size;
-			wsrc++;
 		}
 		*pstr = 0;
-		return pstr - str;
+		return (int)(pstr - str);
 	}
 	// UTF-8 to UTF-16/UTF-32
 	// return: string length
@@ -117,9 +200,11 @@ public:
 		const char* p = src;
 		wchar_t* wp = wstr;
 		while(*p != 0) {
-			const unsigned cur = *p & 0xffU;
+			unsigned int cur = ConvertUTF8(p);
 			int codepoint_size = 0;
-			if ((cur & 0xf8) == 0xf0) {
+			if (!IsUnicodeChar(cur))
+				continue;
+			if (cur >= 0x10000) {
 				if (sizeof(wchar_t) == 2)
 					codepoint_size = 2;
 				else
@@ -127,31 +212,19 @@ public:
 			}
 			else
 				codepoint_size = 1;
-			if (wp - wstr + codepoint_size > size - 1)
+			if ((int)(wp - wstr) + codepoint_size > size - 1)
 				break;
-			if((cur & 0x80) == 0) {
-				*wp = *p;
-				p++;
-			} else if((cur & 0xe0) == 0xc0) {
-				*wp = ((p[0] & 0x1fU) << 6) | (p[1] & 0x3fU);
-				p += 2;
-			} else if((cur & 0xf0) == 0xe0) {
-				*wp = ((p[0] & 0xfU) << 12) | ((p[1] & 0x3fU) << 6) | (p[2] & 0x3fU);
-				p += 3;
-			} else if((cur & 0xf8) == 0xf0) {
-				if (sizeof(wchar_t) == 2) {
-					unsigned unicode = ((p[0] & 0x7U) << 18) | ((p[1] & 0x3fU) << 12) | ((p[2] & 0x3fU) << 6) | (p[3] & 0x3fU);
-					unicode -= 0x10000;
-					*wp++ = (unicode >> 10) | 0xd800;
-					*wp = (unicode & 0x3ff) | 0xdc00;
-				} else {
-					*wp = ((p[0] & 0x7U) << 18) | ((p[1] & 0x3fU) << 12) | ((p[2] & 0x3fU) << 6) | (p[3] & 0x3fU);
-				}
-				p += 4;
-			} else
-				p++;
+			if (codepoint_size == 1) {
+				wp[0] = cur;
 				wp++;
 			}
+			else {
+				cur -= 0x10000U;
+				wp[0] = (cur >> 10) | 0xd800;
+				wp[1] = (cur & 0x3ff) | 0xdc00;
+				wp += 2;
+			}
+		}
 		*wp = 0;
 		return wp - wstr;
 	}

gframe/config.h

@@ -63,6 +63,20 @@ inline int myswprintf(wchar_t(&buf)[N], const wchar_t* fmt, TR... args) {
 #include "../ocgcore/ocgapi.h"
 #include "../ocgcore/common.h"
 
+inline FILE* myfopen(const char* filename, const char* mode) {
+	FILE* fp{};
+#ifdef _WIN32
+	wchar_t wname[256]{};
+	wchar_t wmode[20]{};
+	BufferIO::DecodeUTF8(filename, wname);
+	BufferIO::CopyWStr(mode, wmode, sizeof wmode / sizeof wmode[0]);
+	fp = _wfopen(wname, wmode);
+#else
+	fp = fopen(filename, mode);
+#endif
+	return fp;
+}
+
 #include <irrlicht.h>
 using namespace irr;
 using namespace core;

gframe/deck_con.cpp

@@ -1391,6 +1391,7 @@ void DeckBuilder::FilterCards() {
 		element_t(): type(type_t::all), exclude(false) {}
 	};
 	const wchar_t* pstr = mainGame->ebCardName->getText();
+	int trycode = BufferIO::GetVal(pstr);
 	std::wstring str = std::wstring(pstr);
 	std::vector<element_t> query_elements;
 	if(mainGame->gameConf.search_multiple_keywords) {
@@ -1535,17 +1536,13 @@ void DeckBuilder::FilterCards() {
 				match = CardNameContains(text.name.c_str(), elements_iterator->keyword.c_str());
 			} else if (elements_iterator->type == element_t::type_t::setcode) {
 				match = data.is_setcodes(elements_iterator->setcodes);
+			} else if (trycode && (data.code == trycode || data.alias == trycode && data.is_alternative())){
+				match = true;
 			} else {
-				int trycode = BufferIO::GetVal(elements_iterator->keyword.c_str());
-				bool tryresult = dataManager.GetData(trycode, 0);
-				if(!tryresult) {
 				match = CardNameContains(text.name.c_str(), elements_iterator->keyword.c_str())
 					|| text.text.find(elements_iterator->keyword) != std::wstring::npos
 					|| mainGame->CheckRegEx(text.text, elements_iterator->keyword)
 					|| data.is_setcodes(elements_iterator->setcodes);
-				} else {
-					match = data.code == trycode || data.alias == trycode;
-				}
 			}
 			if(elements_iterator->exclude)
 				match = !match;

gframe/deck_manager.cpp

@@ -270,15 +270,9 @@ void DeckManager::GetDeckFile(wchar_t* ret, irr::gui::IGUIComboBox* cbCategory,
 	}
 }
 FILE* DeckManager::OpenDeckFile(const wchar_t* file, const char* mode) {
-#ifdef WIN32
-	wchar_t wmode[20]{};
-	BufferIO::CopyWStr(mode, wmode, sizeof wmode / sizeof wmode[0]);
-	FILE* fp = _wfopen(file, wmode);
-#else
-	char file2[256];
-	BufferIO::EncodeUTF8(file, file2);
-	FILE* fp = fopen(file2, mode);
-#endif
+	char fullname[256]{};
+	BufferIO::EncodeUTF8(file, fullname);
+	FILE* fp = myfopen(fullname, mode);
 	return fp;
 }
 IReadFile* DeckManager::OpenDeckReader(const wchar_t* file) {

gframe/menu_handler.cpp

@@ -558,14 +558,9 @@ bool MenuHandler::OnEvent(const irr::SEvent& event) {
 				const wchar_t* name = mainGame->lstSinglePlayList->getListItem(sel);
 				wchar_t fname[256];
 				myswprintf(fname, L"./single/%ls", name);
-				FILE *fp;
-#ifdef _WIN32
-				fp = _wfopen(fname, L"rb");
-#else
-				char filename[256];
-				BufferIO::EncodeUTF8(fname, filename);
-				fp = fopen(filename, "rb");
-#endif
+				char fullname[256]{};
+				BufferIO::EncodeUTF8(fname, fullname);
+				FILE* fp = myfopen(fullname, "rb");
 				if(!fp) {
 					mainGame->stSinglePlayInfo->setText(L"");
 					break;

gframe/replay.cpp

@@ -102,39 +102,26 @@ void Replay::SaveReplay(const wchar_t* name) {
 		return;
 	wchar_t fname[256];
 	myswprintf(fname, L"./replay/%ls.yrp", name);
-#ifdef WIN32
-	fp = _wfopen(fname, L"wb");
-#else
-	char fname2[256];
-	BufferIO::EncodeUTF8(fname, fname2);
-	fp = fopen(fname2, "wb");
-#endif
-	if(!fp)
+	char fullname[256]{};
+	BufferIO::EncodeUTF8(fname, fullname);
+	FILE* rfp = myfopen(fullname, "wb");
+	if(!rfp)
 		return;
-	fwrite(&pheader, sizeof(pheader), 1, fp);
-	fwrite(comp_data, comp_size, 1, fp);
-	fclose(fp);
+	fwrite(&pheader, sizeof pheader, 1, rfp);
+	fwrite(comp_data, comp_size, 1, rfp);
+	fclose(rfp);
 }
 bool Replay::OpenReplay(const wchar_t* name) {
-#ifdef WIN32
-	fp = _wfopen(name, L"rb");
-#else
-	char name2[256];
-	BufferIO::EncodeUTF8(name, name2);
-	fp = fopen(name2, "rb");
-#endif
-	if(!fp) {
+	char fullname[256]{};
+	BufferIO::EncodeUTF8(name, fullname);
+	FILE* rfp = myfopen(fullname, "rb");
+	if(!rfp) {
 		wchar_t fname[256];
 		myswprintf(fname, L"./replay/%ls", name);
-#ifdef WIN32
-		fp = _wfopen(fname, L"rb");
-#else
-		char fname2[256];
-		BufferIO::EncodeUTF8(fname, fname2);
-		fp = fopen(fname2, "rb");
-#endif
+		BufferIO::EncodeUTF8(fname, fullname);
+		rfp = myfopen(fullname, "rb");
 	}
-	if(!fp)
+	if(!rfp)
 		return false;
 
 	pdata = replay_data;
@@ -142,13 +129,13 @@ bool Replay::OpenReplay(const wchar_t* name) {
 	is_replaying = false;
 	replay_size = 0;
 	comp_size = 0;
-	if(fread(&pheader, sizeof(pheader), 1, fp) < 1) {
-		fclose(fp);
+	if(fread(&pheader, sizeof pheader, 1, rfp) < 1) {
+		fclose(rfp);
 		return false;
 	}
 	if(pheader.flag & REPLAY_COMPRESSED) {
-		comp_size = fread(comp_data, 1, MAX_COMP_SIZE, fp);
-		fclose(fp);
+		comp_size = fread(comp_data, 1, MAX_COMP_SIZE, rfp);
+		fclose(rfp);
 		if ((int)pheader.datasize < 0 && (int)pheader.datasize > MAX_REPLAY_SIZE)
 			return false;
 		replay_size = pheader.datasize;
@@ -159,8 +146,8 @@ bool Replay::OpenReplay(const wchar_t* name) {
 			return false;
 		}
 	} else {
-		replay_size = fread(replay_data, 1, MAX_REPLAY_SIZE, fp);
-		fclose(fp);
+		replay_size = fread(replay_data, 1, MAX_REPLAY_SIZE, rfp);
+		fclose(rfp);
 		comp_size = 0;
 	}
 	is_replaying = true;
@@ -169,24 +156,20 @@ bool Replay::OpenReplay(const wchar_t* name) {
 bool Replay::CheckReplay(const wchar_t* name) {
 	wchar_t fname[256];
 	myswprintf(fname, L"./replay/%ls", name);
-#ifdef WIN32
-	FILE* rfp = _wfopen(fname, L"rb");
-#else
-	char fname2[256];
-	BufferIO::EncodeUTF8(fname, fname2);
-	FILE* rfp = fopen(fname2, "rb");
-#endif
+	char fullname[256]{};
+	BufferIO::EncodeUTF8(fname, fullname);
+	FILE* rfp = myfopen(fullname, "rb");
 	if(!rfp)
 		return false;
 	ReplayHeader rheader;
-	size_t count = fread(&rheader, sizeof(ReplayHeader), 1, rfp);
+	size_t count = fread(&rheader, sizeof rheader, 1, rfp);
 	fclose(rfp);
 	return count == 1 && rheader.id == 0x31707279 && rheader.version >= 0x12d0u && (rheader.version < 0x1353u || (rheader.flag & REPLAY_UNIFORM));
 }
 bool Replay::DeleteReplay(const wchar_t* name) {
 	wchar_t fname[256];
 	myswprintf(fname, L"./replay/%ls", name);
-#ifdef WIN32
+#ifdef _WIN32
 	BOOL result = DeleteFileW(fname);
 	return !!result;
 #else
@@ -201,7 +184,7 @@ bool Replay::RenameReplay(const wchar_t* oldname, const wchar_t* newname) {
 	wchar_t newfname[256];
 	myswprintf(oldfname, L"./replay/%ls", oldname);
 	myswprintf(newfname, L"./replay/%ls", newname);
-#ifdef WIN32
+#ifdef _WIN32
 	BOOL result = MoveFileW(oldfname, newfname);
 	return !!result;
 #else

premake/lua/premake5.lua

@@ -10,6 +10,9 @@ project "lua"
     filter "not action:vs*"
         buildoptions { "-x c++" }
 
+    filter "configurations:Debug"
+        defines { "LUA_USE_APICHECK" }
+
     filter "system:bsd"
         defines { "LUA_USE_POSIX" }
 

strings.conf

@@ -1246,3 +1246,6 @@
 !setname 0x1bb 魔瞳	モルガナイト
 !setname 0x1bc 蓟花	アザミナ
 !setname 0x1bd 祝台
+!setname 0x1be 雷火沸动	ライゼオル
+!setname 0x1bf 码丽丝	M∀LICE
+!setname 0x1c0 龙华	竜華